address feedback

Author: cameronvoell

Convos/Contacts/Profile+ContactOverlay.swift

@@ -11,28 +11,43 @@ extension Contact {
     /// the message bubble renders - keeps those rows in sync with the bubble after
     /// a participant changes their photo.
     ///
-    /// Name, emoji, and other identity fields are deliberately left as the stored
-    /// contact's, so contact-authoritative name resolution (and any future local
-    /// nickname) is unaffected - only the avatar image is freshened.
+    /// The avatar image (url + its crypto) is taken wholesale from the member
+    /// profile - never field-by-field merged with the stored contact - so a
+    /// change-photo shows the new image, and a partial/malformed member avatar
+    /// renders the same monogram as the bubble (copying the fields verbatim keeps
+    /// `Profile.isEncryptedImage`'s all-or-nothing crypto check identical).
+    ///
+    /// The display name is deliberately left as the stored contact's, so
+    /// contact-authoritative name resolution (and any future local nickname) is
+    /// unaffected - only the avatar is freshened.
+    ///
+    /// Known limitation (deferred): this does not handle a member who *clears*
+    /// their avatar (nil url) or switches to emoji-only. The caller renders via
+    /// `Profile.overlaying(contact:)`, which falls back to the frozen per-message
+    /// snapshot's avatar/metadata when the override carries no avatar url, so the
+    /// row would resurface the stale snapshot photo/emoji rather than the member's
+    /// cleared state. There is no UI to clear an avatar today, so this is
+    /// unreachable in practice; it is fully resolved by member-authoritative
+    /// rendering (`displayAvatar(for:)`) in the ProfilesRepository refactor, when
+    /// this whole stopgap is removed.
     ///
     /// Interim stopgap: remove once identity resolves from ProfilesRepository
     /// (see docs/plans/2026-06-29-profile-table-implementation.md, section 10.1).
     static func liveOverride(member: Profile, stored: Contact?) -> Contact {
-        let hasMemberAvatar = member.avatar != nil
-        return Contact(
+        Contact(
             inboxId: member.inboxId,
             displayName: stored?.displayName,
-            avatarURL: hasMemberAvatar ? member.avatar : stored?.avatarURL,
-            avatarSalt: hasMemberAvatar ? member.avatarSalt : stored?.avatarSalt,
-            avatarNonce: hasMemberAvatar ? member.avatarNonce : stored?.avatarNonce,
-            avatarKey: hasMemberAvatar ? member.avatarKey : stored?.avatarKey,
+            avatarURL: member.avatar,
+            avatarSalt: member.avatarSalt,
+            avatarNonce: member.avatarNonce,
+            avatarKey: member.avatarKey,
             addedAt: stored?.addedAt ?? Date(),
             addedViaConversationId: stored?.addedViaConversationId,
             isBlocked: stored?.isBlocked ?? false,
             agentVerification: stored?.agentVerification,
             agentTemplateId: stored?.agentTemplateId,
             agentTemplatePublishedURL: stored?.agentTemplatePublishedURL,
-            profileEmoji: stored?.profileEmoji
+            profileEmoji: member.profileEmoji
         )
     }
 

Convos/Conversation Detail/ConversationViewModel.swift

@@ -9,6 +9,15 @@ import SwiftUI
 import UIKit
 import UserNotifications
 
+/// Moves a staged invite image into the URL-keyed byte cache under the finalized
+/// invite's real image URL, so the invite card renders it without dropping to a
+/// placeholder or re-downloading. No-op when the text has no parseable image URL.
+private func cacheFinalizedInviteImage(_ image: UIImage, inviteText: String) {
+    guard let invite = MessageInvite.from(text: inviteText),
+          let imageURLString = invite.imageURL?.absoluteString else { return }
+    ImageCache.shared.cacheAfterUpload(image, for: invite, url: imageURLString)
+}
+
 struct PendingInvite {
     let code: String
     var fullURL: String
@@ -3258,6 +3267,7 @@ extension ConversationViewModel {
                 if let updatedInvite = try await metadataWriter.refreshInvite(for: linkedId),
                    let pendingMessageId {
                     try await messageWriter.finalizeInvite(clientMessageId: pendingMessageId, finalText: updatedInvite.inviteURLString)
+                    cacheFinalizedInviteImage(image, inviteText: updatedInvite.inviteURLString)
                 }
             }
         } catch {