TF-1915 Show From address when list identity is empty

(cherry picked from commit 56a97d3ae84418e070d45f9c9d6b258b0a8bf3db)

lib/features/composer/presentation/composer_view.dart

@@ -300,9 +300,10 @@ class ComposerView extends GetWidget<ComposerController>
               color: AppColor.colorHintEmailAddressInput
             )
           ),
-          const SizedBox(width: 12),
           if (controller.listIdentities.isNotEmpty)
-            DropdownButtonHideUnderline(child: DropdownButton2<Identity>(
+            Padding(
+              padding: const EdgeInsets.only(left: 12),
+              child: DropdownButtonHideUnderline(child: DropdownButton2<Identity>(
                 isExpanded: true,
                 customButton: SvgPicture.asset(imagePaths.icEditIdentity),
                 items: controller.listIdentities.map((item) => DropdownMenuItem<Identity>(
@@ -365,6 +366,7 @@ class ComposerView extends GetWidget<ComposerController>
                     padding: EdgeInsets.symmetric(horizontal: 8),
                   )
               )),
+            ),
           Expanded(child: Padding(
             padding: EdgeInsets.only(
               right: AppUtils.isDirectionRTL(context) ? 12 : 8,

lib/features/composer/presentation/composer_view_web.dart

@@ -1,6 +1,7 @@
 import 'package:core/presentation/extensions/capitalize_extension.dart';
 import 'package:core/presentation/extensions/color_extension.dart';
 import 'package:core/presentation/extensions/html_extension.dart';
+import 'package:core/presentation/extensions/string_extension.dart';
 import 'package:core/presentation/resources/image_paths.dart';
 import 'package:core/presentation/utils/app_toast.dart';
 import 'package:core/presentation/utils/html_transformer/html_template.dart';
@@ -60,9 +61,7 @@ class ComposerView extends GetWidget<ComposerController>
                   children: [
                     Obx(() => _buildAppBarForMobile(context, controller.isEnableEmailSendButton.value)),
                     const Divider(color: AppColor.colorDividerComposer, height: 1),
-                    Obx(() => controller.identitySelected.value != null
+                    _buildFromEmailAddress(context),
-                      ? _buildFromEmailAddress(context)
-                      : const SizedBox.shrink()),
                     Obx(() => controller.identitySelected.value != null
                         ? const Divider(color: AppColor.colorDividerComposer, height: 1)
                         : const SizedBox.shrink()),
@@ -414,9 +413,7 @@ class ComposerView extends GetWidget<ComposerController>
                   right: AppUtils.isDirectionRTL(context) ? 12 : 0,
                 ),
                 child: Column(children: [
-                  Obx(() => controller.identitySelected.value != null
+                  _buildFromEmailAddress(context),
-                      ? _buildFromEmailAddress(context)
-                      : const SizedBox.shrink()),
                   Obx(() => controller.identitySelected.value != null
                       ? const Divider(color: AppColor.colorDividerComposer, height: 1)
                       : const SizedBox.shrink()),
@@ -465,6 +462,7 @@ class ComposerView extends GetWidget<ComposerController>
   }
 
   Widget _buildFromEmailAddress(BuildContext context) {
+    return Obx(() {
       return Padding(
         padding: EdgeInsets.only(
           left: AppUtils.isDirectionRTL(context) ? 0 : responsiveUtils.isMobile(context) ? 16 : 0,
@@ -472,10 +470,17 @@ class ComposerView extends GetWidget<ComposerController>
           top: 12,
           bottom: 12),
         child: Row(children: [
-        Text('${AppLocalizations.of(context).from_email_address_prefix}:',
+          Text(
-            style: const TextStyle(fontSize: 15, color: AppColor.colorHintEmailAddressInput)),
+            '${AppLocalizations.of(context).from_email_address_prefix}:',
-        const SizedBox(width: 12),
+            style: const TextStyle(
-        DropdownButtonHideUnderline(
+              fontSize: 15,
+              color: AppColor.colorHintEmailAddressInput
+            )
+          ),
+          if (controller.listIdentities.isNotEmpty)
+            Padding(
+              padding: const EdgeInsets.only(left: 12),
+              child: DropdownButtonHideUnderline(
                 child: DropdownButton2<Identity>(
                   isExpanded: true,
                   customButton: SvgPicture.asset(imagePaths.icEditIdentity),
@@ -487,7 +492,10 @@ class ComposerView extends GetWidget<ComposerController>
                         padding: const EdgeInsets.symmetric(horizontal: 8),
                         decoration: BoxDecoration(
                           borderRadius: BorderRadius.circular(12),
-                      color: item == controller.identitySelected.value ? AppColor.colorBgMenuItemDropDownSelected : Colors.transparent),
+                          color: item == controller.identitySelected.value
+                            ? AppColor.colorBgMenuItemDropDownSelected
+                            : Colors.transparent
+                        ),
                         child: Column(
                           crossAxisAlignment: CrossAxisAlignment.start,
                           mainAxisSize: MainAxisSize.min,
@@ -537,24 +545,29 @@ class ComposerView extends GetWidget<ComposerController>
                   )
                 ),
               ),
+            ),
           Expanded(child: Padding(
             padding: EdgeInsets.only(
               right: AppUtils.isDirectionRTL(context) ? 12 : 8,
               left: AppUtils.isDirectionRTL(context) ? 8 : 12,
             ),
             child: Text(
-            controller.identitySelected.value?.email ?? '',
+              controller.identitySelected.value != null
+                ? (controller.identitySelected.value?.email ?? '').withUnicodeCharacter
+                : (controller.userProfile?.email ?? '').withUnicodeCharacter,
               maxLines: 1,
               overflow: CommonTextStyle.defaultTextOverFlow,
               softWrap: CommonTextStyle.defaultSoftWrap,
               style: const TextStyle(
                 fontSize: 17,
                 fontWeight: FontWeight.normal,
-              color: AppColor.colorEmailAddressPrefix),
+                color: AppColor.colorEmailAddressPrefix
+              ),
             )
           )),
         ]),
       );
+    });
   }
 
   Widget _buildEmailAddress(BuildContext context, BoxConstraints constraints) {