TF-4233 Correctly set current label color on edit dialog open

core/lib/presentation/views/color/colors_map_widget.dart

@@ -47,6 +47,9 @@ class _ColorsMapWidgetState extends State<ColorsMapWidget> {
     Color(0xFF646580),
   ];
 
+  static final Set<int> _defaultColorValues =
+    _defaultColors.map((c) => c.toInt()).toSet();
+
   final ValueNotifier<Color?> _selectedColor = ValueNotifier(null);
   List<Color> _colorList = <Color>[];
 
@@ -128,7 +131,14 @@ class _ColorsMapWidgetState extends State<ColorsMapWidget> {
 
   void _setUpColorList() {
     final custom = widget.customColor;
-    _colorList = custom != null ? [custom, ..._defaultColors] : _defaultColors;
+    final hasCustom = custom != null;
+    final isCustomInDefaults =
+        hasCustom && _defaultColorValues.contains(custom.toInt());
+
+    _colorList = (hasCustom && !isCustomInDefaults)
+        ? [custom, ..._defaultColors]
+        : _defaultColors;
+
     _selectedColor.value = custom;
   }
 

lib/features/labels/presentation/extensions/handle_label_action_type_extension.dart

@@ -33,6 +33,13 @@ extension HandleLabelActionTypeExtension on LabelController {
     required AccountId? accountId,
     required Label label,
   }) async {
+    if (accountId == null) {
+      consumeState(
+        Stream.value(Left(EditLabelFailure(NotFoundAccountIdException()))),
+      );
+      return;
+    }
+
     await DialogRouter().openDialogModal(
       child: CreateNewLabelModal(
         labels: labels,

lib/features/labels/presentation/widgets/create_new_label_modal.dart

@@ -76,6 +76,7 @@ class _CreateNewLabelModalState extends State<CreateNewLabelModal> {
         _nameInputController.text = selectedLabel.safeDisplayName;
         _nameInputFocusNode.requestFocus();
         _createLabelStateNotifier.value = true;
+        _labelSelectedColorNotifier.value = _selectedColor;
       }
     });
   }