lib/features/chat/widgets/message_bubble.dart (2)

64-77: Optional: Extract repeated Column wrapper pattern.

The same Column structure (with CrossAxisAlignment.end, MainAxisSize.min, content widget + timestamp) is repeated three times for image, file, and text messages. Consider extracting a helper method to reduce duplication.

♻️ Example helper extraction

Widget _wrapWithTimestamp(Widget content, BuildContext context) {
  return Column(
    crossAxisAlignment: CrossAxisAlignment.end,
    mainAxisSize: MainAxisSize.min,
    children: [
      content,
      _buildTimestamp(context),
    ],
  );
}

Then replace each occurrence with:

child: _wrapWithTimestamp(
  EncryptedImageMessage(...),
  context,
),

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@lib/features/chat/widgets/message_bubble.dart` around lines 64 - 77, Extract
the repeated Column wrapper used around message content and timestamp into a
helper like _wrapWithTimestamp(Widget content, BuildContext context) that
returns a Column with crossAxisAlignment: CrossAxisAlignment.end and
mainAxisSize: MainAxisSize.min and contains the passed content and
_buildTimestamp(context); then replace the three repeated Column usages (the
ones wrapping EncryptedImageMessage, file message widget, and text message
widget) with calls to _wrapWithTimestamp(content, context) to remove duplication
and keep calls to chatNotifier getters unchanged.

---

185-207: Pass locale to DateFormat for proper i18n support.

DateFormat.Hm() without a locale argument falls back to the system default rather than the app's selected locale. To ensure the time format matches the user's language setting, pass the locale from BuildContext.

♻️ Suggested refactor

- String _formatTime() {
+ String _formatTime(String locale) {
    if (message.createdAt == null) return '';
    final date = message.createdAt is int
        ? DateTime.fromMillisecondsSinceEpoch(
            (message.createdAt as int) * 1000)
        : message.createdAt as DateTime;
-   return DateFormat.Hm().format(date.toLocal());
+   return DateFormat.Hm(locale).format(date.toLocal());
  }

- Widget _buildTimestamp() {
-   final time = _formatTime();
+ Widget _buildTimestamp(BuildContext context) {
+   final locale = Localizations.localeOf(context).toString();
+   final time = _formatTime(locale);
    if (time.isEmpty) return const SizedBox.shrink();
    return Padding(
      padding: const EdgeInsets.only(top: 4),
      child: Text(
        time,
        style: TextStyle(
          color: AppTheme.cream1.withValues(alpha: 0.6),
          fontSize: 11,
        ),
      ),
    );
  }

Then update calls to _buildTimestamp(context) in the build method.

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@lib/features/chat/widgets/message_bubble.dart` around lines 185 - 207, The
timestamp formatting currently uses DateFormat.Hm() without a locale; update
_formatTime to accept a BuildContext (or a locale String) and pass the app
locale from context into DateFormat.Hm(locale) so time respects i18n; then
change _buildTimestamp to take BuildContext and call _formatTime(context) and
update all calls to _buildTimestamp(...) accordingly (reference functions:
_formatTime, _buildTimestamp) ensuring you import/use the correct locale from
the BuildContext.

lib/features/disputes/widgets/dispute_message_bubble.dart (1)

103-116: Consider separate alignment for text content vs timestamp.

Using CrossAxisAlignment.end right-aligns both the message text and the timestamp. While this correctly positions the timestamp at the bottom-right, it also right-aligns the message content, which may look visually odd for multi-line text messages.

A more conventional approach would keep text left-aligned while only the timestamp is right-aligned:

💡 Proposed layout refinement

         child: Column(
-          crossAxisAlignment: CrossAxisAlignment.end,
+          crossAxisAlignment: CrossAxisAlignment.stretch,
           mainAxisSize: MainAxisSize.min,
           children: [
             Text(
               message.content,
               style: const TextStyle(
                 color: AppTheme.cream1,
                 fontSize: 16,
                 height: 1.4,
               ),
             ),
-            _buildTimestamp(),
+            Align(
+              alignment: Alignment.centerRight,
+              child: _buildTimestamp(),
+            ),
           ],
         ),

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@lib/features/disputes/widgets/dispute_message_bubble.dart` around lines 103 -
116, The Column currently uses CrossAxisAlignment.end which right-aligns both
the message text and timestamp; change the Column to CrossAxisAlignment.start so
the message.content remains left-aligned and keep the timestamp right-aligned by
wrapping the timestamp widget returned by _buildTimestamp() in an
Align(alignment: Alignment.centerRight) (or place it in a Row with Expanded
spacer) so only the timestamp floats to the right while the text stays left.

lib/features/chat/widgets/message_bubble.dart (1)

185-193: Dead code: createdAt is int branch is unreachable.

According to lib/data/models/nostr_event.dart:369-373, createdAt is always constructed as a DateTime during deserialization (DateTime.fromMillisecondsSinceEpoch((event['created_at'] as int) * 1000)). The is int type check and its corresponding branch will never execute.

♻️ Simplify by removing the dead branch

   String _formatTime(BuildContext context) {
     if (message.createdAt == null) return '';
-    final date = message.createdAt is int
-        ? DateTime.fromMillisecondsSinceEpoch(
-            (message.createdAt as int) * 1000)
-        : message.createdAt as DateTime;
+    final date = message.createdAt!;
     final use24h = MediaQuery.alwaysUse24HourFormatOf(context);
     return DateFormat(use24h ? 'HH:mm' : 'h:mm a').format(date.toLocal());
   }

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@lib/features/chat/widgets/message_bubble.dart` around lines 185 - 193, The
_formatTime method contains a dead branch checking "message.createdAt is int"
because createdAt is always a DateTime; remove the int branch and simplify date
assignment to cast message.createdAt to DateTime directly (e.g., DateTime date =
message.createdAt as DateTime), leaving the
MediaQuery.alwaysUse24HourFormatOf(context) logic and DateFormat unchanged;
update any null check for message.createdAt to keep early return if needed.