xmtplabs
diff --git a/‎Convos/App Settings/AppSettingsView.swift‎
Lines changed: 44 additions & 29 deletions b/‎Convos/App Settings/AppSettingsView.swift‎
Lines changed: 44 additions & 29 deletions
diff --git a/‎Convos/Conversation Detail/ConversationOnboardingCoordinator.swift‎
Lines changed: 18 additions & 0 deletions b/‎Convos/Conversation Detail/ConversationOnboardingCoordinator.swift‎
Lines changed: 18 additions & 0 deletions
diff --git a/‎Convos/Conversation Detail/ConversationView.swift‎
Lines changed: 4 additions & 15 deletions b/‎Convos/Conversation Detail/ConversationView.swift‎
Lines changed: 4 additions & 15 deletions
diff --git a/‎Convos/Conversation Detail/ConversationViewModel.swift‎
Lines changed: 0 additions & 4 deletions b/‎Convos/Conversation Detail/ConversationViewModel.swift‎
Lines changed: 0 additions & 4 deletions
diff --git a/‎Convos/Conversations List/ConversationsView.swift‎
Lines changed: 5 additions & 0 deletions b/‎Convos/Conversations List/ConversationsView.swift‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎Convos/Conversations List/ConversationsViewModel.swift‎
Lines changed: 55 additions & 1 deletion b/‎Convos/Conversations List/ConversationsViewModel.swift‎
Lines changed: 55 additions & 1 deletion
@@ -67,6 +67,7 @@ struct AppSettingsView: View {
     @State private var versionTapCount: Int = 0
     @State private var lastVersionTapAt: Date?
     @State private var showingEnableDebugConfirmation: Bool = false
+    @State private var presentingMyInfoSheet: Bool = false
 
     private func ensureNavigator() {
         guard navigator == nil else { return }
@@ -144,22 +145,25 @@ struct AppSettingsView: View {
     @ViewBuilder
     private var myInfoSection: some View {
         Section {
-            NavigationLink {
-                MyInfoView(
-                    profile: .constant(.empty()),
-                    profileImage: .constant(nil),
-                    editingDisplayName: .constant(""),
-                    profileSettingsViewModel: profileSettingsViewModel,
-                    showsCancelButton: false,
-                    showsProfile: false,
-                    showsUseProfileButton: false,
-                    canEditProfile: true
-                ) { _ in }
-                .onAppear { navigator?.navigateTo(myInfo: MyInfoNavigatorArgs()) }
+            Button {
+                presentingMyInfoSheet = true
+                navigator?.navigateTo(myInfo: MyInfoNavigatorArgs())
             } label: {
                 myInfoRowLabel
             }
             .accessibilityIdentifier("my-info-row")
+            .accessibilityLabel("My info")
+            .accessibilityValue(
+                profileSettingsViewModel.editingDisplayName.isEmpty
+                    ? "Not set"
+                    : profileSettingsViewModel.editingDisplayName
+            )
+            .listRowInsets(.all, DesignConstants.Spacing.step2x)
+            .sheet(isPresented: $presentingMyInfoSheet) {
+                ProfileSetupSheet(mode: .edit)
+            }
+        } footer: {
+            Text("Your name and pic")
         }
     }
 
@@ -192,29 +196,40 @@ struct AppSettingsView: View {
         }
     }
 
+    /// Mirrors the profile sheet's name row: avatar, name, and a trailing
+    /// pencil affordance. Tapping anywhere opens the profile sheet.
     @ViewBuilder
     private var myInfoRowLabel: some View {
-        HStack {
-            Image(systemName: "lanyardcard.fill")
-                .foregroundStyle(.colorTextPrimary)
-                .frame(width: DesignConstants.Spacing.step8x, alignment: .center)
+        let displayName = profileSettingsViewModel.editingDisplayName
+        HStack(spacing: DesignConstants.Spacing.step2x) {
+            Group {
+                if !displayName.isEmpty || profileSettingsViewModel.profileImage != nil {
+                    ProfileAvatarView(
+                        profile: profileSettingsViewModel.profile,
+                        profileImage: profileSettingsViewModel.profileImage,
+                        useSystemPlaceholder: false
+                    )
+                } else {
+                    ZStack {
+                        Circle().fill(.colorBackgroundInverted)
+                        Image(systemName: "person.crop.circle.fill")
+                            .font(.system(size: 20.0))
+                            .foregroundStyle(.colorTextPrimaryInverted)
+                    }
+                }
+            }
+            .frame(width: 36.0, height: 36.0)
 
-            Text("My info")
-                .foregroundStyle(.colorTextPrimary)
+            Text(displayName.isEmpty ? "Name" : displayName)
+                .font(.body)
+                .foregroundStyle(displayName.isEmpty ? .colorTextTertiary : .colorTextPrimary)
 
             Spacer()
 
-            if !profileSettingsViewModel.profileSettings.isDefault {
-                Text(profileSettingsViewModel.editingDisplayName)
-                    .foregroundStyle(.colorTextSecondary)
-
-                ProfileAvatarView(
-                    profile: profileSettingsViewModel.profile,
-                    profileImage: profileSettingsViewModel.profileImage,
-                    useSystemPlaceholder: false
-                )
-                .frame(width: 16.0, height: 16.0)
-            }
+            Image(systemName: "pencil")
+                .font(.body.weight(.medium))
+                .foregroundStyle(.colorTextSecondary)
+                .padding(.trailing, DesignConstants.Spacing.step2x)
         }
     }
 
 
@@ -151,11 +151,28 @@ final class ConversationOnboardingCoordinator {
     private static let legacyHasSetQuicknamePrefix: String = "hasSetQuicknameForConversation_"
     private static let hasSeenAddAsProfileKey: String = "hasSeenAddAsProfile"
     private static let hasShownNUXPaywallKey: String = "hasShownNUXPaywall"
+    private static let hasShownFirstLaunchProfileSheetKey: String = "hasShownFirstLaunchProfileSheet"
 
     static func markProfileEditorShown() {
         UserDefaults.standard.set(true, forKey: hasShownProfileEditorKey)
     }
 
+    /// Whether the first-launch "Hello / My name is" profile sheet is still
+    /// owed: it hasn't been shown yet and the user has never been through a
+    /// profile editor (set up in Settings, completed the in-conversation
+    /// flow, or adopted a paired identity).
+    static var shouldOfferFirstLaunchProfileSheet: Bool {
+        !UserDefaults.standard.bool(forKey: hasShownFirstLaunchProfileSheetKey)
+            && !UserDefaults.standard.bool(forKey: hasShownProfileEditorKey)
+    }
+
+    /// Latches the first-launch profile sheet: set when the sheet is
+    /// presented (or found unnecessary because a profile already exists),
+    /// so it never shows twice.
+    static func markFirstLaunchProfileSheetShown() {
+        UserDefaults.standard.set(true, forKey: hasShownFirstLaunchProfileSheetKey)
+    }
+
     /// Marks the global onboarding flags as completed so the in-conversation
     /// "set up your name / pic" prompts are skipped. Used by the pairing
     /// flow on the joiner side — the joiner just adopted the initiator's
@@ -175,6 +192,7 @@ final class ConversationOnboardingCoordinator {
         UserDefaults.standard.removeObject(forKey: hasCompletedOnboardingKey)
         UserDefaults.standard.removeObject(forKey: hasSeenAddAsProfileKey)
         UserDefaults.standard.removeObject(forKey: hasShownNUXPaywallKey)
+        UserDefaults.standard.removeObject(forKey: hasShownFirstLaunchProfileSheetKey)
 
         let allKeys = UserDefaults.standard.dictionaryRepresentation().keys
         for key in allKeys where key.hasPrefix(hasSetProfilePrefix) || key.hasPrefix(legacyHasSetQuicknamePrefix) {
 
@@ -571,21 +571,10 @@ struct ConversationView<MessagesBottomBar: View>: View {
             capabilityApprovalSheet
         }
         .sheet(isPresented: $viewModel.presentingProfileSettings) {
-            MyInfoView(
-                profile: .constant(viewModel.myProfileViewModel.profile),
-                profileImage: $viewModel.myProfileViewModel.profileImage,
-                editingDisplayName: $viewModel.myProfileViewModel.editingDisplayName,
-                profileSettingsViewModel: profileSettingsViewModel,
-                showsCancelButton: true,
-                showsProfile: true,
-                showsUseProfileButton: true,
-                canEditProfile: false
-            ) { profileSettings in
-                viewModel.onUseProfile(profileSettings.profile, profileSettings.profileImage)
-            }
-            .onDisappear {
-                viewModel.onProfileSettingsDismissed(focusCoordinator: focusCoordinator)
-            }
+            // ProfileSetupSheet owns the full save; no dismiss handler —
+            // the old onProfileSettingsDismissed re-saved from the stale
+            // myProfileViewModel and clobbered the just-saved profile.
+            ProfileSetupSheet(mode: .edit)
         }
         .toolbar { topBarTrailing }
         .debugConnectionInjectorSheet(
 
@@ -2817,10 +2817,6 @@ extension ConversationViewModel {
         focusCoordinator.moveFocus(to: .displayName)
     }
 
-    func onProfileSettingsDismissed(focusCoordinator: FocusCoordinator) {
-        onDisplayNameEndedEditing(focusCoordinator: focusCoordinator, context: .editProfile)
-    }
-
     func addFileAttachment(url: URL, filename: String, mimeType: String, fileSize: Int) {
         guard canStageMoreMedia else {
             try? FileManager.default.removeItem(at: url)
 
@@ -365,6 +365,11 @@ private struct ConversationsSheetModifier: ViewModifier {
                     .padding(.top, DesignConstants.Spacing.step5x)
                 }
             )
+            // Plain .sheet: ProfileSetupSheet supplies its own detent,
+            // indicator, and background (see its body).
+            .sheet(isPresented: $viewModel.presentingFirstLaunchProfileSetup) {
+                ProfileSetupSheet(mode: .firstLaunch)
+            }
             .selfSizingSheet(isPresented: $viewModel.presentingExplodeInfo) {
                 ExplodeInfoView()
             }
 
@@ -87,6 +87,11 @@ final class ConversationsViewModel {
     /// Drives the first-install "Pair <device>?" sheet when another
     /// device's identity is found in the iCloud-synced keychain backup.
     var foundDevicePairingPrompt: FoundDevicePairingPrompt?
+    /// Drives the first-launch "Hello / My name is" profile setup sheet.
+    /// Presented only when the pairable-device check found no other
+    /// identity in the iCloud-synced keychain backup and no pairing UI is
+    /// on screen (see `presentFirstLaunchProfileSetupIfNeeded`).
+    var presentingFirstLaunchProfileSetup: Bool = false
     /// Joiner pairing flow prepared by `pairWithFoundDevice()`, promoted
     /// to `pendingJoinerPairing` once the prompt sheet finishes
     /// dismissing - presenting both sheets in the same tick can drop the
@@ -929,7 +934,13 @@ extension ConversationsViewModel {
             guard let self else { return }
             let backups = await self.session.pairableDeviceBackups()
             QAEvent.emit(.pairing, "found_device_check", ["pairableCount": "\(backups.count)"])
-            guard let newest = backups.first else { return }
+            guard let newest = backups.first else {
+                // No other identity in iCloud, so pairing will never be
+                // offered - this is the moment first-launch profile setup
+                // becomes eligible.
+                await self.presentFirstLaunchProfileSetupIfNeeded()
+                return
+            }
             // Don't fight an in-flight deep-link pairing flow - but
             // un-latch so the next chats-list appearance re-offers the
             // prompt once that flow ends. Without the reset, a launch
@@ -951,6 +962,45 @@ extension ConversationsViewModel {
         }
     }
 
+    /// First-launch profile setup: shows the "Hello / My name is" sheet
+    /// once, instead of the in-conversation "Add your name and pic"
+    /// prompt. Only reached when `checkForPairableDeviceIfNeeded` found no
+    /// other identity in the iCloud-synced keychain backup, so it can
+    /// never race the found-device pairing prompt; the explicit pairing
+    /// guards below cover deep-link and incoming pairing flows. The
+    /// in-conversation onboarding flow stays as a fallback for users who
+    /// dismiss this sheet without saving.
+    private func presentFirstLaunchProfileSetupIfNeeded() async {
+        guard ConversationOnboardingCoordinator.shouldOfferFirstLaunchProfileSheet else { return }
+        guard pendingJoinerPairing == nil,
+              foundDevicePairingPrompt == nil,
+              incomingPairingRequest == nil else { return }
+        // Don't decide on an unloaded snapshot: at cold launch the shared
+        // profile view model holds default values even for a fully
+        // onboarded user. On timeout skip without latching so the next
+        // launch retries (mirrors ConversationOnboardingCoordinator).
+        let profileLoaded = await ProfileSettingsViewModel.shared.waitForProfileLoad(
+            timeout: Constant.firstLaunchProfileLoadTimeout
+        )
+        guard profileLoaded else {
+            QAEvent.emit(.onboarding, "first_launch_profile_sheet_load_timeout")
+            return
+        }
+        guard ProfileSettingsViewModel.shared.profileSettings.isDefault else {
+            // A profile already exists (e.g. restored data): never show.
+            ConversationOnboardingCoordinator.markFirstLaunchProfileSheetShown()
+            return
+        }
+        // Re-check the pairing guards: a deep-link pairing flow may have
+        // started while we awaited the profile load.
+        guard pendingJoinerPairing == nil,
+              foundDevicePairingPrompt == nil,
+              incomingPairingRequest == nil else { return }
+        ConversationOnboardingCoordinator.markFirstLaunchProfileSheetShown()
+        presentingFirstLaunchProfileSetup = true
+        QAEvent.emit(.onboarding, "first_launch_profile_sheet_shown")
+    }
+
     /// Primary action of the prompt sheet: dismisses the prompt
     /// immediately, mints a pairing invite signed by the found device's
     /// backed-up key (so the standard joiner flow can target it as the
@@ -1247,6 +1297,10 @@ extension ConversationsViewModel {
         /// presentation was dropped. Generous against slow presentation
         /// animations; tiny against the 5s resend cadence that retries.
         static let incomingPairingPresentationGrace: TimeInterval = 3
+        /// How long first-launch profile setup waits for the global
+        /// profile to load before giving up for this launch. Matches
+        /// `ConversationOnboardingCoordinator.profileLoadTimeout`.
+        static let firstLaunchProfileLoadTimeout: TimeInterval = 10
     }
 }
Original file line number	Diff line number	Diff line change
`@@ -365,6 +365,11 @@ private struct ConversationsSheetModifier: ViewModifier {`
`365`	`365`	`.padding(.top, DesignConstants.Spacing.step5x)`
`366`	`366`	`}`
`367`	`367`	`)`
	`368`	`+ // Plain .sheet: ProfileSetupSheet supplies its own detent,`
	`369`	`+ // indicator, and background (see its body).`
	`370`	`+ .sheet(isPresented: $viewModel.presentingFirstLaunchProfileSetup) {`
	`371`	`+ ProfileSetupSheet(mode: .firstLaunch)`
	`372`	`+ }`
`368`	`373`	`.selfSizingSheet(isPresented: $viewModel.presentingExplodeInfo) {`
`369`	`374`	`ExplodeInfoView()`
`370`	`375`	`}`