From dd2dd8cc282b62c6d92d848b3dce8b7cdac57e2c Mon Sep 17 00:00:00 2001
From: Brandon McAnsh <git@bmcreations.dev>
Date: Mon, 5 Oct 2026 23:00:16 -0400
Subject: [PATCH 01/45] feat(settings): Settings screen behind a gear on the
 You tab

The You tab becomes the profile in later slices, so the rows it held
move to a Settings screen reached from a gear on the tab: an interim
Profile section (the My Account editors until Edit Profile exists),
Security, Privacy, Advanced, and Account with a new Account Info screen
(phone, email, user ID, authority public key), then the version footer.

SettingsMyAccountScreen and SettingsAdvancedFeaturesScreen are removed,
and the UI smoke tests now reach Settings through the gear.

Base: origin/main 410bb5f7.
---
 .../Navigation/AppRouter+Destination.swift    |  25 +-
 .../AppRouter+DestinationView.swift           |   8 +-
 .../Core/Screens/Main/You/YouScreen.swift     | 101 +++-----
 .../Screens/Settings/AccountInfoDetails.swift |  61 +++++
 .../Screens/Settings/AccountInfoScreen.swift  |  61 +++++
 .../SettingsAdvancedBetaFeaturesScreen.swift  |  18 +-
 .../SettingsAdvancedFeaturesScreen.swift      | 119 ----------
 .../Settings/SettingsMyAccountScreen.swift    |  75 ------
 .../Screens/Settings/SettingsScreen.swift     | 222 ++++++++++++++++++
 .../Settings/SettingsSectionHeader.swift      |  29 +++
 .../Navigation/AppRouterCrossStackTests.swift |   4 +-
 FlipcashTests/Navigation/AppRouterTests.swift |   2 +-
 .../Navigation/SettingsRoutingTests.swift     |  38 +++
 .../Navigation/SwitchAccountSheetTests.swift  |   4 +-
 .../Navigation/YouTabRoutingTests.swift       |  14 +-
 .../Settings/AccountInfoDetailsTests.swift    |  80 +++++++
 .../ApplicationLogsRegressionTests.swift      |   5 +-
 .../Smoke/AccessKeyBackupSmokeTests.swift     |  17 +-
 .../Smoke/BetaAccessUnlockSmokeTests.swift    |  18 +-
 .../Smoke/BlockUnblockSmokeTests.swift        |   9 +-
 .../Smoke/BlockedUsersSmokeTests.swift        |   5 +-
 .../Smoke/DisplayNameSmokeTests.swift         |   6 +-
 FlipcashUITests/Smoke/LoginSmokeTests.swift   |   8 +-
 .../Support/Screens/SettingsScreen.swift      |  50 ++--
 24 files changed, 598 insertions(+), 381 deletions(-)
 create mode 100644 Flipcash/Core/Screens/Settings/AccountInfoDetails.swift
 create mode 100644 Flipcash/Core/Screens/Settings/AccountInfoScreen.swift
 delete mode 100644 Flipcash/Core/Screens/Settings/SettingsAdvancedFeaturesScreen.swift
 delete mode 100644 Flipcash/Core/Screens/Settings/SettingsMyAccountScreen.swift
 create mode 100644 Flipcash/Core/Screens/Settings/SettingsScreen.swift
 create mode 100644 Flipcash/Core/Screens/Settings/SettingsSectionHeader.swift
 create mode 100644 FlipcashTests/Navigation/SettingsRoutingTests.swift
 create mode 100644 FlipcashTests/Settings/AccountInfoDetailsTests.swift

diff --git a/Flipcash/Core/Navigation/AppRouter+Destination.swift b/Flipcash/Core/Navigation/AppRouter+Destination.swift
index ffc12148c..e64d65f6f 100644
--- a/Flipcash/Core/Navigation/AppRouter+Destination.swift
+++ b/Flipcash/Core/Navigation/AppRouter+Destination.swift
@@ -56,8 +56,11 @@ extension AppRouter {
         case usdcDepositAddress
 
         // Settings flow
-        case settingsMyAccount
-        /// The display name on its own, edited from My Account. The full
+        /// The Settings list, opened from the gear on the You tab.
+        case settings
+        /// The account's phone, email, user ID and public key, opened from Settings.
+        case accountInfo
+        /// The display name on its own, edited from Settings. The full
         /// profile-setup flow starts on the same screen but carries on to the
         /// tip card; this one returns to the settings list.
         case changeDisplayName
@@ -65,15 +68,14 @@ extension AppRouter {
         /// The full profile-setup flow uses `.profilePhoto`, which carries on to
         /// the tip card; this one returns to the screen that opened it.
         case changeProfilePicture
-        /// The public handle, claimed from the You page or changed from My
-        /// Account. One destination for both: the screen seeds itself from the
+        /// The public handle, claimed from the You page or changed from
+        /// Settings. One destination for both: the screen seeds itself from the
         /// handle already on the profile, so there is nothing to distinguish.
         case username(Username?)
         /// The minimum a tipper must pay to open a DM. `isSetupStep` marks the
-        /// You tab's checklist apart from a lone edit in My Account; it reaches
+        /// You tab's checklist apart from a lone edit in Settings; it reaches
         /// the payload only, since the screen is the same from either.
         case setMinimumTip(isSetupStep: Bool)
-        case settingsAdvancedFeatures
         case settingsAdvancedBetaFeatures
         case settingsAppSettings
         case settingsAccountSelection
@@ -141,8 +143,8 @@ extension AppRouter {
                  .buyCurrency, .convertCurrency,
                  .withdrawCurrency, .usdcDepositEducation, .usdcDepositAddress:
                 return .balance
-            case .settingsMyAccount, .changeDisplayName, .changeProfilePicture, .username,
-                 .setMinimumTip, .settingsAdvancedFeatures,
+            case .settings, .accountInfo, .changeDisplayName, .changeProfilePicture, .username,
+                 .setMinimumTip,
                  .settingsAdvancedBetaFeatures, .settingsAppSettings, .settingsAccountSelection,
                  .settingsApplicationLogs, .blockedUsers, .accessKey, .withdraw:
                 return .you
@@ -176,12 +178,12 @@ extension AppRouter {
             case .withdrawCurrency:             "withdrawCurrency"
             case .usdcDepositEducation:         "usdcDepositEducation"
             case .usdcDepositAddress:           "usdcDepositAddress"
-            case .settingsMyAccount:            "settingsMyAccount"
+            case .settings:                     "settings"
+            case .accountInfo:                  "accountInfo"
             case .changeDisplayName:            "changeDisplayName"
             case .changeProfilePicture:         "changeProfilePicture"
             case .username:                     "username"
             case .setMinimumTip:                "setMinimumTip"
-            case .settingsAdvancedFeatures:     "settingsAdvancedFeatures"
             case .settingsAdvancedBetaFeatures: "settingsAdvancedBetaFeatures"
             case .settingsAppSettings:          "settingsAppSettings"
             case .settingsAccountSelection:     "settingsAccountSelection"
@@ -243,8 +245,7 @@ extension AppRouter {
             case .activity,
                  .discoverCurrencies, .currencyCreationSummary, .currencyCreationWizard,
                  .usdcDepositEducation, .usdcDepositAddress,
-                 .settingsMyAccount, .changeDisplayName, .changeProfilePicture,
-                 .settingsAdvancedFeatures,
+                 .settings, .accountInfo, .changeDisplayName, .changeProfilePicture,
                  .settingsAdvancedBetaFeatures, .settingsAppSettings, .settingsAccountSelection,
                  .settingsApplicationLogs, .blockedUsers, .accessKey, .withdraw,
                  .profileName, .profilePhoto, .tipcard, .usernameLookup, .newChat, .newPublicGroup,
diff --git a/Flipcash/Core/Navigation/AppRouter+DestinationView.swift b/Flipcash/Core/Navigation/AppRouter+DestinationView.swift
index f5068a2ce..0951a5d72 100644
--- a/Flipcash/Core/Navigation/AppRouter+DestinationView.swift
+++ b/Flipcash/Core/Navigation/AppRouter+DestinationView.swift
@@ -82,8 +82,10 @@ struct DestinationView: View {
 
         // MARK: - Settings flow
 
-        case .settingsMyAccount:
-            SettingsMyAccountScreen()
+        case .settings:
+            SettingsScreen()
+        case .accountInfo:
+            AccountInfoScreen()
 
         case .changeDisplayName:
             ChangeDisplayNameScreen(currentName: sessionContainer.session.profile?.displayName ?? "")
@@ -106,8 +108,6 @@ struct DestinationView: View {
                 )
             )
 
-        case .settingsAdvancedFeatures:
-            SettingsAdvancedFeaturesScreen()
 
         case .settingsAdvancedBetaFeatures:
             SettingsAdvancedBetaFeaturesScreen()
diff --git a/Flipcash/Core/Screens/Main/You/YouScreen.swift b/Flipcash/Core/Screens/Main/You/YouScreen.swift
index fd487c994..eff197d2c 100644
--- a/Flipcash/Core/Screens/Main/You/YouScreen.swift
+++ b/Flipcash/Core/Screens/Main/You/YouScreen.swift
@@ -10,7 +10,7 @@ import FlipcashUI
 
 /// The "You" tab (Figma node 9276:4634): the user's tip card, a "Full Screen"
 /// affordance, the copyable public link, the Share/Download pair, and the
-/// settings list — the tab-bar entry into My Account / Advanced.
+/// gear that pushes Settings.
 ///
 /// Tapping the card (or "Full Screen") expands it here on the page: everything
 /// under it slides out, the tab bar hides, and the card grows into the middle of
@@ -18,31 +18,22 @@ import FlipcashUI
 /// nothing is pushed or presented — so the card never leaves this screen.
 /// Pulling the expanded card up walks it back to its slot under the finger, so
 /// it can be put away without reaching for the close button.
-/// Settings rows push onto the tab's `.you` stack, so they never touch the v1
+/// Settings pushes onto the tab's `.you` stack, so it never touches the v1
 /// scanner's Settings sheet.
 ///
 /// A profile with no display name has no card: the page then shows the
 /// add-your-name invitation in the card's place and drops the link and share
-/// affordances, but still renders — the settings rows are this account's only
-/// way to reach My Account, and with it Log Out.
-///
-/// The two settings rows carry Android's own drawables (`MenuItems.kt`) rather
-/// than SF Symbols: `person.text.rectangle` is already the Display Name row's
-/// glyph one screen down, so the nearest system symbol would read as a repeat.
+/// affordances, but still renders — the gear is this account's only way to
+/// reach Settings, and with it Log Out.
 struct YouScreen: View {
 
     @Environment(SessionContainer.self) private var sessionContainer
     @Environment(AppRouter.self) private var router
-    @Environment(BetaFlags.self) private var betaFlags
     @Environment(TipCardPresentation.self) private var presentation
 
     /// Warms the share-sheet preview image ahead of the share tap so it never
     /// lands on the tap; keyed by user.
     @State private var previewCache = TipCodePreviewCache()
-    /// The version footer's beta-access easter egg — the tap count and the line
-    /// it shows for the last few taps.
-    @State private var versionUnlock = VersionTapUnlock()
-    @Environment(ToastController.self) private var toasts
     @State private var isShowingDownloadOptions = false
 
     /// The format tapped in the download sheet, held until the sheet is gone so
@@ -94,9 +85,7 @@ struct YouScreen: View {
     /// the card picks up from where it stands instead of jumping that distance.
     private static let dragActivationSlack: CGFloat = 10
 
-    private let rowInsets = EdgeInsets(top: 25, leading: 0, bottom: 25, trailing: 0)
-
-    /// The gap the page keeps between the version footer and the tab bar.
+    /// The gap the page keeps between its last row and the tab bar.
     private static let tabBarGap: CGFloat = 24
 
     /// How far below the safe area the top fade runs out. Matches `WalletScreen`.
@@ -157,6 +146,13 @@ struct YouScreen: View {
                 }
                 .onGeometryChange(for: CGFloat.self) { $0.safeAreaInsets.top } action: { safeAreaTop = $0 }
 
+                // Sibling of the scroll view, not an overlay on it: the ZStack
+                // already sits below the status bar, so no `safeAreaTop` offset.
+                settingsGear
+                    .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topTrailing)
+                    .opacity(isExpanded ? 0 : 1)
+                    .allowsHitTesting(!isExpanded)
+
                 if isExpanded {
                     closeButton
                         .transition(.opacity)
@@ -191,7 +187,7 @@ struct YouScreen: View {
     ///
     /// A profile without a display name has no card to draw, so the slot carries
     /// the invitation to add one instead. The rest of the page stays where it is
-    /// either way — settings included, which is the only route to logging out.
+    /// either way — the gear included, which is the only route to logging out.
     @ViewBuilder
     private var cardSection: some View {
         if let name = displayName {
@@ -348,13 +344,31 @@ struct YouScreen: View {
         .opacity(0.5)
     }
 
+    // MARK: - Settings gear -
+
+    private var settingsGear: some View {
+        Button {
+            router.push(.settings)
+        } label: {
+            Image(systemName: "gearshape")
+                .font(.system(size: 20))
+                .foregroundStyle(Color.textMain)
+                .frame(width: 44, height: 44)
+                .contentShape(Rectangle())
+        }
+        .buttonStyle(.plain)
+        .padding(.top, 4)
+        .padding(.trailing, 8)
+        .accessibilityLabel("Settings")
+        .accessibilityIdentifier("you-settings")
+    }
+
     // MARK: - Page -
 
     /// Everything below the card — the part that clears out when the card expands.
     ///
     /// The link and the Share/Download pair all address a card that a name-less
-    /// profile does not have, so they sit out until it does; the settings rows
-    /// take up the slack. The checklist shows either way, since naming the
+    /// profile does not have, so they sit out until it does. The checklist shows either way, since naming the
     /// profile is one of its chores.
     private var pageContent: some View {
         VStack(spacing: 0) {
@@ -395,30 +409,7 @@ struct YouScreen: View {
                         .accessibilityIdentifier("you-username-progress-card")
                 }
             }
-
-            settingsList
-                .padding(.top, displayName == nil && !profileTutorialState.isVisible ? 48 : 19)
-
-            // v2 scrolls the version string with the content rather than
-            // pinning it above the tab bar (the v1 Settings sheet pinned it).
-            versionFooter
-                .padding(.top, 32)
-        }
-    }
-
-    // MARK: - Settings list -
-
-    private var settingsList: some View {
-        VStack(alignment: .leading, spacing: 0) {
-            SettingsRow(asset: .myAccount, title: "My Account", insets: rowInsets) {
-                router.push(.settingsMyAccount)
-            }
-            SettingsRow(asset: .advanced, title: "Advanced", insets: rowInsets) {
-                router.push(.settingsAdvancedFeatures)
-            }
         }
-        .font(.appDisplayXS)
-        .foregroundStyle(Color.textMain)
     }
 
     // MARK: - Username progress -
@@ -456,32 +447,6 @@ struct YouScreen: View {
         }
     }
 
-    private var versionFooter: some View {
-        Button {
-            let message = versionUnlock.registerTap(isUnlocked: betaFlags.accessGranted) {
-                betaFlags.setAccessGranted(!betaFlags.accessGranted)
-            }
-            if let message {
-                // Two seconds and swapped in place, so consecutive taps read as one countdown. Without an action the toast
-                // lets taps through, so it never blocks the version string at the bottom of the list.
-                toasts.show(
-                    .init(message, messageIdentifier: "you-version-toast", width: .fit, duration: .seconds(2)),
-                    inPlace: true
-                )
-            }
-        } label: {
-            Text("Version \(AppMeta.version) • Build \(AppMeta.build)")
-                .lineLimit(1)
-                .font(.appTextHeading)
-                .foregroundStyle(Color.textSecondary)
-                .padding(.vertical, 12)
-                .frame(maxWidth: .infinity)
-                .contentShape(Rectangle())
-        }
-        .buttonStyle(.plain)
-        .accessibilityIdentifier("you-version-footer")
-    }
-
     // MARK: - Content -
 
     private var isExpanded: Bool { presentation.isExpanded }
diff --git a/Flipcash/Core/Screens/Settings/AccountInfoDetails.swift b/Flipcash/Core/Screens/Settings/AccountInfoDetails.swift
new file mode 100644
index 000000000..c80b8f293
--- /dev/null
+++ b/Flipcash/Core/Screens/Settings/AccountInfoDetails.swift
@@ -0,0 +1,61 @@
+//
+//  AccountInfoDetails.swift
+//  Flipcash
+//
+
+import Foundation
+import FlipcashCore
+
+/// The rows on the Account Info screen, built from the account's identity.
+///
+/// Named `AccountInfoDetails` because `AccountInfo` is already the on-chain
+/// token-account model in FlipcashCore.
+nonisolated struct AccountInfoDetails {
+
+    struct Row: Hashable {
+        let title: String
+        let display: String
+        let copyValue: String
+        let accessibilityID: String
+    }
+
+    /// Phone and email only when the profile has them, then the account ID and
+    /// the owner authority's public key.
+    static func rows(profile: Profile?, userID: UserID, authority: PublicKey) -> [Row] {
+        var rows: [Row] = []
+
+        if let phone = profile?.phone {
+            rows.append(Row(
+                title: "Phone",
+                display: phone.national,
+                copyValue: phone.e164,
+                accessibilityID: "account-info-phone"
+            ))
+        }
+
+        if let email = profile?.email, !email.isEmpty {
+            rows.append(Row(
+                title: "Email",
+                display: email,
+                copyValue: email,
+                accessibilityID: "account-info-email"
+            ))
+        }
+
+        rows.append(Row(
+            title: "Account ID",
+            display: userID.uuidString,
+            copyValue: userID.uuidString,
+            accessibilityID: "account-info-account-id"
+        ))
+
+        rows.append(Row(
+            title: "Public Key",
+            display: authority.base58,
+            copyValue: authority.base58,
+            accessibilityID: "account-info-public-key"
+        ))
+
+        return rows
+    }
+}
diff --git a/Flipcash/Core/Screens/Settings/AccountInfoScreen.swift b/Flipcash/Core/Screens/Settings/AccountInfoScreen.swift
new file mode 100644
index 000000000..528933184
--- /dev/null
+++ b/Flipcash/Core/Screens/Settings/AccountInfoScreen.swift
@@ -0,0 +1,61 @@
+//
+//  AccountInfoScreen.swift
+//  Flipcash
+//
+
+import SwiftUI
+import UIKit
+import FlipcashUI
+import FlipcashCore
+
+/// The account's phone, email, user ID and owner public key. Tapping a row
+/// copies its value.
+struct AccountInfoScreen: View {
+
+    @Environment(SessionContainer.self) private var sessionContainer
+    @Environment(ToastController.self) private var toasts
+
+    var body: some View {
+        let session = sessionContainer.session
+        let rows = AccountInfoDetails.rows(
+            profile: session.profile,
+            userID: session.userID,
+            authority: session.owner.authorityPublicKey
+        )
+
+        Background(color: .backgroundMain) {
+            ScrollView(showsIndicators: false) {
+                VStack(alignment: .leading, spacing: 0) {
+                    ForEach(rows, id: \.self) { row in
+                        Button {
+                            copy(row)
+                        } label: {
+                            VStack(alignment: .leading, spacing: 4) {
+                                Text(row.title)
+                                    .font(.appTextHeading)
+                                    .foregroundStyle(Color.textSecondary)
+                                Text(row.display)
+                                    .font(.appTextMedium)
+                                    .foregroundStyle(Color.textMain)
+                                    .multilineTextAlignment(.leading)
+                            }
+                            .frame(maxWidth: .infinity, alignment: .leading)
+                            .padding(.vertical, 16)
+                            .contentShape(Rectangle())
+                        }
+                        .buttonStyle(.plain)
+                        .accessibilityIdentifier(row.accessibilityID)
+                    }
+                }
+            }
+            .padding(.horizontal, 20)
+        }
+        .navigationTitle("Account Info")
+        .toolbarTitleDisplayMode(.inline)
+    }
+
+    private func copy(_ row: AccountInfoDetails.Row) {
+        UIPasteboard.general.string = row.copyValue
+        toasts.show(.init("Copied", systemImage: "checkmark.circle.fill", duration: .seconds(2)))
+    }
+}
diff --git a/Flipcash/Core/Screens/Settings/SettingsAdvancedBetaFeaturesScreen.swift b/Flipcash/Core/Screens/Settings/SettingsAdvancedBetaFeaturesScreen.swift
index 56c3893e7..acdae54d4 100644
--- a/Flipcash/Core/Screens/Settings/SettingsAdvancedBetaFeaturesScreen.swift
+++ b/Flipcash/Core/Screens/Settings/SettingsAdvancedBetaFeaturesScreen.swift
@@ -53,14 +53,14 @@ struct SettingsAdvancedBetaFeaturesScreen: View {
 
                     if betaFlags.accessGranted {
                         if !developerOptions.isEmpty {
-                            sectionHeader("Developer")
+                            SettingsSectionHeader("Developer")
 
                             ForEach(developerOptions) { option in
                                 BetaFlagToggleRow(option: option, isOn: betaFlags.bindingFor(option: option))
                             }
                         }
 
-                        sectionHeader("Account")
+                        SettingsSectionHeader("Account")
 
                         unlinkRow(title: "Unlink Email", isDisabled: session.profile?.email == nil) {
                             isConfirmingUnlinkEmail = true
@@ -69,7 +69,7 @@ struct SettingsAdvancedBetaFeaturesScreen: View {
                             isConfirmingUnlinkPhone = true
                         }
 
-                        sectionHeader("Contracts")
+                        SettingsSectionHeader("Contracts")
 
                         ForEach(ContractInfo.all) { info in
                             ContractInfoRow(info: info)
@@ -121,18 +121,6 @@ struct SettingsAdvancedBetaFeaturesScreen: View {
 
     // MARK: - Subviews -
 
-    private func sectionHeader(_ title: String) -> some View {
-        HStack {
-            Text(title)
-                .font(.appTextHeading)
-                .foregroundStyle(.textSecondary)
-            Spacer()
-        }
-        .padding(.horizontal, 20)
-        .padding(.top, 20)
-        .padding(.bottom, 8)
-    }
-
     private func unlinkRow(title: String, isDisabled: Bool, action: @escaping () -> Void) -> some View {
         Button(action: action) {
             HStack {
diff --git a/Flipcash/Core/Screens/Settings/SettingsAdvancedFeaturesScreen.swift b/Flipcash/Core/Screens/Settings/SettingsAdvancedFeaturesScreen.swift
deleted file mode 100644
index c8242ed50..000000000
--- a/Flipcash/Core/Screens/Settings/SettingsAdvancedFeaturesScreen.swift
+++ /dev/null
@@ -1,119 +0,0 @@
-//
-//  SettingsAdvancedFeaturesScreen.swift
-//  Flipcash
-//
-//  Created by Raul Riera on 2026-04-27.
-//
-
-import SwiftUI
-import FlipcashUI
-import FlipcashCore
-
-/// The Advanced settings list (Figma node 9279:121978): the account-level
-/// actions — Access Key, Switch Accounts, Log Out, Delete Account — alongside
-/// Beta Features and Application Logs. My Account keeps the rows about the
-/// profile this account presents, and who it will deal with.
-///
-/// The row icons track Android's (`AdvancedFeatureMenuItems.kt`) through the
-/// nearest SF Symbol.
-struct SettingsAdvancedFeaturesScreen: View {
-
-    @Environment(AppRouter.self) private var router
-    @Environment(BetaFlags.self) private var betaFlags
-    @Environment(SessionAuthenticator.self) private var sessionAuthenticator
-    @Environment(ContactSyncController.self) private var contactSyncController
-
-    @State private var dialogItem: DialogItem?
-
-    private let insets = EdgeInsets(top: 25, leading: 0, bottom: 25, trailing: 0)
-
-    var body: some View {
-        Background(color: .backgroundMain) {
-            ScrollView(showsIndicators: false) {
-                VStack(alignment: .leading, spacing: 0) {
-                    SettingsRow(systemImage: "key.horizontal", title: "Access Key", insets: insets) {
-                        dialogItem = .alert(
-                            title: "View Your Access Key?",
-                            subtitle: "Your Access Key will grant access to your Flipcash account. Keep it private and safe"
-                        ) {
-                            DialogAction.destructive("View Access Key") {
-                                router.push(.accessKey)
-                            }
-                            DialogAction.cancel()
-                        }
-                    }
-
-                    SettingsRow(systemImage: "flask", title: "Beta Features", insets: insets) {
-                        router.push(.settingsAdvancedBetaFeatures)
-                    }
-
-                    SettingsRow(systemImage: "doc.text", title: "Application Logs", insets: insets) {
-                        router.push(.settingsApplicationLogs)
-                    }
-
-                    // Sits with the other beta tool rather than on My Account: it is
-                    // a way out of this account, next to Log Out, not a detail of it.
-                    if betaFlags.canSwitchAccounts {
-                        SettingsRow(asset: .switchAccounts, title: "Switch Accounts", badge: .beta, insets: insets) {
-                            router.push(.settingsAccountSelection)
-                        }
-                        .accessibilityIdentifier("account-switch-accounts-row")
-                    }
-
-                    SettingsRow(asset: .logout, title: "Log Out", insets: insets) {
-                        dialogItem = .alert(
-                            title: "Are You Sure You Want To Log Out?",
-                            subtitle: "You can get into this account using your Access Key"
-                        ) {
-                            DialogAction.destructive("Log Out") {
-                                logout()
-                            }
-                            DialogAction.cancel()
-                        }
-                    }
-
-                    SettingsRow(asset: .delete, title: "Delete Account", insets: insets) {
-                        dialogItem = .alert(
-                            title: "Permanently Delete Account?",
-                            subtitle: "This will permanently delete your Flipcash account"
-                        ) {
-                            DialogAction.destructive("Permanently Delete Account") {
-                                deleteAccount()
-                            }
-                            DialogAction.cancel()
-                        }
-                    }
-                }
-                .font(.appDisplayXS)
-                .foregroundStyle(.textMain)
-                .padding(.horizontal, 20)
-            }
-        }
-        .navigationTitle("Advanced")
-        .toolbarTitleDisplayMode(.inline)
-        .dialog(item: $dialogItem)
-    }
-
-    // MARK: - Actions -
-
-    private func deleteAccount() {
-        Task {
-            router.dismissSheet()
-            try await Task.delay(milliseconds: 250)
-            // No server-side account deletion exists; logout only tears down
-            // locally. Wipe the server's stored contact set first so it isn't
-            // retained after the account is "deleted". Best-effort — must run
-            // before logout while the session can still authenticate the call.
-            await contactSyncController.clearServerContactSetForAccountDeletion()
-            sessionAuthenticator.logout()
-        }
-    }
-
-    private func logout() {
-        Task {
-            router.dismissSheet()
-            try await Task.delay(milliseconds: 250)
-            sessionAuthenticator.logout()
-        }
-    }
-}
diff --git a/Flipcash/Core/Screens/Settings/SettingsMyAccountScreen.swift b/Flipcash/Core/Screens/Settings/SettingsMyAccountScreen.swift
deleted file mode 100644
index 78e9b44ba..000000000
--- a/Flipcash/Core/Screens/Settings/SettingsMyAccountScreen.swift
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-//  SettingsMyAccountScreen.swift
-//  Flipcash
-//
-//  Created by Raul Riera on 2026-04-27.
-//
-
-import SwiftUI
-import FlipcashUI
-import FlipcashCore
-
-/// The My Account settings list (Figma node 9544:18478): who this account
-/// deals with, and the profile it presents. The account-level actions — Access
-/// Key, Switch Accounts, Log Out, Delete Account — live on Advanced.
-///
-/// The design also lists Require Biometrics, which isn't here: iOS has no
-/// biometrics setting to toggle.
-///
-/// The row icons track Android's (`MyAccountMenuItems.kt`) through the nearest
-/// SF Symbol, so the two platforms read alike without importing Material into
-/// a system-symbol set. Profile Picture is the exception: `familiar_face_and_zone`
-/// has no SF equivalent, so it ships as an asset.
-struct SettingsMyAccountScreen: View {
-
-    @Environment(AppRouter.self) private var router
-    @Environment(Session.self) private var session
-
-    private let insets = EdgeInsets(top: 25, leading: 0, bottom: 25, trailing: 0)
-
-    var body: some View {
-        Background(color: .backgroundMain) {
-            ScrollView(showsIndicators: false) {
-                list()
-            }
-            .padding(.horizontal, 20)
-        }
-        .navigationTitle("My Account")
-        .toolbarTitleDisplayMode(.inline)
-    }
-
-    @ViewBuilder
-    private func list() -> some View {
-        VStack(alignment: .leading, spacing: 0) {
-            SettingsRow(systemImage: "person.text.rectangle", title: "Display Name", insets: insets) {
-                router.push(.changeDisplayName)
-            }
-
-            // No balance gate here: the gate exists to stop squatting at claim time. A user who
-            // already holds a handle has cleared it, and re-gating a change would hold their
-            // handle hostage to a balance that has since moved.
-            if let username = session.profile?.username {
-                SettingsRow(systemImage: "at", title: "Username", insets: insets) {
-                    router.push(.username(username))
-                }
-                .accessibilityIdentifier("account-change-username-row")
-            }
-
-            SettingsRow(asset: .profilePicture, title: "Profile Picture", insets: insets) {
-                router.push(.changeProfilePicture)
-            }
-            .accessibilityIdentifier("account-profile-picture-row")
-
-            SettingsRow(asset: .coins, title: "Minimum To Chat", insets: insets) {
-                router.push(.setMinimumTip(isSetupStep: false))
-            }
-            .accessibilityIdentifier("account-minimum-tip-row")
-
-            SettingsRow(systemImage: "nosign", title: "Blocked", insets: insets) {
-                router.push(.blockedUsers)
-            }
-        }
-        .font(.appDisplayXS)
-        .foregroundStyle(.textMain)
-    }
-}
diff --git a/Flipcash/Core/Screens/Settings/SettingsScreen.swift b/Flipcash/Core/Screens/Settings/SettingsScreen.swift
new file mode 100644
index 000000000..2b1c0e785
--- /dev/null
+++ b/Flipcash/Core/Screens/Settings/SettingsScreen.swift
@@ -0,0 +1,222 @@
+//
+//  SettingsScreen.swift
+//  Flipcash
+//
+
+import SwiftUI
+import FlipcashUI
+import FlipcashCore
+
+/// The Settings list, pushed from the gear on the You tab: the profile editors,
+/// the account-level actions, and the version footer that doubles as the
+/// beta-access easter egg.
+///
+/// The row icons track Android's through the nearest SF Symbol. Profile Picture
+/// is the exception: `familiar_face_and_zone` has no SF equivalent, so it ships
+/// as an asset.
+struct SettingsScreen: View {
+
+    @Environment(AppRouter.self) private var router
+    @Environment(Session.self) private var session
+    @Environment(BetaFlags.self) private var betaFlags
+    @Environment(SessionAuthenticator.self) private var sessionAuthenticator
+    @Environment(ContactSyncController.self) private var contactSyncController
+    @Environment(ToastController.self) private var toasts
+
+    @State private var dialogItem: DialogItem?
+    /// The version footer's beta-access easter egg — the tap count and the line
+    /// it shows for the last few taps.
+    @State private var versionUnlock = VersionTapUnlock()
+
+    // Horizontal inset lives on the rows, not the list: the section headers
+    // carry their own 20pt.
+    private let insets = EdgeInsets(top: 25, leading: 20, bottom: 25, trailing: 20)
+
+    var body: some View {
+        Background(color: .backgroundMain) {
+            ScrollView(showsIndicators: false) {
+                VStack(alignment: .leading, spacing: 0) {
+                    profileSection
+                    securitySection
+                    privacySection
+                    advancedSection
+                    accountSection
+                    versionFooter
+                        .padding(.top, 32)
+                }
+                .font(.appDisplayXS)
+                .foregroundStyle(.textMain)
+                .padding(.bottom, 24)
+            }
+        }
+        .navigationTitle("Settings")
+        .toolbarTitleDisplayMode(.inline)
+        .dialog(item: $dialogItem)
+    }
+
+    // MARK: - Sections -
+
+    /// Interim: Edit Profile replaces this section.
+    private var profileSection: some View {
+        VStack(alignment: .leading, spacing: 0) {
+            SettingsSectionHeader("Profile")
+
+            SettingsRow(systemImage: "person.text.rectangle", title: "Display Name", insets: insets) {
+                router.push(.changeDisplayName)
+            }
+
+            // No balance gate here: the gate exists to stop squatting at claim time. A user who
+            // already holds a handle has cleared it, and re-gating a change would hold their
+            // handle hostage to a balance that has since moved.
+            if let username = session.profile?.username {
+                SettingsRow(systemImage: "at", title: "Username", insets: insets) {
+                    router.push(.username(username))
+                }
+                .accessibilityIdentifier("account-change-username-row")
+            }
+
+            SettingsRow(asset: .profilePicture, title: "Profile Picture", insets: insets) {
+                router.push(.changeProfilePicture)
+            }
+            .accessibilityIdentifier("account-profile-picture-row")
+
+            SettingsRow(asset: .coins, title: "Minimum To Chat", insets: insets) {
+                router.push(.setMinimumTip(isSetupStep: false))
+            }
+            .accessibilityIdentifier("account-minimum-tip-row")
+        }
+    }
+
+    private var securitySection: some View {
+        VStack(alignment: .leading, spacing: 0) {
+            SettingsSectionHeader("Security")
+
+            SettingsRow(systemImage: "key.horizontal", title: "Access Key", insets: insets) {
+                dialogItem = .alert(
+                    title: "View Your Access Key?",
+                    subtitle: "Your Access Key will grant access to your Flipcash account. Keep it private and safe"
+                ) {
+                    DialogAction.destructive("View Access Key") {
+                        router.push(.accessKey)
+                    }
+                    DialogAction.cancel()
+                }
+            }
+        }
+    }
+
+    private var privacySection: some View {
+        VStack(alignment: .leading, spacing: 0) {
+            SettingsSectionHeader("Privacy")
+
+            SettingsRow(systemImage: "nosign", title: "Blocked", insets: insets) {
+                router.push(.blockedUsers)
+            }
+        }
+    }
+
+    private var advancedSection: some View {
+        VStack(alignment: .leading, spacing: 0) {
+            SettingsSectionHeader("Advanced")
+
+            SettingsRow(systemImage: "flask", title: "Beta Features", insets: insets) {
+                router.push(.settingsAdvancedBetaFeatures)
+            }
+
+            SettingsRow(systemImage: "doc.text", title: "Application Logs", insets: insets) {
+                router.push(.settingsApplicationLogs)
+            }
+
+            if betaFlags.canSwitchAccounts {
+                SettingsRow(asset: .switchAccounts, title: "Switch Accounts", badge: .beta, insets: insets) {
+                    router.push(.settingsAccountSelection)
+                }
+                .accessibilityIdentifier("account-switch-accounts-row")
+            }
+        }
+    }
+
+    private var accountSection: some View {
+        VStack(alignment: .leading, spacing: 0) {
+            SettingsSectionHeader("Account")
+
+            SettingsRow(systemImage: "person.crop.circle", title: "Account Info", insets: insets) {
+                router.push(.accountInfo)
+            }
+            .accessibilityIdentifier("settings-account-info-row")
+
+            SettingsRow(asset: .logout, title: "Log Out", insets: insets) {
+                dialogItem = .alert(
+                    title: "Are You Sure You Want To Log Out?",
+                    subtitle: "You can get into this account using your Access Key"
+                ) {
+                    DialogAction.destructive("Log Out") {
+                        logout()
+                    }
+                    DialogAction.cancel()
+                }
+            }
+
+            SettingsRow(asset: .delete, title: "Delete Account", insets: insets) {
+                dialogItem = .alert(
+                    title: "Permanently Delete Account?",
+                    subtitle: "This will permanently delete your Flipcash account"
+                ) {
+                    DialogAction.destructive("Permanently Delete Account") {
+                        deleteAccount()
+                    }
+                    DialogAction.cancel()
+                }
+            }
+        }
+    }
+
+    private var versionFooter: some View {
+        Button {
+            let message = versionUnlock.registerTap(isUnlocked: betaFlags.accessGranted) {
+                betaFlags.setAccessGranted(!betaFlags.accessGranted)
+            }
+            if let message {
+                // Two seconds and swapped in place, so consecutive taps read as one countdown. Without an action the toast
+                // lets taps through, so it never blocks the version string at the bottom of the list.
+                toasts.show(
+                    .init(message, messageIdentifier: "you-version-toast", width: .fit, duration: .seconds(2)),
+                    inPlace: true
+                )
+            }
+        } label: {
+            Text("Version \(AppMeta.version) • Build \(AppMeta.build)")
+                .lineLimit(1)
+                .font(.appTextHeading)
+                .foregroundStyle(Color.textSecondary)
+                .padding(.vertical, 12)
+                .frame(maxWidth: .infinity)
+                .contentShape(Rectangle())
+        }
+        .buttonStyle(.plain)
+        .accessibilityIdentifier("you-version-footer")
+    }
+
+    // MARK: - Actions -
+
+    private func deleteAccount() {
+        Task {
+            router.dismissSheet()
+            try await Task.delay(milliseconds: 250)
+            // No server-side account deletion exists; logout only tears down
+            // locally. Wipe the server's stored contact set first so it isn't
+            // retained after the account is "deleted". Best-effort — must run
+            // before logout while the session can still authenticate the call.
+            await contactSyncController.clearServerContactSetForAccountDeletion()
+            sessionAuthenticator.logout()
+        }
+    }
+
+    private func logout() {
+        Task {
+            router.dismissSheet()
+            try await Task.delay(milliseconds: 250)
+            sessionAuthenticator.logout()
+        }
+    }
+}
diff --git a/Flipcash/Core/Screens/Settings/SettingsSectionHeader.swift b/Flipcash/Core/Screens/Settings/SettingsSectionHeader.swift
new file mode 100644
index 000000000..61cc0d50a
--- /dev/null
+++ b/Flipcash/Core/Screens/Settings/SettingsSectionHeader.swift
@@ -0,0 +1,29 @@
+//
+//  SettingsSectionHeader.swift
+//  Flipcash
+//
+
+import SwiftUI
+import FlipcashUI
+
+/// The small grey heading that opens a group of rows on a settings screen.
+struct SettingsSectionHeader: View {
+
+    let title: String
+
+    init(_ title: String) {
+        self.title = title
+    }
+
+    var body: some View {
+        HStack {
+            Text(title)
+                .font(.appTextHeading)
+                .foregroundStyle(.textSecondary)
+            Spacer()
+        }
+        .padding(.horizontal, 20)
+        .padding(.top, 20)
+        .padding(.bottom, 8)
+    }
+}
diff --git a/FlipcashTests/Navigation/AppRouterCrossStackTests.swift b/FlipcashTests/Navigation/AppRouterCrossStackTests.swift
index 4ae532dd0..fd1ff0ad2 100644
--- a/FlipcashTests/Navigation/AppRouterCrossStackTests.swift
+++ b/FlipcashTests/Navigation/AppRouterCrossStackTests.swift
@@ -150,9 +150,9 @@ struct AppRouterCrossStackTests {
             (AppRouter.Destination.withdrawCurrency(.usdc),         AppRouter.Stack.balance),
             (AppRouter.Destination.usdcDepositEducation,            AppRouter.Stack.balance),
             (AppRouter.Destination.usdcDepositAddress,              AppRouter.Stack.balance),
-            (AppRouter.Destination.settingsMyAccount,               AppRouter.Stack.you),
+            (AppRouter.Destination.settings,                        AppRouter.Stack.you),
+            (AppRouter.Destination.accountInfo,                     AppRouter.Stack.you),
             (AppRouter.Destination.changeDisplayName,               AppRouter.Stack.you),
-            (AppRouter.Destination.settingsAdvancedFeatures,        AppRouter.Stack.you),
             (AppRouter.Destination.settingsAppSettings,             AppRouter.Stack.you),
             (AppRouter.Destination.settingsAdvancedBetaFeatures,    AppRouter.Stack.you),
             (AppRouter.Destination.settingsAccountSelection,        AppRouter.Stack.you),
diff --git a/FlipcashTests/Navigation/AppRouterTests.swift b/FlipcashTests/Navigation/AppRouterTests.swift
index 051645399..57ac1e587 100644
--- a/FlipcashTests/Navigation/AppRouterTests.swift
+++ b/FlipcashTests/Navigation/AppRouterTests.swift
@@ -370,7 +370,7 @@ struct AppRouterTests {
             AppRouter.Destination.discoverCurrencies,
             AppRouter.Destination.currencyCreationSummary,
             AppRouter.Destination.currencyCreationWizard,
-            AppRouter.Destination.settingsMyAccount,
+            AppRouter.Destination.settings,
             AppRouter.Destination.withdraw,
         ]
     )
diff --git a/FlipcashTests/Navigation/SettingsRoutingTests.swift b/FlipcashTests/Navigation/SettingsRoutingTests.swift
new file mode 100644
index 000000000..72ef20b3d
--- /dev/null
+++ b/FlipcashTests/Navigation/SettingsRoutingTests.swift
@@ -0,0 +1,38 @@
+//
+//  SettingsRoutingTests.swift
+//  FlipcashTests
+//
+
+import Testing
+@testable import Flipcash
+
+@MainActor
+@Suite("Settings routing")
+struct SettingsRoutingTests {
+
+    @Test("Settings and Account Info are owned by the You stack", arguments: [
+        AppRouter.Destination.settings,
+        AppRouter.Destination.accountInfo,
+    ])
+    func owningStack(destination: AppRouter.Destination) {
+        #expect(destination.owningStack == .you)
+    }
+
+    @Test("Pushing Settings from the You tab lands on the You stack")
+    func pushLandsOnYou() {
+        let router = AppRouter()
+
+        router.activeTabStack = .you
+        router.push(.settings)
+
+        #expect(router[.you] == AppRouter.navigationPath(.settings))
+    }
+
+    @Test("Log names are stable and carry no payload")
+    func logNames() {
+        #expect(AppRouter.Destination.settings.description == "settings")
+        #expect(AppRouter.Destination.accountInfo.description == "accountInfo")
+        #expect(AppRouter.Destination.settings.payload == nil)
+        #expect(AppRouter.Destination.accountInfo.payload == nil)
+    }
+}
diff --git a/FlipcashTests/Navigation/SwitchAccountSheetTests.swift b/FlipcashTests/Navigation/SwitchAccountSheetTests.swift
index a40a7338e..c9cb79ee2 100644
--- a/FlipcashTests/Navigation/SwitchAccountSheetTests.swift
+++ b/FlipcashTests/Navigation/SwitchAccountSheetTests.swift
@@ -43,14 +43,14 @@ struct SwitchAccountSheetTests {
     func dismiss_returnsToTab() {
         let router = AppRouter()
         router.activeTabStack = .you
-        router.push(.settingsMyAccount)
+        router.push(.settings)
         router.present(.switchAccount)
 
         router.dismissSheet()
 
         #expect(router.presentedSheet == nil)
         #expect(router.activeTabStack == .you)
-        #expect(router[.you] == AppRouter.navigationPath(.settingsMyAccount))
+        #expect(router[.you] == AppRouter.navigationPath(.settings))
     }
 
     @Test("a self tipcard scan dismisses the switcher on its way to the You tab")
diff --git a/FlipcashTests/Navigation/YouTabRoutingTests.swift b/FlipcashTests/Navigation/YouTabRoutingTests.swift
index 075464e84..d50055124 100644
--- a/FlipcashTests/Navigation/YouTabRoutingTests.swift
+++ b/FlipcashTests/Navigation/YouTabRoutingTests.swift
@@ -22,8 +22,8 @@ struct YouTabRoutingTests {
     func push_onActiveYouTab_landsOnYouStack() {
         let router = AppRouter()
         router.activeTabStack = .you
-        router.push(.settingsMyAccount)
-        #expect(router[.you] == AppRouter.navigationPath(.settingsMyAccount))
+        router.push(.settings)
+        #expect(router[.you] == AppRouter.navigationPath(.settings))
         #expect(router[.balance].isEmpty) // never leaks onto another tab's stack
     }
 
@@ -31,7 +31,7 @@ struct YouTabRoutingTests {
     func showOwnTipCard_inTabUI_selectsYouTabAtRoot() {
         let router = AppRouter()
         // Drilled into My Account behind a sheet — where a self link can land.
-        router.setPath([.settingsMyAccount], on: .you)
+        router.setPath([.settings], on: .you)
         router.present(.give)
 
         router.showOwnTipCard()
@@ -60,7 +60,7 @@ struct YouTabRoutingTests {
     func showOwnTipCard_fromPushedYouScreen_popsToRoot() {
         let router = AppRouter()
         router.activeTabStack = .you
-        router.push(.settingsMyAccount)
+        router.push(.settings)
 
         router.showOwnTipCard()
 
@@ -72,13 +72,13 @@ struct YouTabRoutingTests {
     func changeDisplayName_pushesAndPopsOnYouStack() {
         let router = AppRouter()
         router.activeTabStack = .you
-        router.push(.settingsMyAccount)
+        router.push(.settings)
         router.push(.changeDisplayName)
-        #expect(router[.you] == AppRouter.navigationPath(.settingsMyAccount, .changeDisplayName))
+        #expect(router[.you] == AppRouter.navigationPath(.settings, .changeDisplayName))
 
         // What `ProfileNameScreen(completion: .back)` runs once the name saves.
         router.popTopmost()
-        #expect(router[.you] == AppRouter.navigationPath(.settingsMyAccount))
+        #expect(router[.you] == AppRouter.navigationPath(.settings))
     }
 
     @Test("changing the profile picture belongs to the You tab, not the setup flow's stack")
diff --git a/FlipcashTests/Settings/AccountInfoDetailsTests.swift b/FlipcashTests/Settings/AccountInfoDetailsTests.swift
new file mode 100644
index 000000000..923abc168
--- /dev/null
+++ b/FlipcashTests/Settings/AccountInfoDetailsTests.swift
@@ -0,0 +1,80 @@
+//
+//  AccountInfoDetailsTests.swift
+//  FlipcashTests
+//
+
+import Foundation
+import Testing
+import FlipcashCore
+@testable import Flipcash
+
+@Suite("AccountInfoDetails")
+struct AccountInfoDetailsTests {
+
+    private let userID = UUID()
+    private let authority = PublicKey.usdc
+
+    private func profile(phone: Phone?, email: String?) -> Profile {
+        Profile(displayName: "Ada", phone: phone, email: email)
+    }
+
+    @Test("All fields present: phone, email, account ID, public key in order")
+    func allFields() throws {
+        let phone = try #require(Phone("+14155552671"))
+        let rows = AccountInfoDetails.rows(
+            profile: profile(phone: phone, email: "ada@example.com"),
+            userID: userID,
+            authority: authority
+        )
+
+        #expect(rows.map(\.title) == ["Phone", "Email", "Account ID", "Public Key"])
+        #expect(rows.map(\.display) == [phone.national, "ada@example.com", userID.uuidString, authority.base58])
+        #expect(rows.map(\.accessibilityID) == [
+            "account-info-phone", "account-info-email", "account-info-account-id", "account-info-public-key",
+        ])
+    }
+
+    @Test("Phone copies the E.164 form, not the national display")
+    func phoneCopiesE164() throws {
+        let phone = try #require(Phone("+14155552671"))
+        let rows = AccountInfoDetails.rows(
+            profile: profile(phone: phone, email: nil),
+            userID: userID,
+            authority: authority
+        )
+
+        let row = try #require(rows.first)
+        #expect(row.copyValue == phone.e164)
+        #expect(row.display == phone.national)
+    }
+
+    @Test("No phone and no email leaves account ID and public key")
+    func noContact() {
+        let rows = AccountInfoDetails.rows(
+            profile: profile(phone: nil, email: nil),
+            userID: userID,
+            authority: authority
+        )
+
+        #expect(rows.map(\.title) == ["Account ID", "Public Key"])
+        #expect(rows.map(\.copyValue) == [userID.uuidString, authority.base58])
+    }
+
+    @Test("An empty email string yields no email row")
+    func emptyEmail() {
+        let rows = AccountInfoDetails.rows(
+            profile: profile(phone: nil, email: ""),
+            userID: userID,
+            authority: authority
+        )
+
+        #expect(!rows.contains { $0.title == "Email" })
+    }
+
+    @Test("A missing profile still shows account ID and public key")
+    func nilProfile() {
+        let rows = AccountInfoDetails.rows(profile: nil, userID: userID, authority: authority)
+
+        #expect(rows.map(\.title) == ["Account ID", "Public Key"])
+    }
+}
diff --git a/FlipcashUITests/Regression/ApplicationLogsRegressionTests.swift b/FlipcashUITests/Regression/ApplicationLogsRegressionTests.swift
index beab4c6fd..dd50d57e2 100644
--- a/FlipcashUITests/Regression/ApplicationLogsRegressionTests.swift
+++ b/FlipcashUITests/Regression/ApplicationLogsRegressionTests.swift
@@ -18,10 +18,9 @@ final class ApplicationLogsRegressionTests: BaseUITestCase {
 
         assertMainScreenReached()
 
-        // Navigate: Wallet → You → Advanced → Application Logs
+        // Navigate: Wallet → You → gear → Application Logs
         settings.open(from: self)
-        settings.navigateToAdvancedFeatures(from: self)
-        waitAndTap(settings.applicationLogsRow)
+        scrollUpToAndTap(settings.applicationLogsRow, in: settings.scrollView)
 
         // Verify the Application Logs screen is displayed
         let title = app.navigationBars["Application Logs"]
diff --git a/FlipcashUITests/Smoke/AccessKeyBackupSmokeTests.swift b/FlipcashUITests/Smoke/AccessKeyBackupSmokeTests.swift
index 422d948b2..a8b97a9bd 100644
--- a/FlipcashUITests/Smoke/AccessKeyBackupSmokeTests.swift
+++ b/FlipcashUITests/Smoke/AccessKeyBackupSmokeTests.swift
@@ -19,12 +19,9 @@ final class AccessKeyBackupSmokeTests: BaseUITestCase {
 
         assertMainScreenReached()
 
-        // Navigate: Wallet → You → Advanced → Access Key. The row is on
-        // Advanced, not My Account — `SettingsMyAccountScreen` keeps the
-        // account-level actions (Access Key, Log Out, Delete Account) off itself.
+        // Navigate: Wallet → You → gear → Access Key (Security section).
         settings.open(from: self)
-        settings.navigateToAdvancedFeatures(from: self)
-        waitAndTap(settings.accessKeyRow)
+        scrollUpToAndTap(settings.accessKeyRow, in: settings.scrollView)
 
         // Confirmation dialog: "View Your Access Key?"
         let dialog = app.otherElements["View Your Access Key?"]
@@ -44,10 +41,9 @@ final class AccessKeyBackupSmokeTests: BaseUITestCase {
 
         assertMainScreenReached()
 
-        // Wallet → You → Advanced → Access Key.
+        // Wallet → You → gear → Access Key.
         settings.open(from: self)
-        settings.navigateToAdvancedFeatures(from: self)
-        waitAndTap(settings.accessKeyRow)
+        scrollUpToAndTap(settings.accessKeyRow, in: settings.scrollView)
 
         let dialog = app.otherElements["View Your Access Key?"]
         XCTAssertTrue(dialog.waitForExistence(timeout: 10), "Expected access key confirmation dialog")
@@ -77,10 +73,9 @@ final class AccessKeyBackupSmokeTests: BaseUITestCase {
 
         assertMainScreenReached()
 
-        // Wallet → You → Advanced → Access Key.
+        // Wallet → You → gear → Access Key.
         settings.open(from: self)
-        settings.navigateToAdvancedFeatures(from: self)
-        waitAndTap(settings.accessKeyRow)
+        scrollUpToAndTap(settings.accessKeyRow, in: settings.scrollView)
 
         let dialog = app.otherElements["View Your Access Key?"]
         XCTAssertTrue(dialog.waitForExistence(timeout: 10), "Expected access key confirmation dialog")
diff --git a/FlipcashUITests/Smoke/BetaAccessUnlockSmokeTests.swift b/FlipcashUITests/Smoke/BetaAccessUnlockSmokeTests.swift
index 2d710b29a..1be0f3e93 100644
--- a/FlipcashUITests/Smoke/BetaAccessUnlockSmokeTests.swift
+++ b/FlipcashUITests/Smoke/BetaAccessUnlockSmokeTests.swift
@@ -38,24 +38,20 @@ final class BetaAccessUnlockSmokeTests: BaseUITestCase {
             "Expected the tenth tap to say beta access is unlocked"
         )
 
-        settings.navigateToAdvancedFeatures(from: self)
         XCTAssertTrue(
             settings.switchAccountsRow.waitForExistence(timeout: 10),
-            "Expected Switch Accounts on Advanced once beta access is unlocked"
+            "Expected Switch Accounts on Settings once beta access is unlocked"
         )
 
-        settings.leaveAdvancedFeatures(from: self)
-
         settings.tapVersionFooter(10, from: self)
         XCTAssertTrue(
             settings.versionToast("Beta features are hidden again").waitForExistence(timeout: 5),
             "Expected ten more taps to lock beta access again"
         )
 
-        settings.navigateToAdvancedFeatures(from: self)
         XCTAssertTrue(
             settings.accessKeyRow.waitForExistence(timeout: 10),
-            "Expected Advanced to be on screen"
+            "Expected Settings to be on screen"
         )
         XCTAssertFalse(
             settings.switchAccountsRow.exists,
@@ -63,7 +59,7 @@ final class BetaAccessUnlockSmokeTests: BaseUITestCase {
         )
     }
 
-    /// Beta Features is reached through Advanced, one level past what the unlock
+    /// Beta Features is reached from Settings, one level past what the unlock
     /// test above visits. Confirms the Contracts section — new rows this repo
     /// didn't have before — renders once developer access is on.
     func testBetaFeatures_showsContractVersionsAfterUnlock() throws {
@@ -79,8 +75,7 @@ final class BetaAccessUnlockSmokeTests: BaseUITestCase {
             "Expected the tenth tap to say beta access is unlocked"
         )
 
-        settings.navigateToAdvancedFeatures(from: self)
-        waitAndTap(app.buttons["Beta Features"])
+        scrollUpToAndTap(app.buttons["Beta Features"], in: settings.scrollView)
 
         // Row wraps its content in a Button, so the combined accessibility
         // element carries the Button trait despite having no tap action.
@@ -91,8 +86,6 @@ final class BetaAccessUnlockSmokeTests: BaseUITestCase {
         XCTAssertTrue(flipcash2Row.exists)
 
         waitAndTap(app.navigationBars["Beta Features"].buttons.firstMatch)
-        settings.leaveAdvancedFeatures(from: self)
-
         settings.tapVersionFooter(10, from: self)
         XCTAssertTrue(
             settings.versionToast("Beta features are hidden again").waitForExistence(timeout: 5),
@@ -107,10 +100,7 @@ final class BetaAccessUnlockSmokeTests: BaseUITestCase {
     /// itself says nothing until it is tapped, and a tap is the thing under
     /// test.
     private func lockBetaAccessIfUnlocked(_ settings: SettingsUIScreen) {
-        settings.navigateToAdvancedFeatures(from: self)
         let isUnlocked = settings.switchAccountsRow.waitForExistence(timeout: 5)
-        settings.leaveAdvancedFeatures(from: self)
-
         guard isUnlocked else { return }
 
         settings.tapVersionFooter(10, from: self)
diff --git a/FlipcashUITests/Smoke/BlockUnblockSmokeTests.swift b/FlipcashUITests/Smoke/BlockUnblockSmokeTests.swift
index 7be60b3f8..58b06a668 100644
--- a/FlipcashUITests/Smoke/BlockUnblockSmokeTests.swift
+++ b/FlipcashUITests/Smoke/BlockUnblockSmokeTests.swift
@@ -95,10 +95,9 @@ final class BlockUnblockSmokeTests: BaseUITestCase {
             "Expected '\(name)' tip conversation to disappear from the Chat tab after blocking"
         )
 
-        // MARK: Unblock from You › My Account › Blocked.
+        // MARK: Unblock from You › Settings › Blocked.
         settings.open(from: self)
-        settings.navigateToMyAccount(from: self)
-        waitAndTap(settings.blockedRow)
+        scrollUpToAndTap(settings.blockedRow, in: settings.scrollView)
         blocked.assertLoaded(from: self)
 
         let blockedRow = app.buttons.matching(NSPredicate(format: "label CONTAINS %@", name)).firstMatch
@@ -144,8 +143,8 @@ final class BlockUnblockSmokeTests: BaseUITestCase {
         let you = app.tabBars.buttons["You"].firstMatch
         guard you.waitForExistence(timeout: 30) else { return }
         you.tap()
-        guard scrollTo(settings.myAccountRow, in: settings.scrollView) else { return }
-        settings.myAccountRow.tap()
+        guard settings.gear.waitForExistence(timeout: 30) else { return }
+        settings.gear.tap()
         guard scrollTo(settings.blockedRow, in: settings.scrollView) else { return }
         settings.blockedRow.tap()
 
diff --git a/FlipcashUITests/Smoke/BlockedUsersSmokeTests.swift b/FlipcashUITests/Smoke/BlockedUsersSmokeTests.swift
index 9401e86d4..e63ff58d3 100644
--- a/FlipcashUITests/Smoke/BlockedUsersSmokeTests.swift
+++ b/FlipcashUITests/Smoke/BlockedUsersSmokeTests.swift
@@ -25,16 +25,15 @@ final class BlockedUsersSmokeTests: BaseUITestCase {
 
     /// Wallet → You → My Account → Blocked lands on the Blocked list and it
     /// loads its state (empty or populated) without hanging.
-    func testBlockedUsers_reachableFromMyAccount() {
+    func testBlockedUsers_reachableFromSettings() {
         let settings = SettingsUIScreen(app: app)
         let blocked = BlockedUsersUIScreen(app: app)
 
         assertMainScreenReached()
 
         settings.open(from: self)
-        settings.navigateToMyAccount(from: self)
 
-        waitAndTap(settings.blockedRow)
+        scrollUpToAndTap(settings.blockedRow, in: settings.scrollView)
 
         blocked.assertLoaded(from: self)
     }
diff --git a/FlipcashUITests/Smoke/DisplayNameSmokeTests.swift b/FlipcashUITests/Smoke/DisplayNameSmokeTests.swift
index 9b17c9816..66cfbeeaa 100644
--- a/FlipcashUITests/Smoke/DisplayNameSmokeTests.swift
+++ b/FlipcashUITests/Smoke/DisplayNameSmokeTests.swift
@@ -38,7 +38,7 @@ final class DisplayNameSmokeTests: BaseUITestCase {
         createFreshAccount()
 
         // MARK: The card is there, with its actions.
-        settings.open(from: self)
+        settings.openYouTab(from: self)
         XCTAssertTrue(
             app.buttons["you-share-button"].waitForExistence(timeout: 30),
             "Expected the tip card's Share action on a named account. On screen: [\(visibleText())]"
@@ -52,8 +52,8 @@ final class DisplayNameSmokeTests: BaseUITestCase {
             "Expected the card itself, not the name-less setup prompt"
         )
 
-        // MARK: Change the name from My Account.
-        settings.navigateToMyAccount(from: self)
+        // MARK: Change the name from Settings.
+        waitAndTap(settings.gear)
         waitAndTap(settings.displayNameRow)
 
         let save = app.buttons["profile-name-next-button"]
diff --git a/FlipcashUITests/Smoke/LoginSmokeTests.swift b/FlipcashUITests/Smoke/LoginSmokeTests.swift
index 369031399..073d2525c 100644
--- a/FlipcashUITests/Smoke/LoginSmokeTests.swift
+++ b/FlipcashUITests/Smoke/LoginSmokeTests.swift
@@ -24,11 +24,11 @@ final class LoginSmokeTests: BaseUITestCase {
         // Verify we're on the main screen
         assertMainScreenReached()
 
-        // Settings lives on the You tab now: You → Advanced → Log Out. The
-        // settings rows sit under the tip card, so scroll them into view.
+        // Settings is behind the gear on the You tab: You → gear → Log Out.
+        // Log Out sits near the foot of the list, so scroll it into view.
         waitAndTap(app.tabBars.buttons["You"].firstMatch)
-        scrollUpToAndTap(app.buttons["Advanced"], in: app.scrollViews.firstMatch)
-        waitAndTap(app.buttons["Log Out"])
+        waitAndTap(app.buttons["you-settings"])
+        scrollUpToAndTap(app.buttons["Log Out"], in: app.scrollViews.firstMatch)
 
         // Confirmation dialog — scoped to the dialog container
         let dialog = app.otherElements["Are You Sure You Want To Log Out?"]
diff --git a/FlipcashUITests/Support/Screens/SettingsScreen.swift b/FlipcashUITests/Support/Screens/SettingsScreen.swift
index e24c53fdd..512cc8786 100644
--- a/FlipcashUITests/Support/Screens/SettingsScreen.swift
+++ b/FlipcashUITests/Support/Screens/SettingsScreen.swift
@@ -7,10 +7,9 @@ import XCTest
 
 /// Page object for the settings list and its sub-screens.
 ///
-/// The tab-bar UI has no Settings sheet: `YouScreen` renders the list inline
-/// under the tip card, so "open settings" is the You tab plus a scroll. Only
-/// **My Account** and **Advanced** live here now — Add Money and Withdraw Money
-/// moved to the Wallet tab's tiles, on `WalletScreen`.
+/// Settings is pushed from the gear on the You tab, so "open settings" is the
+/// You tab plus the gear. Add Money and Withdraw Money live on the Wallet tab's
+/// tiles, on `WalletScreen`.
 @MainActor
 struct SettingsUIScreen {
 
@@ -22,25 +21,26 @@ struct SettingsUIScreen {
 
     // MARK: - Elements
 
-    /// The You tab's scrolling content, the container the rows are scrolled in.
+    /// The Settings list's scrolling content, the container the rows are scrolled in.
     var scrollView: XCUIElement { app.scrollViews.firstMatch }
 
-    var myAccountRow: XCUIElement { app.buttons["My Account"] }
-    var advancedFeaturesRow: XCUIElement { app.buttons["Advanced"] }
+    /// The gear on the You tab that pushes Settings.
+    var gear: XCUIElement { app.buttons["you-settings"] }
+
     var accessKeyRow: XCUIElement { app.buttons["Access Key"] }
     var applicationLogsRow: XCUIElement { app.buttons["Application Logs"] }
 
-    /// The My Account row that opens the display-name editor.
+    /// The Profile row that opens the display-name editor.
     var displayNameRow: XCUIElement { app.buttons["Display Name"] }
 
-    /// The My Account row that opens the Blocked list.
+    /// The Privacy row that opens the Blocked list.
     var blockedRow: XCUIElement { app.buttons["Blocked"] }
 
-    /// The Advanced row that opens the account switcher — drawn only once the
+    /// The Advanced-section row that opens the account switcher — drawn only once the
     /// version footer has unlocked beta access.
     var switchAccountsRow: XCUIElement { app.buttons["account-switch-accounts-row"] }
 
-    /// The version string at the foot of the You tab, which doubles as the
+    /// The version string at the foot of Settings, which doubles as the
     /// beta-access easter egg.
     var versionFooter: XCUIElement { app.buttons["you-version-footer"] }
 
@@ -63,16 +63,15 @@ struct SettingsUIScreen {
 
     // MARK: - Actions
 
-    /// Opens the You tab, which hosts the settings list.
-    func open(from testCase: BaseUITestCase) {
+    /// Opens the You tab.
+    func openYouTab(from testCase: BaseUITestCase) {
         testCase.waitAndTap(app.tabBars.buttons["You"].firstMatch)
     }
 
-    /// Navigates to My Account sub-screen. The rows render below the tip card,
-    /// so they start off-screen and have to be scrolled to rather than tapped
-    /// blind.
-    func navigateToMyAccount(from testCase: BaseUITestCase) {
-        testCase.scrollUpToAndTap(myAccountRow, in: scrollView)
+    /// Opens Settings: the You tab, then the gear.
+    func open(from testCase: BaseUITestCase) {
+        openYouTab(from: testCase)
+        testCase.waitAndTap(gear)
     }
 
     /// Taps the version footer `times` times, scrolling it into view first.
@@ -83,19 +82,4 @@ struct SettingsUIScreen {
             versionFooter.tap()
         }
     }
-
-    /// Pops the My Account screen back to the You tab.
-    func leaveMyAccount(from testCase: BaseUITestCase) {
-        testCase.waitAndTap(app.navigationBars["My Account"].buttons.firstMatch)
-    }
-
-    /// Navigates to Advanced Features sub-screen.
-    func navigateToAdvancedFeatures(from testCase: BaseUITestCase) {
-        testCase.scrollUpToAndTap(advancedFeaturesRow, in: scrollView)
-    }
-
-    /// Pops the Advanced screen back to the You tab.
-    func leaveAdvancedFeatures(from testCase: BaseUITestCase) {
-        testCase.waitAndTap(app.navigationBars["Advanced"].buttons.firstMatch)
-    }
 }

From 3186981d58b6b52168bf9edfaf41fe2e38488d01 Mon Sep 17 00:00:00 2001
From: Brandon McAnsh <git@bmcreations.dev>
Date: Tue, 6 Oct 2026 07:09:57 -0400
Subject: [PATCH 02/45] chore(settings): drop My Account from test wording,
 document AccountInfoDetails.Row

The UI tests' failure messages and doc comments still named My Account,
which this branch removed. Also rewraps a YouScreen doc comment that was
reflowed onto one 110-column line.
---
 Flipcash/Core/Screens/Main/You/YouScreen.swift         |  4 ++--
 .../Core/Screens/Settings/AccountInfoDetails.swift     |  2 ++
 FlipcashUITests/Smoke/BlockUnblockSmokeTests.swift     |  2 +-
 FlipcashUITests/Smoke/BlockedUsersSmokeTests.swift     |  4 ++--
 FlipcashUITests/Smoke/DisplayNameSmokeTests.swift      | 10 +++++-----
 .../Support/Screens/BlockedUsersUIScreen.swift         |  2 +-
 6 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/Flipcash/Core/Screens/Main/You/YouScreen.swift b/Flipcash/Core/Screens/Main/You/YouScreen.swift
index eff197d2c..fd00a960e 100644
--- a/Flipcash/Core/Screens/Main/You/YouScreen.swift
+++ b/Flipcash/Core/Screens/Main/You/YouScreen.swift
@@ -368,8 +368,8 @@ struct YouScreen: View {
     /// Everything below the card — the part that clears out when the card expands.
     ///
     /// The link and the Share/Download pair all address a card that a name-less
-    /// profile does not have, so they sit out until it does. The checklist shows either way, since naming the
-    /// profile is one of its chores.
+    /// profile does not have, so they sit out until it does. The checklist
+    /// shows either way, since naming the profile is one of its chores.
     private var pageContent: some View {
         VStack(spacing: 0) {
             if profileTutorialState.isVisible {
diff --git a/Flipcash/Core/Screens/Settings/AccountInfoDetails.swift b/Flipcash/Core/Screens/Settings/AccountInfoDetails.swift
index c80b8f293..aed045bbd 100644
--- a/Flipcash/Core/Screens/Settings/AccountInfoDetails.swift
+++ b/Flipcash/Core/Screens/Settings/AccountInfoDetails.swift
@@ -12,6 +12,8 @@ import FlipcashCore
 /// token-account model in FlipcashCore.
 nonisolated struct AccountInfoDetails {
 
+    /// One copyable line on Account Info: what the row shows, and what a tap
+    /// puts on the clipboard when the two differ.
     struct Row: Hashable {
         let title: String
         let display: String
diff --git a/FlipcashUITests/Smoke/BlockUnblockSmokeTests.swift b/FlipcashUITests/Smoke/BlockUnblockSmokeTests.swift
index 58b06a668..c4ecac6c1 100644
--- a/FlipcashUITests/Smoke/BlockUnblockSmokeTests.swift
+++ b/FlipcashUITests/Smoke/BlockUnblockSmokeTests.swift
@@ -134,7 +134,7 @@ final class BlockUnblockSmokeTests: BaseUITestCase {
         try await super.tearDown()
     }
 
-    /// Navigates You › My Account › Blocked and unblocks `name` if present,
+    /// Navigates You › Settings › Blocked and unblocks `name` if present,
     /// tolerating every step so a failed test's teardown stays quiet. It cannot
     /// reuse `SettingsUIScreen`'s navigation helpers: those assert, and a
     /// teardown assertion would mask the failure that brought us here.
diff --git a/FlipcashUITests/Smoke/BlockedUsersSmokeTests.swift b/FlipcashUITests/Smoke/BlockedUsersSmokeTests.swift
index e63ff58d3..7179000ca 100644
--- a/FlipcashUITests/Smoke/BlockedUsersSmokeTests.swift
+++ b/FlipcashUITests/Smoke/BlockedUsersSmokeTests.swift
@@ -5,7 +5,7 @@
 
 import XCTest
 
-/// Smoke tests for the Blocked users list reached from the You tab › My Account
+/// Smoke tests for the Blocked users list reached from the You tab › Settings
 /// › Blocked.
 ///
 /// **Scope.** These cover the navigation into the list and that the screen loads
@@ -23,7 +23,7 @@ final class BlockedUsersSmokeTests: BaseUITestCase {
 
     override var requiresAuthentication: Bool { true }
 
-    /// Wallet → You → My Account → Blocked lands on the Blocked list and it
+    /// Wallet → You → Settings → Blocked lands on the Blocked list and it
     /// loads its state (empty or populated) without hanging.
     func testBlockedUsers_reachableFromSettings() {
         let settings = SettingsUIScreen(app: app)
diff --git a/FlipcashUITests/Smoke/DisplayNameSmokeTests.swift b/FlipcashUITests/Smoke/DisplayNameSmokeTests.swift
index 66cfbeeaa..51d9338f2 100644
--- a/FlipcashUITests/Smoke/DisplayNameSmokeTests.swift
+++ b/FlipcashUITests/Smoke/DisplayNameSmokeTests.swift
@@ -7,7 +7,7 @@ import XCTest
 
 /// Covers the display name and the tip card it earns: a freshly registered
 /// account lands on the You tab with a card it can share, and the name behind
-/// that card can be changed from My Account.
+/// that card can be changed from Settings.
 ///
 /// This replaces the old profile-creation walkthrough (Tips intro → name →
 /// photo → tipcard), which has no subject left. The name step is mandatory
@@ -101,20 +101,20 @@ final class DisplayNameSmokeTests: BaseUITestCase {
         )
 
         // `ProfileNameScreen(completion: .back)` pops itself only once
-        // `SetDisplayName` returns, so landing back on My Account is proof the
+        // `SetDisplayName` returns, so landing back on Settings is proof the
         // new name was accepted and moderated — a rejection keeps the editor up
-        // behind a dialog. It pops just the one screen, so this is My Account
+        // behind a dialog. It pops just the one screen, so this is Settings
         // rather than the You tab root.
         XCTAssertTrue(
             settings.displayNameRow.waitForExistence(timeout: 60),
-            "Expected the name editor to pop back to My Account once the name saved. On screen: [\(visibleText())]"
+            "Expected the name editor to pop back to Settings once the name saved. On screen: [\(visibleText())]"
         )
 
         // MARK: The card survives the rename.
         // Unwind the last screen by hand: the tab bar stays hidden while the
         // You tab has a stack, so there is no You button to tap back to.
         waitAndTap(app.navigationBars.buttons.firstMatch)
-        assertMainScreenReached(timeout: 30, "Expected the You tab root after backing out of My Account")
+        assertMainScreenReached(timeout: 30, "Expected the You tab root after backing out of Settings")
         XCTAssertTrue(
             app.buttons["you-share-button"].waitForExistence(timeout: 30),
             "Expected the tip card still on the You tab after renaming"
diff --git a/FlipcashUITests/Support/Screens/BlockedUsersUIScreen.swift b/FlipcashUITests/Support/Screens/BlockedUsersUIScreen.swift
index f2844d822..d19ceef80 100644
--- a/FlipcashUITests/Support/Screens/BlockedUsersUIScreen.swift
+++ b/FlipcashUITests/Support/Screens/BlockedUsersUIScreen.swift
@@ -5,7 +5,7 @@
 
 import XCTest
 
-/// Page object for `BlockedUsersScreen` — the Settings › My Account › Blocked
+/// Page object for `BlockedUsersScreen` — the Settings › Blocked
 /// list.
 @MainActor
 struct BlockedUsersUIScreen {

From fffc24c2fdf4a27aedab2e89104a80b4fc947df2 Mon Sep 17 00:00:00 2001
From: Brandon McAnsh <git@bmcreations.dev>
Date: Tue, 6 Oct 2026 07:48:45 -0400
Subject: [PATCH 03/45] feat(you): own profile layout; profile card behind
 Share

Rebuild the You tab as the user's own profile: cover banner, avatar,
name, handle and bio, a stats card (minimum to chat, date joined), and
an Edit Profile button. Share becomes a menu with "Share Profile" and
"Show Profile Card"; the card, link row, Share/Download and export move
to a full-screen ProfileCardScreen. A "Claim your username" row replaces
the username progress card. Add a cover subject to ProfileAvatarStore
and extract StartChattingFee from ConversationScreen. Remove
TipCardPresentation and the tab-bar expansion state. Exported card files
are now named "Chat with <name>".
---
 .../Core/Controllers/ProfileAvatarStore.swift |  15 +-
 .../Conversation/ConversationScreen.swift     |  12 +-
 .../Core/Screens/Main/Home/HomeTabView.swift  |  11 +-
 .../Screens/Main/You/ProfileCardScreen.swift  | 175 +++++
 .../Core/Screens/Main/You/TipCardExport.swift |   4 +-
 .../Main/You/TipCardPresentation.swift        |  59 --
 .../Core/Screens/Main/You/YouScreen.swift     | 604 +++++-------------
 .../Screens/Profile/ProfileCoverBanner.swift  |  57 ++
 .../Screens/Profile/ProfileCoverFill.swift    |  20 +
 .../Screens/Profile/ProfileHeaderView.swift   |  83 +++
 .../Screens/Profile/ProfileStatsCard.swift    |  50 ++
 .../Screens/Profile/StartChattingFee.swift    |  41 ++
 .../HomeTabBarVisibilityTests.swift           |  18 +-
 FlipcashTests/ProfileAvatarStoreTests.swift   |  36 ++
 FlipcashTests/ProfileCoverFillTests.swift     |  34 +
 FlipcashTests/StartChattingFeeTests.swift     |  57 ++
 FlipcashTests/TipCardExportTests.swift        |   6 +-
 .../Smoke/DisplayNameSmokeTests.swift         |  20 +-
 .../Smoke/ProfileCardSmokeTests.swift         |  36 ++
 .../Smoke/TipCardFullScreenSmokeTests.swift   |  62 --
 20 files changed, 781 insertions(+), 619 deletions(-)
 create mode 100644 Flipcash/Core/Screens/Main/You/ProfileCardScreen.swift
 delete mode 100644 Flipcash/Core/Screens/Main/You/TipCardPresentation.swift
 create mode 100644 Flipcash/Core/Screens/Profile/ProfileCoverBanner.swift
 create mode 100644 Flipcash/Core/Screens/Profile/ProfileCoverFill.swift
 create mode 100644 Flipcash/Core/Screens/Profile/ProfileHeaderView.swift
 create mode 100644 Flipcash/Core/Screens/Profile/ProfileStatsCard.swift
 create mode 100644 Flipcash/Core/Screens/Profile/StartChattingFee.swift
 create mode 100644 FlipcashTests/ProfileCoverFillTests.swift
 create mode 100644 FlipcashTests/StartChattingFeeTests.swift
 create mode 100644 FlipcashUITests/Smoke/ProfileCardSmokeTests.swift
 delete mode 100644 FlipcashUITests/Smoke/TipCardFullScreenSmokeTests.swift

diff --git a/Flipcash/Core/Controllers/ProfileAvatarStore.swift b/Flipcash/Core/Controllers/ProfileAvatarStore.swift
index 68f9d2a15..755d96b96 100644
--- a/Flipcash/Core/Controllers/ProfileAvatarStore.swift
+++ b/Flipcash/Core/Controllers/ProfileAvatarStore.swift
@@ -23,12 +23,23 @@ final class ProfileAvatarStore {
     enum AvatarSubject: Hashable, Sendable {
         case user(UserID)
         case chat(ConversationID)
+        /// A user's cover banner. Authorizes like the user's avatar but holds the full-size blob.
+        case cover(UserID)
 
         /// The context this subject's blobs authorize through.
         var accessContext: BlobAccessContext {
             switch self {
             case .user(let userID):           .userProfile(userID)
             case .chat(let conversationID):   .chatProfile(conversationID)
+            case .cover(let userID):          .userProfile(userID)
+            }
+        }
+
+        /// The blob of `picture` this subject renders: avatars use the thumbnail, a cover the original.
+        func blobID(for picture: ProfilePicture) -> BlobID {
+            switch self {
+            case .user, .chat:   picture.thumbnailBlobID
+            case .cover:         picture.blobID
             }
         }
     }
@@ -91,12 +102,12 @@ final class ProfileAvatarStore {
         await load(.user(userID), picture: picture)
     }
 
-    /// Makes a subject's current thumbnail available to ``data(for:)``.
+    /// Makes a subject's current picture available to ``data(for:)``.
     ///
     /// Returns without a round trip when the bytes are already in memory or on disk for that exact
     /// blob, and joins the fetch already running for that subject rather than starting a second one.
     func load(_ subject: AvatarSubject, picture: ProfilePicture?) async {
-        guard let blobID = picture?.thumbnailBlobID else { return }
+        guard let blobID = picture.map(subject.blobID(for:)) else { return }
 
         // A different blob under the same id is a changed picture, not a cache hit.
         if blobBySubject[subject] == blobID, dataBySubject[subject] != nil { return }
diff --git a/Flipcash/Core/Screens/Conversation/ConversationScreen.swift b/Flipcash/Core/Screens/Conversation/ConversationScreen.swift
index dcbc59cec..2ba694e49 100644
--- a/Flipcash/Core/Screens/Conversation/ConversationScreen.swift
+++ b/Flipcash/Core/Screens/Conversation/ConversationScreen.swift
@@ -194,13 +194,11 @@ struct ConversationScreen: View {
     /// the amount the CTA names is the one the amount screen enforces.
     private var startChattingFee: FiatAmount? {
         guard !chatExists, let userID = tipCounterpart?.userID else { return nil }
-        let currency = ratesController.balanceCurrency
-        return TipFloor.toOpenDM(
-            recipientFee: session.cachedUserProfile(for: userID)?.minDmChatInitFee,
-            presets: session.userFlags?.tipPresets(for: currency),
-            in: currency,
-            rates: ratesController.cachedRates
-        )?.displayed
+        return StartChattingFee.amount(
+            for: session.cachedUserProfile(for: userID),
+            session: session,
+            ratesController: ratesController
+        )
     }
 
     /// Whether a chat exists to hold a transcript. An `existing` conversation
diff --git a/Flipcash/Core/Screens/Main/Home/HomeTabView.swift b/Flipcash/Core/Screens/Main/Home/HomeTabView.swift
index bbe034dda..365378658 100644
--- a/Flipcash/Core/Screens/Main/Home/HomeTabView.swift
+++ b/Flipcash/Core/Screens/Main/Home/HomeTabView.swift
@@ -66,15 +66,13 @@ struct HomeTabView: View {
     /// Hide the tab bar whenever the active tab has pushed a screen (e.g. Wallet →
     /// Currency Info → Give) so that screen owns the full height, while a
     /// bill/tipcard is up (the app-root overlay owns the screen then, as the v1
-    /// bill replaced the bottom bar), and while the You tab's card is expanded.
+    /// bill replaced the bottom bar).
     /// Sheets already cover the bar, so only in-tab pushes need handling here.
     @State private var cardExpansion = WalletCardExpansion()
-    @State private var tipCardPresentation = TipCardPresentation()
 
     private var isTabBarHidden: Bool {
         selection.hidesTabBar(
             isWalletCardExpanded: cardExpansion.isExpanded,
-            isTipCardExpanded: tipCardPresentation.isExpanded,
             isShowingBill: sessionContainer.session.isShowingBill,
             hasPushedScreen: selection.pushStack.map { !router[$0].isEmpty } ?? false
         )
@@ -102,8 +100,6 @@ struct HomeTabView: View {
             .onChange(of: selection) { _, tab in
                 router.activeTabStack = tab.pushStack
                 if tab == .chat { hasOpenedChat = true }
-                // Leaving the tab puts the card back (and the brightness with it).
-                tipCardPresentation.collapse()
             }
             .onDisappear { router.activeTabStack = nil }
             .onChange(of: router.presentedSheet != nil || sessionContainer.session.isShowingBill, initial: true) { _, covered in
@@ -330,7 +326,6 @@ struct HomeTabView: View {
             }
         case .tipCard:
             TipCardTab()
-                .environment(tipCardPresentation)
         }
     }
 }
@@ -358,15 +353,13 @@ extension HomeTab {
     /// hiding on it everywhere left that tab with no bar and no way back.
     func hidesTabBar(
         isWalletCardExpanded: Bool,
-        isTipCardExpanded: Bool,
         isShowingBill: Bool,
         hasPushedScreen: Bool
     ) -> Bool {
         if isShowingBill || hasPushedScreen { return true }
         switch self {
         case .wallet:        return isWalletCardExpanded
-        case .tipCard:       return isTipCardExpanded
-        case .scan, .chat:   return false
+        case .tipCard, .scan, .chat: return false
         }
     }
 }
diff --git a/Flipcash/Core/Screens/Main/You/ProfileCardScreen.swift b/Flipcash/Core/Screens/Main/You/ProfileCardScreen.swift
new file mode 100644
index 000000000..e092b1b46
--- /dev/null
+++ b/Flipcash/Core/Screens/Main/You/ProfileCardScreen.swift
@@ -0,0 +1,175 @@
+//
+//  ProfileCardScreen.swift
+//  Flipcash
+//
+
+import SwiftUI
+import UIKit
+import FlipcashCore
+import FlipcashUI
+
+/// The user's tip card full screen (Figma node 9277:121410), with the copyable public link and the
+/// Share/Download pair under it. Presented over the You tab from the profile's Share menu.
+struct ProfileCardScreen: View {
+
+    @Environment(SessionContainer.self) private var sessionContainer
+    @Environment(\.dismiss) private var dismiss
+
+    /// Warms the share-sheet preview image ahead of the share tap so it never
+    /// lands on the tap.
+    @State private var previewCache = TipCodePreviewCache()
+    @State private var isShowingDownloadOptions = false
+
+    /// The format tapped in the download sheet, held until the sheet is gone so
+    /// the share sheet has a settled controller to present on.
+    @State private var pendingDownload: TipCardDownloadFormat?
+
+    /// The brightness to put back on close — set only when this screen raised it.
+    @State private var previousBrightness: CGFloat?
+
+    /// The card's width, from the full-screen frame (302 of the 402pt frame).
+    private static let maxCardWidth: CGFloat = 302
+    private static let horizontalInset: CGFloat = 20
+
+    /// Below this a code is hard to scan, so the screen is raised to `boostedBrightness`.
+    private static let minimumScanBrightness: CGFloat = 0.4
+    private static let boostedBrightness: CGFloat = 0.6
+
+    var body: some View {
+        Background(color: .backgroundMain) {
+            ScrollView(showsIndicators: false) {
+                VStack(spacing: 0) {
+                    if let name = displayName {
+                        TipcardView(
+                            size: cardSize,
+                            name: name,
+                            avatar: nil,
+                            codeData: codeData,
+                            tintOpacity: 0.36,
+                            subtitle: username.map(\.handle)
+                        )
+                        .padding(.top, 24)
+                    }
+
+                    TipCardLinkRow(url: url)
+                        .padding(.top, 32)
+
+                    HStack(spacing: 10) {
+                        TipCardActionButton(asset: .shareOS, title: "Share", action: shareTipCard)
+                            .accessibilityIdentifier("you-share-button")
+
+                        TipCardActionButton(asset: .fileDownload, title: "Download") {
+                            isShowingDownloadOptions = true
+                        }
+                        .accessibilityIdentifier("you-download-button")
+                    }
+                    .padding(.top, 11)
+
+                    closeButton
+                        .padding(.top, 24)
+                }
+                .padding(.horizontal, Self.horizontalInset)
+            }
+        }
+        .sheet(isPresented: $isShowingDownloadOptions, onDismiss: exportPendingDownload) {
+            TipCardDownloadSheet(
+                onSelect: { pendingDownload = $0; isShowingDownloadOptions = false },
+                onCancel: { isShowingDownloadOptions = false }
+            )
+        }
+        .task(id: profile?.profilePicture?.thumbnailBlobID) {
+            previewCache.warm(TipCode.Payload(userID: sessionContainer.session.userID))
+        }
+        .onAppear(perform: boostBrightness)
+        .onDisappear(perform: restoreBrightness)
+    }
+
+    private var closeButton: some View {
+        Button {
+            dismiss()
+        } label: {
+            Text("Close")
+                .font(.appTextSmall)
+                .foregroundStyle(Color.textMain)
+                .opacity(0.5)
+                .padding(.vertical, 12)
+                .padding(.horizontal, 20)
+                .contentShape(Rectangle())
+        }
+        .buttonStyle(.plain)
+        .accessibilityLabel("Close")
+        .accessibilityIdentifier("profile-card-close")
+    }
+
+    // MARK: - Content -
+
+    private var profile: Profile? { sessionContainer.session.profile }
+
+    private var displayName: String? {
+        guard let name = profile?.displayName, !name.isEmpty else { return nil }
+        return name
+    }
+
+    private var username: Username? { profile?.username }
+
+    private var codeData: Data {
+        TipCode.Payload(userID: sessionContainer.session.userID).codeData()
+    }
+
+    private var url: URL { .tipcard(for: sessionContainer.session.userID, username: username) }
+
+    private var cardSize: CGSize {
+        let screenWidth = UIApplication.shared.firstWindowScene?.screen.bounds.width ?? Self.maxCardWidth
+        let width = min(Self.maxCardWidth, screenWidth - Self.horizontalInset * 2)
+        return CGSize(width: width, height: width * TipcardView.aspectRatio)
+    }
+
+    // MARK: - Actions -
+
+    private func shareTipCard() {
+        let item = TipCodeShareItem.profile(
+            url: url,
+            displayName: displayName,
+            preview: previewCache.preview(for: sessionContainer.session.userID)
+        )
+        ShareSheet.present(activityItem: item) { _ in }
+    }
+
+    /// Exports the format the sheet picked and hands the file to the share
+    /// sheet, which is where iOS puts "Save to Files" and every other
+    /// destination.
+    ///
+    /// Runs on the download sheet's dismissal rather than its tap: the share
+    /// sheet presents on the top-most view controller, which is the download
+    /// sheet itself until that dismissal finishes.
+    private func exportPendingDownload() {
+        guard let format = pendingDownload else { return }
+        pendingDownload = nil
+
+        guard let file = TipCardExport.file(for: format, codeData: codeData, name: displayName) else {
+            return
+        }
+
+        ShareSheet.present(activityItems: [file]) { _ in
+            // The sheet has taken its copy by now, whether or not the user went
+            // through with it.
+            TipCardExport.discard(file)
+        }
+    }
+
+    // MARK: - Brightness -
+
+    /// The card is a code someone is about to scan, so a dim screen is raised for as long as it is up.
+    private func boostBrightness() {
+        guard let screen = UIApplication.shared.firstWindowScene?.screen,
+              screen.brightness < Self.minimumScanBrightness else { return }
+        previousBrightness = previousBrightness ?? screen.brightness
+        screen.brightness = Self.boostedBrightness
+    }
+
+    private func restoreBrightness() {
+        guard let previousBrightness, let screen = UIApplication.shared.firstWindowScene?.screen else { return }
+        screen.brightness = previousBrightness
+        self.previousBrightness = nil
+    }
+}
diff --git a/Flipcash/Core/Screens/Main/You/TipCardExport.swift b/Flipcash/Core/Screens/Main/You/TipCardExport.swift
index 84a52dcd2..6d74d8db0 100644
--- a/Flipcash/Core/Screens/Main/You/TipCardExport.swift
+++ b/Flipcash/Core/Screens/Main/You/TipCardExport.swift
@@ -92,7 +92,7 @@ enum TipCardExport {
 
     // MARK: - Naming -
 
-    /// `Tip Ada.svg` — the name the share sheet shows and the file the user
+    /// `Chat with Ada.svg` — the name the share sheet shows and the file the user
     /// ends up with. Path separators are dropped so a display name can't steer
     /// where the file is written.
     private static func filename(for format: TipCardDownloadFormat, name: String?) -> String {
@@ -101,7 +101,7 @@ enum TipCardExport {
             .replacingOccurrences(of: ":", with: " ")
             .trimmingCharacters(in: .whitespacesAndNewlines)
 
-        let stem = if let subject, !subject.isEmpty { "Tip \(subject)" } else { "Tip Card" }
+        let stem = if let subject, !subject.isEmpty { "Chat with \(subject)" } else { "Tip Card" }
         return "\(stem).\(format.rawValue)"
     }
 
diff --git a/Flipcash/Core/Screens/Main/You/TipCardPresentation.swift b/Flipcash/Core/Screens/Main/You/TipCardPresentation.swift
deleted file mode 100644
index 3ce37888d..000000000
--- a/Flipcash/Core/Screens/Main/You/TipCardPresentation.swift
+++ /dev/null
@@ -1,59 +0,0 @@
-//
-//  TipCardPresentation.swift
-//  Flipcash
-//
-
-import UIKit
-import Observation
-
-/// Whether the You tab's tip card is expanded to fill the screen.
-///
-/// The card expands inside the page rather than as a presented screen, so the
-/// tab bar's usual "hide while a stack is non-empty" rule cannot see it; the You
-/// tab reports it here for `HomeTabView` to read. Owns the screen-brightness
-/// boost too, since an expanded card is a code someone is about to scan.
-@MainActor
-@Observable
-final class TipCardPresentation {
-
-    private(set) var isExpanded = false
-
-    /// The brightness to put back on collapse — set only when we raised it.
-    @ObservationIgnored private var previousBrightness: CGFloat?
-
-    /// Below this a code is hard to scan, so the screen is raised to `boosted`.
-    private static let minimumScanBrightness: CGFloat = 0.4
-    private static let boostedBrightness: CGFloat = 0.6
-
-    func expand() {
-        guard !isExpanded else { return }
-        isExpanded = true
-        boostBrightness()
-    }
-
-    func collapse() {
-        guard isExpanded else { return }
-        isExpanded = false
-        restoreBrightness()
-    }
-
-    // MARK: - Brightness -
-
-    private var screen: UIScreen? {
-        UIApplication.shared.firstWindowScene?.screen
-    }
-
-    private func boostBrightness() {
-        guard let screen, screen.brightness < Self.minimumScanBrightness else { return }
-        if previousBrightness == nil {
-            previousBrightness = screen.brightness
-        }
-        screen.brightness = Self.boostedBrightness
-    }
-
-    private func restoreBrightness() {
-        guard let previousBrightness, let screen else { return }
-        screen.brightness = previousBrightness
-        self.previousBrightness = nil
-    }
-}
diff --git a/Flipcash/Core/Screens/Main/You/YouScreen.swift b/Flipcash/Core/Screens/Main/You/YouScreen.swift
index fd00a960e..f76799d82 100644
--- a/Flipcash/Core/Screens/Main/You/YouScreen.swift
+++ b/Flipcash/Core/Screens/Main/You/YouScreen.swift
@@ -8,83 +8,36 @@ import UIKit
 import FlipcashCore
 import FlipcashUI
 
-/// The "You" tab (Figma node 9276:4634): the user's tip card, a "Full Screen"
-/// affordance, the copyable public link, the Share/Download pair, and the
-/// gear that pushes Settings.
+/// The "You" tab: the user's own profile — cover, avatar, name, handle and bio — with the stats
+/// card, an Edit Profile button, and the finish-your-profile checklist.
 ///
-/// Tapping the card (or "Full Screen") expands it here on the page: everything
-/// under it slides out, the tab bar hides, and the card grows into the middle of
-/// the screen with a close button at the bottom. The page owns that transition —
-/// nothing is pushed or presented — so the card never leaves this screen.
-/// Pulling the expanded card up walks it back to its slot under the finger, so
-/// it can be put away without reaching for the close button.
-/// Settings pushes onto the tab's `.you` stack, so it never touches the v1
-/// scanner's Settings sheet.
+/// The banner carries two controls: Share, whose menu shares the profile link or presents the
+/// tip card full screen (`ProfileCardScreen`), and the gear that pushes Settings. Settings pushes
+/// onto the tab's `.you` stack, so it never touches the v1 scanner's Settings sheet.
 ///
-/// A profile with no display name has no card: the page then shows the
-/// add-your-name invitation in the card's place and drops the link and share
-/// affordances, but still renders — the gear is this account's only way to
-/// reach Settings, and with it Log Out.
+/// A profile with no display name has no card: the page then shows the add-your-name invitation
+/// in place of the name block and drops Share, but still renders — the gear is this account's only
+/// way to reach Settings, and with it Log Out.
 struct YouScreen: View {
 
     @Environment(SessionContainer.self) private var sessionContainer
     @Environment(AppRouter.self) private var router
-    @Environment(TipCardPresentation.self) private var presentation
+    @Environment(RatesController.self) private var ratesController
 
     /// Warms the share-sheet preview image ahead of the share tap so it never
     /// lands on the tap; keyed by user.
     @State private var previewCache = TipCodePreviewCache()
-    @State private var isShowingDownloadOptions = false
+    @State private var isShowingProfileCard = false
 
-    /// The format tapped in the download sheet, held until the sheet is gone so
-    /// the share sheet has a settled controller to present on.
-    @State private var pendingDownload: TipCardDownloadFormat?
-
-    /// The balance gate, raised when the card is tapped below the minimum.
+    /// The balance gate, raised when the claim row is tapped below the minimum.
     @State private var usernameDialog: DialogItem?
 
     /// The top safe-area inset, which sizes the hand-drawn top fade.
     @State private var safeAreaTop: CGFloat = 0
 
-    /// The card's slot in the page's layout, in global space — where the card
-    /// sits before it travels to the middle of the screen.
-    @State private var cardSlotFrame: CGRect = .zero
-
-    /// The live pull on the expanded card, negative upward — the card's travel
-    /// home, scrubbed by hand until the finger lets go.
-    @State private var dragTranslation: CGFloat = 0
-
-    /// The on-screen card width, from the Figma placement: node 9276:4641 draws
-    /// the You card 241.6 wide.
-    private static let cardWidth: CGFloat = 242
-    /// The expanded card's width, per the full-screen frame (Figma node
-    /// 9277:121410 — 302 of the 402pt frame).
-    private static let maxExpandedCardWidth: CGFloat = 302
-    /// The page's horizontal inset, also the expanded card's minimum margin.
+    /// The page's horizontal inset.
     private static let horizontalInset: CGFloat = 20
 
-    private static let expansion: Animation = .spring(response: 0.45, dampingFraction: 0.85)
-
-    /// Puts a pull that fell short back where it started. Shorter than
-    /// `expansion` — the card has barely moved, and a long settle reads as a stall.
-    private static let settle: Animation = .spring(response: 0.3, dampingFraction: 0.85)
-
-    /// How much of the card's travel home a pull has to cover to finish the job.
-    private static let collapseThreshold: CGFloat = 0.3
-
-    /// How much of that travel a flick has to project onto instead — a short,
-    /// fast swipe closes the card even though it never covered the distance.
-    private static let flickThreshold: CGFloat = 0.75
-
-    /// The fraction of a downward drag the card follows. Down is where expanding
-    /// already put the card, so the pull has nowhere to take it and gives only
-    /// enough to show the drag is being felt.
-    private static let overdragResistance: CGFloat = 0.25
-
-    /// The slack the drag recogniser swallows before it fires, handed back so
-    /// the card picks up from where it stands instead of jumping that distance.
-    private static let dragActivationSlack: CGFloat = 10
-
     /// The gap the page keeps between its last row and the tab bar.
     private static let tabBarGap: CGFloat = 24
 
@@ -104,74 +57,69 @@ struct YouScreen: View {
 
     var body: some View {
         Background(color: .backgroundMain) {
-            ZStack {
-                ScrollView(showsIndicators: false) {
-                    VStack(spacing: 0) {
-                        cardSection
-                            .padding(.top, 64)
-
-                        pageContent
-                            // The expanded card owns the screen: everything under
-                            // it slides down and out — as the tab bar does, which
-                            // `HomeTabView` hides on the same state. Opacity and
-                            // offset (not removal) keep the layout stable so
-                            // nothing reflows on the way back.
-                            //
-                            // Bound to the card being expanded, not to how far a
-                            // pull has taken it back: the card is translucent and
-                            // sits over this content until it is nearly home, so
-                            // anything faded in under way shows through it.
-                            .opacity(isExpanded ? 0 : 1)
-                            .offset(y: isExpanded ? 60 : 0)
-                            .allowsHitTesting(!isExpanded)
+            ScrollView(showsIndicators: false) {
+                VStack(spacing: 0) {
+                    header
+                        .padding(.top, 8)
+
+                    if displayName == nil {
+                        setupPrompt
+                            .padding(.top, 24)
+                    } else {
+                        ProfileStatsCard(
+                            minimumToChat: StartChattingFee.amount(
+                                for: profile,
+                                session: sessionContainer.session,
+                                ratesController: ratesController
+                            ),
+                            joinedAt: profile?.joinedAt
+                        )
+                        .padding(.top, 24)
+
+                        // The Edit Profile slice repoints this to `.editProfile`.
+                        Button("Edit Profile") {
+                            router.push(.settings)
+                        }
+                        .buttonStyle(.filled05)
+                        .padding(.top, 12)
+                        .accessibilityIdentifier("you-edit-profile")
+                    }
+
+                    if profileTutorialState.isVisible {
+                        TutorialChecklistCard(
+                            title: "Finish Your Profile",
+                            items: profileTutorialState.items,
+                            onTap: handleProfileTutorialTap
+                        )
+                        .padding(.top, 32)
+                        .accessibilityIdentifier("you-profile-tutorial-card")
                     }
-                    .padding(.horizontal, Self.horizontalInset)
-                    .padding(.bottom, bottomContentInset)
-                }
-                .scrollDisabled(isExpanded)
-                // The app-wide soft edge effect is drawn from a bar's own
-                // background, and this tab has no navigation bar at all, so it
-                // covers the bottom (tab bar) but not the top — what scrolls up
-                // into the status bar has to be faded by hand. Same treatment as
-                // `WalletScreen`, the app's other bar-less tab.
-                .overlay(alignment: .top) {
-                    LinearGradient(
-                        colors: [Color.backgroundMain, Color.backgroundMain.opacity(0)],
-                        startPoint: .top,
-                        endPoint: .bottom
-                    )
-                    .frame(height: safeAreaTop + Self.topFadeLength)
-                    .ignoresSafeArea(edges: .top)
-                    .allowsHitTesting(false)
-                }
-                .onGeometryChange(for: CGFloat.self) { $0.safeAreaInsets.top } action: { safeAreaTop = $0 }
-
-                // Sibling of the scroll view, not an overlay on it: the ZStack
-                // already sits below the status bar, so no `safeAreaTop` offset.
-                settingsGear
-                    .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topTrailing)
-                    .opacity(isExpanded ? 0 : 1)
-                    .allowsHitTesting(!isExpanded)
-
-                if isExpanded {
-                    closeButton
-                        .transition(.opacity)
-                        .opacity(1 - collapseProgress)
                 }
+                .padding(.horizontal, Self.horizontalInset)
+                .padding(.bottom, bottomContentInset)
+            }
+            // The app-wide soft edge effect is drawn from a bar's own
+            // background, and this tab has no navigation bar at all, so it
+            // covers the bottom (tab bar) but not the top — what scrolls up
+            // into the status bar has to be faded by hand. Same treatment as
+            // `WalletScreen`, the app's other bar-less tab.
+            .overlay(alignment: .top) {
+                LinearGradient(
+                    colors: [Color.backgroundMain, Color.backgroundMain.opacity(0)],
+                    startPoint: .top,
+                    endPoint: .bottom
+                )
+                .frame(height: safeAreaTop + Self.topFadeLength)
+                .ignoresSafeArea(edges: .top)
+                .allowsHitTesting(false)
             }
-            // On the whole page rather than the card: expanded, the card is the
-            // page, and a pull that has to land on it exactly is a pull that
-            // misses. Nothing here scrolls while the card is up, so there is no
-            // scroll for the drag to fight.
-            .simultaneousGesture(collapseDrag, isEnabled: isExpanded)
+            .onGeometryChange(for: CGFloat.self) { $0.safeAreaInsets.top } action: { safeAreaTop = $0 }
         }
-        .sheet(isPresented: $isShowingDownloadOptions, onDismiss: exportPendingDownload) {
-            TipCardDownloadSheet(
-                onSelect: { pendingDownload = $0; isShowingDownloadOptions = false },
-                onCancel: { isShowingDownloadOptions = false }
-            )
+        .fullScreenCover(isPresented: $isShowingProfileCard) {
+            ProfileCardScreen()
         }
         .task(id: profilePicture?.thumbnailBlobID) {
+            await sessionContainer.profileAvatars.load(userID: sessionContainer.session.userID, picture: profilePicture)
             // There is no card to share, and so no preview worth rendering, until
             // the profile has a name.
             guard displayName != nil else { return }
@@ -180,62 +128,77 @@ struct YouScreen: View {
         .dialog(item: $usernameDialog)
     }
 
-    // MARK: - Card -
+    // MARK: - Header -
 
-    /// The card plus its "Full Screen" caption. Tapping either expands the card;
-    /// tapping the expanded card puts it back.
-    ///
-    /// A profile without a display name has no card to draw, so the slot carries
-    /// the invitation to add one instead. The rest of the page stays where it is
-    /// either way — the gear included, which is the only route to logging out.
-    @ViewBuilder
-    private var cardSection: some View {
-        if let name = displayName {
-            VStack(spacing: 24) {
-                // The slot holds the card's place in the page while the card
-                // itself is offset into the middle of the screen — measuring the
-                // slot rather than the card keeps the measurement free of the
-                // offset it feeds.
-                //
-                // It keeps its collapsed size throughout: a slot that grew with
-                // the card would move its own centre mid-flight, and that centre
-                // is what `cardOffset` measures from, so the card would jump
-                // against its own travel. Fixed, the card grows about a still
-                // centre and the page below never reflows.
-                Color.clear
-                    .frame(width: Self.collapsedCardSize.width, height: Self.collapsedCardSize.height)
-                    .overlay {
-                        TipcardView(
-                            size: Self.drawnCardSize,
-                            name: name,
-                            avatar: nil,
-                            codeData: codeData,
-                            tintOpacity: 0.36,
-                            subtitle: username.map(\.handle)
-                        )
-                        .scaleEffect(cardScale)
-                        .offset(y: cardOffset)
+    private var header: some View {
+        ProfileHeaderView(
+            userID: sessionContainer.session.userID,
+            displayName: displayName,
+            handle: username.map(\.handle),
+            bio: profile?.bio,
+            avatarData: sessionContainer.profileAvatars.data(for: sessionContainer.session.userID),
+            avatarBlurhash: profilePicture?.thumbnailBlurhash,
+            coverPicture: profile?.coverPicture,
+            customization: profile?.tipCardCustomization,
+            statusChip: nil,
+            bannerActions: {
+                HStack(spacing: 8) {
+                    if displayName != nil {
+                        shareMenu
                     }
-                    .onGeometryChange(for: CGRect.self) { $0.frame(in: .global) } action: { cardSlotFrame = $0 }
-
-                // Sits directly under the card, which covers it until the very
-                // end of the pull — so it waits for the card to be home rather
-                // than fading in through it.
-                Self.caption("Full Screen", pointsUp: false)
-                    .opacity(isExpanded ? 0 : 1)
+                    settingsGear
+                }
+            },
+            underHandle: {
+                if shouldPromptForUsername {
+                    Button(action: claimUsername) {
+                        Text("Claim your username ›")
+                            .font(.appTextSmall)
+                            .foregroundStyle(Color.textMain)
+                            .padding(.vertical, 4)
+                    }
+                    .buttonStyle(.plain)
+                    .accessibilityIdentifier("you-claim-username")
+                }
             }
-            .contentShape(Rectangle())
-            .onTapGesture(perform: toggleExpanded)
-            .accessibilityElement(children: .combine)
-            .accessibilityAddTraits(.isButton)
-            .accessibilityLabel(isExpanded ? "Close tip card" : "View tip card full screen")
-            .accessibilityIdentifier("you-fullscreen-button")
-        } else {
-            setupPrompt
+        )
+    }
+
+    private var shareMenu: some View {
+        Menu {
+            Button("Share Profile", action: shareTipCard)
+            Button("Show Profile Card") { isShowingProfileCard = true }
+        } label: {
+            bannerControl(systemName: "square.and.arrow.up")
         }
+        .accessibilityLabel("Share")
+        .accessibilityIdentifier("you-share")
     }
 
-    /// Stands in for the card until the profile has a display name: the card the
+    private var settingsGear: some View {
+        Button {
+            router.push(.settings)
+        } label: {
+            bannerControl(systemName: "gearshape")
+        }
+        .buttonStyle(.plain)
+        .accessibilityLabel("Settings")
+        .accessibilityIdentifier("you-settings")
+    }
+
+    /// A glyph on a dark disc, legible over any cover picture.
+    private func bannerControl(systemName: String) -> some View {
+        Image(systemName: systemName)
+            .font(.system(size: 16))
+            .foregroundStyle(Color.white)
+            .frame(width: 36, height: 36)
+            .background(Color.black.opacity(0.4), in: Circle())
+            .contentShape(Circle())
+    }
+
+    // MARK: - No name -
+
+    /// Stands in for the name block until the profile has a display name: the card the
     /// user is about to get, blurred out behind the invitation to claim it, so
     /// the slot shows what is on offer rather than sitting empty.
     ///
@@ -246,7 +209,7 @@ struct YouScreen: View {
             // A stand-in name, never read: it only has to give the blur a card
             // shaped like the one the user gets.
             TipcardView(
-                size: Self.collapsedCardSize,
+                size: Self.placeholderCardSize,
                 name: Self.placeholderName,
                 avatar: nil,
                 codeData: codeData,
@@ -294,7 +257,7 @@ struct YouScreen: View {
             }
             // Held inside the card it sits on, so the copy reads as part of the
             // card rather than spilling past its edges.
-            .frame(maxWidth: Self.collapsedCardSize.width - 16)
+            .frame(maxWidth: Self.placeholderCardSize.width - 16)
         }
     }
 
@@ -305,119 +268,20 @@ struct YouScreen: View {
     /// The placeholder card's outline, matching `TipcardView`'s own corner
     /// rounding — which it derives from the card's width.
     private static let placeholderShape = RoundedRectangle(
-        cornerRadius: collapsedCardSize.width * 0.08,
+        cornerRadius: placeholderCardSize.width * 0.08,
         style: .continuous
     )
 
-    /// The expanded card's collapse control (Figma node 9276:4601): the same
-    /// caption as "Full Screen", chevron flipped, sitting at the bottom of the
-    /// screen where the tab bar was.
-    private var closeButton: some View {
-        VStack {
-            Spacer()
-
-            Button(action: toggleExpanded) {
-                Self.caption("Close", pointsUp: true)
-                    .padding(.vertical, 12)
-                    .padding(.horizontal, 20)
-                    .contentShape(Rectangle())
-            }
-            .buttonStyle(.plain)
-            .accessibilityLabel("Close")
-            .accessibilityIdentifier("you-close-fullscreen-button")
-        }
-        .padding(.bottom, 8)
-    }
-
-    /// The dimmed caption-and-chevron pair used both to expand the card and to
-    /// put it back.
-    private static func caption(_ title: String, pointsUp: Bool) -> some View {
-        HStack(spacing: 5) {
-            Text(title)
-                .font(.appTextSmall)
-            Image.system(.chevronDown)
-                .renderingMode(.template)
-                .frame(width: 16, height: 16)
-                .rotationEffect(.degrees(pointsUp ? 180 : 0))
-        }
-        .foregroundStyle(Color.textMain)
-        .opacity(0.5)
-    }
-
-    // MARK: - Settings gear -
-
-    private var settingsGear: some View {
-        Button {
-            router.push(.settings)
-        } label: {
-            Image(systemName: "gearshape")
-                .font(.system(size: 20))
-                .foregroundStyle(Color.textMain)
-                .frame(width: 44, height: 44)
-                .contentShape(Rectangle())
-        }
-        .buttonStyle(.plain)
-        .padding(.top, 4)
-        .padding(.trailing, 8)
-        .accessibilityLabel("Settings")
-        .accessibilityIdentifier("you-settings")
-    }
-
-    // MARK: - Page -
-
-    /// Everything below the card — the part that clears out when the card expands.
-    ///
-    /// The link and the Share/Download pair all address a card that a name-less
-    /// profile does not have, so they sit out until it does. The checklist
-    /// shows either way, since naming the profile is one of its chores.
-    private var pageContent: some View {
-        VStack(spacing: 0) {
-            if profileTutorialState.isVisible {
-                TutorialChecklistCard(
-                    title: "Finish Your Profile",
-                    items: profileTutorialState.items,
-                    onTap: handleProfileTutorialTap
-                )
-                .padding(.top, 32)
-                .accessibilityIdentifier("you-profile-tutorial-card")
-
-                // Fences the checklist off from the block below it — the two are
-                // unrelated chores that would otherwise read as one list.
-                Color.rowSeparator
-                    .frame(height: 1)
-                    .padding(.top, 20)
-            }
-
-            if displayName != nil {
-                TipCardLinkRow(url: url)
-                    .padding(.top, profileTutorialState.isVisible ? 20 : 70)
-
-                HStack(spacing: 10) {
-                    TipCardActionButton(asset: .shareOS, title: "Share", action: shareTipCard)
-                        .accessibilityIdentifier("you-share-button")
-
-                    TipCardActionButton(asset: .fileDownload, title: "Download") {
-                        isShowingDownloadOptions = true
-                    }
-                    .accessibilityIdentifier("you-download-button")
-                }
-                .padding(.top, 11)
-
-                if shouldPromptForUsername {
-                    usernameProgressCard
-                        .padding(.top, 11)
-                        .accessibilityIdentifier("you-username-progress-card")
-                }
-            }
-        }
-    }
+    /// The placeholder card's size, which gives the blur a card shaped like the one the user gets.
+    private static let placeholderCardSize = CGSize(
+        width: 242,
+        height: 242 * TipcardView.aspectRatio
+    )
 
-    // MARK: - Username progress -
+    // MARK: - Username claim -
 
     /// The balance's standing against the username minimum. Read once per
-    /// render and switched on here rather than re-derived at tap time — the
-    /// card's tappability and this switch's `.proceed` branch already agree
-    /// on the same value.
+    /// render and switched on here rather than re-derived at tap time.
     private var usernameProgress: UsernameGate {
         usernameGate(
             session: sessionContainer.session,
@@ -425,32 +289,8 @@ struct YouScreen: View {
         )
     }
 
-    @ViewBuilder
-    private var usernameProgressCard: some View {
-        switch usernameProgress {
-        case .proceed:
-            UsernameProgressCard(
-                state: .complete,
-                subtitle: "Tap to select your username now",
-                trailing: nil,
-                fraction: 1,
-                action: beginUsernameClaim
-            )
-        case .addMoney(let minimum, let shortfall, let fraction):
-            UsernameProgressCard(
-                state: .incomplete,
-                subtitle: "Get your balance to \(minimum.formatted(minimumFractionDigits: 0)) \(minimum.currency.rawValue.uppercased()) or more to unlock",
-                trailing: "\(shortfall.formatted(minimumFractionDigits: 0)) \(shortfall.currency.rawValue.uppercased()) to go",
-                fraction: fraction,
-                action: { presentBalanceGate(minimum: minimum) }
-            )
-        }
-    }
-
     // MARK: - Content -
 
-    private var isExpanded: Bool { presentation.isExpanded }
-
     private var profile: Profile? { sessionContainer.session.profile }
     private var profilePicture: ProfilePicture? { profile?.profilePicture }
     private var profileTutorialState: ProfileTutorialState { .init(profile: profile) }
@@ -479,125 +319,8 @@ struct YouScreen: View {
 
     private var url: URL { .tipcard(for: sessionContainer.session.userID, username: username) }
 
-    // MARK: - Card geometry -
-
-    /// The card's size in the page — also the slot's size at every point in the
-    /// expansion, so the page's layout is the same expanded as collapsed.
-    private static let collapsedCardSize = CGSize(
-        width: cardWidth,
-        height: cardWidth * TipcardView.aspectRatio
-    )
-
-    /// The size the card is always drawn at, whatever it currently measures on
-    /// screen — the widest it ever gets, so scaling it to size only ever
-    /// samples the drawing down.
-    private static let drawnCardSize = CGSize(
-        width: maxExpandedCardWidth,
-        height: maxExpandedCardWidth * TipcardView.aspectRatio
-    )
-
-    /// The expansion runs as one scale on the drawn card rather than a new size
-    /// for it to lay itself out at. Laid out, each of the card's metrics is a
-    /// separate animatable value — and the name's font size is not animatable
-    /// at all — so the parts arrived at their new sizes at different moments
-    /// and overlapped mid-flight. Scaled, the card travels as one figure.
-    private var cardScale: CGFloat {
-        guard isExpanded else { return Self.cardWidth / Self.drawnCardSize.width }
-        // Mid-pull the card sits between its two widths, in step with everything
-        // else the pull drives.
-        let width = expandedCardWidth + (Self.cardWidth - expandedCardWidth) * collapseProgress
-        return width / Self.drawnCardSize.width
-    }
-
-    /// The expanded width: the design's 302, narrowed only if the screen can't
-    /// hold it inside the page's margins.
-    private var expandedCardWidth: CGFloat {
-        guard screenBounds.width > 0 else { return Self.maxExpandedCardWidth }
-        return min(Self.maxExpandedCardWidth, screenBounds.width - Self.horizontalInset * 2)
-    }
-
-    /// The whole screen, safe areas included — what the design centres the
-    /// expanded card in. Read from the window rather than a geometry proxy,
-    /// which reports the safe-area rect instead; `BillOverlayView` centres the
-    /// full-screen bill the same way.
-    private var screenBounds: CGRect {
-        UIApplication.shared.firstWindowScene?.screen.bounds ?? .zero
-    }
-
-    /// The gap between the card's slot's centre and the screen's: how far the
-    /// card moves to sit in the middle of the screen, and so how far a pull has
-    /// to bring it back.
-    private var expandedTravel: CGFloat {
-        guard !cardSlotFrame.isEmpty, !screenBounds.isEmpty else { return 0 }
-        return screenBounds.midY - cardSlotFrame.midY
-    }
-
-    /// How far the card currently sits from its slot.
-    private var cardOffset: CGFloat {
-        guard isExpanded else { return 0 }
-        return expandedTravel * (1 - collapseProgress) + overdrag
-    }
-
-    /// How far a downward drag pushes the card past its expanded resting place.
-    private var overdrag: CGFloat {
-        max(0, dragTranslation) * Self.overdragResistance
-    }
-
-    /// How far the pull has taken the card back toward its slot: 0 where
-    /// expanding left it, 1 once it is home. The card's place, its size and the
-    /// close control all read it, so they run backwards under the finger and
-    /// hold wherever the finger holds.
-    private var collapseProgress: CGFloat {
-        guard isExpanded, dragTranslation < 0, expandedTravel > 0 else { return 0 }
-        return min(1, -dragTranslation / expandedTravel)
-    }
-
     // MARK: - Actions -
 
-    /// Puts the expanded card back by pulling it toward its slot — upward,
-    /// where the card came from and where the "Close" chevron points. The card
-    /// shrinks back along its travel under the finger, the close control fading
-    /// with it, and lets go once the pull has covered enough of the way home or
-    /// flicked hard enough to have got there. A downward pull, which has nowhere
-    /// to take the card, is met with resistance instead.
-    private var collapseDrag: some Gesture {
-        DragGesture(minimumDistance: Self.dragActivationSlack)
-            .onChanged { drag in
-                let translation = drag.translation.height
-                dragTranslation = translation < 0
-                    ? min(0, translation + Self.dragActivationSlack)
-                    : max(0, translation - Self.dragActivationSlack)
-            }
-            .onEnded(endCollapseDrag)
-    }
-
-    private func endCollapseDrag(_ drag: DragGesture.Value) {
-        let travel = expandedTravel
-        let closes = travel > 0 && (
-            -dragTranslation >= travel * Self.collapseThreshold
-            || -drag.predictedEndTranslation.height >= travel * Self.flickThreshold
-        )
-
-        withAnimation(closes ? Self.expansion : Self.settle) {
-            // Cleared in the same transaction as the collapse it may carry, so
-            // the card carries on from where the finger left it either way.
-            dragTranslation = 0
-            if closes {
-                presentation.collapse()
-            }
-        }
-    }
-
-    private func toggleExpanded() {
-        withAnimation(Self.expansion) {
-            if isExpanded {
-                presentation.collapse()
-            } else {
-                presentation.expand()
-            }
-        }
-    }
-
     private func shareTipCard() {
         let item = TipCodeShareItem.profile(
             url: url,
@@ -607,35 +330,17 @@ struct YouScreen: View {
         ShareSheet.present(activityItem: item) { _ in }
     }
 
-    /// Exports the format the sheet picked and hands the file to the share
-    /// sheet, which is where iOS puts "Save to Files" and every other
-    /// destination.
-    ///
-    /// Runs on the download sheet's dismissal rather than its tap: the share
-    /// sheet presents on the top-most view controller, which is the download
-    /// sheet itself until that dismissal finishes.
-    private func exportPendingDownload() {
-        guard let format = pendingDownload else { return }
-        pendingDownload = nil
-
-        guard let file = TipCardExport.file(for: format, codeData: codeData, name: displayName) else {
-            return
-        }
-
-        ShareSheet.present(activityItems: [file]) { _ in
-            // The sheet has taken its copy by now, whether or not the user went
-            // through with it.
-            TipCardExport.discard(file)
+    /// Opens the claim screen once the balance clears the minimum, and the
+    /// balance gate until then.
+    private func claimUsername() {
+        switch usernameProgress {
+        case .proceed:
+            router.push(.username(username))
+        case .addMoney(let minimum, _, _):
+            presentBalanceGate(minimum: minimum)
         }
     }
 
-    /// Opens the claim screen. Only ever wired to `usernameProgressCard`'s tap
-    /// in its `.complete` state, which already means `usernameProgress` is
-    /// `.proceed` — there is nothing left here to branch on.
-    private func beginUsernameClaim() {
-        router.push(.username(username))
-    }
-
     private func handleProfileTutorialTap(_ item: ProfileTutorialItem) {
         switch item {
         case .displayName:
@@ -647,9 +352,8 @@ struct YouScreen: View {
         }
     }
 
-    /// The `.incomplete` card's tap: names the minimum and offers the way to
-    /// meet it. The card draws the shortfall but not the reason for it, so the
-    /// dialog is where the squatting rule gets stated.
+    /// Names the minimum and offers the way to meet it. The row draws no
+    /// shortfall, so the dialog is where the squatting rule gets stated.
     private func presentBalanceGate(minimum: FiatAmount) {
         usernameDialog = .usernameMinimumBalance(minimum: minimum) {
             router.presentAddMoney(.general, source: .usernameShortfall)
diff --git a/Flipcash/Core/Screens/Profile/ProfileCoverBanner.swift b/Flipcash/Core/Screens/Profile/ProfileCoverBanner.swift
new file mode 100644
index 000000000..846f37548
--- /dev/null
+++ b/Flipcash/Core/Screens/Profile/ProfileCoverBanner.swift
@@ -0,0 +1,57 @@
+//
+//  ProfileCoverBanner.swift
+//  Flipcash
+//
+
+import SwiftUI
+import FlipcashCore
+import FlipcashUI
+
+/// A profile's 3:1 cover: the picture once it has loaded, the blurhash while it does, and the
+/// profile-card colour when there is no picture.
+struct ProfileCoverBanner<Actions: View>: View {
+
+    @Environment(SessionContainer.self) private var sessionContainer
+
+    let userID: UserID
+    let coverPicture: ProfilePicture?
+    let customization: TipCardCustomization?
+    @ViewBuilder let actions: () -> Actions
+
+    private static var aspectRatio: CGFloat { 3 }
+
+    var body: some View {
+        Color.clear
+            .aspectRatio(Self.aspectRatio, contentMode: .fit)
+            .overlay { cover }
+            .overlay(alignment: .topTrailing) {
+                actions()
+                    .padding(8)
+            }
+            .clipShape(RoundedRectangle(cornerRadius: 16, style: .continuous))
+            .task(id: coverPicture?.blobID) {
+                await sessionContainer.profileAvatars.load(.cover(userID), picture: coverPicture)
+            }
+            .accessibilityIdentifier("profile-cover")
+    }
+
+    @ViewBuilder
+    private var cover: some View {
+        if let coverPicture {
+            let data = sessionContainer.profileAvatars.data(for: .cover(userID))
+            if let data, let image = ContactAvatarCache.shared.image(forKey: "cover-\(coverPicture.blobID)", data: data) {
+                Image(uiImage: image)
+                    .resizable()
+                    .scaledToFill()
+            } else if let preview = BlurHashCache.shared.image(for: coverPicture.thumbnailBlurhash) {
+                Image(uiImage: preview)
+                    .resizable()
+                    .scaledToFill()
+            } else {
+                ProfileCoverFill.color(for: customization)
+            }
+        } else {
+            ProfileCoverFill.color(for: customization)
+        }
+    }
+}
diff --git a/Flipcash/Core/Screens/Profile/ProfileCoverFill.swift b/Flipcash/Core/Screens/Profile/ProfileCoverFill.swift
new file mode 100644
index 000000000..baf76140b
--- /dev/null
+++ b/Flipcash/Core/Screens/Profile/ProfileCoverFill.swift
@@ -0,0 +1,20 @@
+//
+//  ProfileCoverFill.swift
+//  Flipcash
+//
+
+import SwiftUI
+import FlipcashCore
+import FlipcashUI
+
+/// The solid colour a cover banner shows when the profile has no cover picture.
+enum ProfileCoverFill {
+
+    /// The card tone used when a profile carries no colour, or one that doesn't parse.
+    static let fallback = Color.backgroundRow
+
+    /// The customization's colour, or ``fallback`` when it is absent or not a `#RRGGBB` hex.
+    static func color(for customization: TipCardCustomization?) -> Color {
+        customization.flatMap { Color(hex: $0.colorHex) } ?? fallback
+    }
+}
diff --git a/Flipcash/Core/Screens/Profile/ProfileHeaderView.swift b/Flipcash/Core/Screens/Profile/ProfileHeaderView.swift
new file mode 100644
index 000000000..50cc54705
--- /dev/null
+++ b/Flipcash/Core/Screens/Profile/ProfileHeaderView.swift
@@ -0,0 +1,83 @@
+//
+//  ProfileHeaderView.swift
+//  Flipcash
+//
+
+import SwiftUI
+import FlipcashCore
+import FlipcashUI
+
+/// A profile's top block: cover, avatar overlapping it, name, handle and bio.
+///
+/// A nil `displayName` leaves the name block out, for a profile that has not named itself yet.
+struct ProfileHeaderView<BannerActions: View, UnderHandle: View>: View {
+
+    let userID: UserID
+    let displayName: String?
+    let handle: String?
+    let bio: String?
+    let avatarData: Data?
+    let avatarBlurhash: String?
+    let coverPicture: ProfilePicture?
+    let customization: TipCardCustomization?
+    let statusChip: AnyView?
+    @ViewBuilder let bannerActions: () -> BannerActions
+    @ViewBuilder let underHandle: () -> UnderHandle
+
+    private static var avatarSize: CGFloat { 88 }
+
+    var body: some View {
+        VStack(spacing: 0) {
+            ProfileCoverBanner(
+                userID: userID,
+                coverPicture: coverPicture,
+                customization: customization,
+                actions: bannerActions
+            )
+
+            ContactAvatarView(
+                id: userID.uuidString,
+                displayName: displayName ?? "",
+                imageData: avatarData,
+                blurhash: avatarBlurhash,
+                size: Self.avatarSize
+            )
+            .overlay { Circle().strokeBorder(Color.backgroundMain, lineWidth: 4) }
+            .padding(.top, -Self.avatarSize / 2)
+
+            if let displayName {
+                VStack(spacing: 4) {
+                    Text(displayName)
+                        .font(.appDisplaySmall)
+                        .foregroundStyle(Color.textMain)
+                        .multilineTextAlignment(.center)
+                        .accessibilityIdentifier("profile-name")
+
+                    if let handle {
+                        Text(handle)
+                            .font(.appTextMedium)
+                            .foregroundStyle(Color.textSecondary)
+                            .accessibilityIdentifier("profile-handle")
+                    }
+
+                    underHandle()
+                }
+                .padding(.top, 12)
+
+                if let statusChip {
+                    statusChip
+                        .padding(.top, 8)
+                }
+
+                if let bio, !bio.isEmpty {
+                    Text(bio)
+                        .font(.appTextSmall)
+                        .foregroundStyle(Color.textMain)
+                        .multilineTextAlignment(.center)
+                        .padding(.top, 12)
+                        .accessibilityIdentifier("profile-bio")
+                }
+            }
+        }
+    }
+}
diff --git a/Flipcash/Core/Screens/Profile/ProfileStatsCard.swift b/Flipcash/Core/Screens/Profile/ProfileStatsCard.swift
new file mode 100644
index 000000000..39ee5766b
--- /dev/null
+++ b/Flipcash/Core/Screens/Profile/ProfileStatsCard.swift
@@ -0,0 +1,50 @@
+//
+//  ProfileStatsCard.swift
+//  Flipcash
+//
+
+import SwiftUI
+import FlipcashCore
+import FlipcashUI
+
+/// The two figures under a profile header: what it costs to start a chat, and when the user joined.
+struct ProfileStatsCard: View {
+
+    let minimumToChat: FiatAmount?
+    let joinedAt: Date?
+
+    var body: some View {
+        HStack(spacing: 0) {
+            stat(
+                title: "Minimum to Chat",
+                value: minimumToChat?.formatted() ?? "—",
+                identifier: "profile-stat-minimum"
+            )
+
+            Color.rowSeparator
+                .frame(width: 1, height: 32)
+
+            stat(
+                title: "Date Joined",
+                value: joinedAt?.formatted(.dateTime.month(.abbreviated).year()) ?? "—",
+                identifier: "profile-stat-joined"
+            )
+        }
+        .padding(.vertical, 16)
+        .background(Color.backgroundRow, in: RoundedRectangle(cornerRadius: 12, style: .continuous))
+    }
+
+    private func stat(title: String, value: String, identifier: String) -> some View {
+        VStack(spacing: 4) {
+            Text(value)
+                .font(.appTextMedium)
+                .foregroundStyle(Color.textMain)
+            Text(title)
+                .font(.appTextSmall)
+                .foregroundStyle(Color.textSecondary)
+        }
+        .frame(maxWidth: .infinity)
+        .accessibilityElement(children: .combine)
+        .accessibilityIdentifier(identifier)
+    }
+}
diff --git a/Flipcash/Core/Screens/Profile/StartChattingFee.swift b/Flipcash/Core/Screens/Profile/StartChattingFee.swift
new file mode 100644
index 000000000..b92e3c4d5
--- /dev/null
+++ b/Flipcash/Core/Screens/Profile/StartChattingFee.swift
@@ -0,0 +1,41 @@
+//
+//  StartChattingFee.swift
+//  Flipcash
+//
+
+import FlipcashCore
+
+/// What it costs to open a chat with a user, as their profile and the conversation CTA name it.
+///
+/// Derived from the same inputs as `SendAmountViewModel.tipFloor(in:)`, so the amount shown is the
+/// one the amount screen enforces.
+enum StartChattingFee {
+
+    /// The fee `recipientFee` charges, restated in `currency` and rounded up, falling back to the
+    /// regional preset minimum. Nil when neither is known.
+    static func amount(
+        recipientFee: FiatAmount?,
+        presets: UserFlags.TipPresets?,
+        currency: CurrencyCode,
+        rates: [CurrencyCode: Rate]
+    ) -> FiatAmount? {
+        TipFloor.toOpenDM(
+            recipientFee: recipientFee,
+            presets: presets,
+            in: currency,
+            rates: rates
+        )?.displayed
+    }
+
+    /// The fee for `profile`, in the user's balance currency.
+    @MainActor
+    static func amount(for profile: Profile?, session: Session, ratesController: RatesController) -> FiatAmount? {
+        let currency = ratesController.balanceCurrency
+        return amount(
+            recipientFee: profile?.minDmChatInitFee,
+            presets: session.userFlags?.tipPresets(for: currency),
+            currency: currency,
+            rates: ratesController.cachedRates
+        )
+    }
+}
diff --git a/FlipcashTests/Navigation/HomeTabBarVisibilityTests.swift b/FlipcashTests/Navigation/HomeTabBarVisibilityTests.swift
index 8cbe82b52..476298cbe 100644
--- a/FlipcashTests/Navigation/HomeTabBarVisibilityTests.swift
+++ b/FlipcashTests/Navigation/HomeTabBarVisibilityTests.swift
@@ -14,32 +14,20 @@ struct HomeTabBarVisibilityTests {
     func walletCard_hidesOnlyOnWallet(tab: HomeTab) {
         let hidden = tab.hidesTabBar(
             isWalletCardExpanded: true,
-            isTipCardExpanded: false,
             isShowingBill: false,
             hasPushedScreen: false
         )
         #expect(hidden == (tab == .wallet))
     }
 
-    @Test("an expanded tip card hides the bar only on the You tab", arguments: HomeTab.allCases)
-    func tipCard_hidesOnlyOnYou(tab: HomeTab) {
-        let hidden = tab.hidesTabBar(
-            isWalletCardExpanded: false,
-            isTipCardExpanded: true,
-            isShowingBill: false,
-            hasPushedScreen: false
-        )
-        #expect(hidden == (tab == .tipCard))
-    }
-
     @Test("a bill or a pushed screen hides the bar on every tab", arguments: HomeTab.allCases)
     func billOrPush_hidesEverywhere(tab: HomeTab) {
-        #expect(tab.hidesTabBar(isWalletCardExpanded: false, isTipCardExpanded: false, isShowingBill: true, hasPushedScreen: false))
-        #expect(tab.hidesTabBar(isWalletCardExpanded: false, isTipCardExpanded: false, isShowingBill: false, hasPushedScreen: true))
+        #expect(tab.hidesTabBar(isWalletCardExpanded: false, isShowingBill: true, hasPushedScreen: false))
+        #expect(tab.hidesTabBar(isWalletCardExpanded: false, isShowingBill: false, hasPushedScreen: true))
     }
 
     @Test("nothing open shows the bar", arguments: HomeTab.allCases)
     func idle_shows(tab: HomeTab) {
-        #expect(!tab.hidesTabBar(isWalletCardExpanded: false, isTipCardExpanded: false, isShowingBill: false, hasPushedScreen: false))
+        #expect(!tab.hidesTabBar(isWalletCardExpanded: false, isShowingBill: false, hasPushedScreen: false))
     }
 }
diff --git a/FlipcashTests/ProfileAvatarStoreTests.swift b/FlipcashTests/ProfileAvatarStoreTests.swift
index 2c91ce136..9f6076e46 100644
--- a/FlipcashTests/ProfileAvatarStoreTests.swift
+++ b/FlipcashTests/ProfileAvatarStoreTests.swift
@@ -12,6 +12,8 @@ import FlipcashCore
 @Suite("ProfileAvatarStore")
 struct ProfileAvatarStoreTests {
 
+    private typealias AvatarSubject = ProfileAvatarStore.AvatarSubject
+
     /// A suspension the test releases by hand, so a fetch can be held mid-flight while the callers
     /// around it are cancelled. Not cancellation-aware: the fetch under test checks cancellation
     /// itself, the way `URLSession` does.
@@ -123,6 +125,40 @@ struct ProfileAvatarStoreTests {
         #expect(fetches.value == 1)
     }
 
+    /// The banner shows the original, not the avatar-sized rendition the same picture carries.
+    @Test("A cover loads the original blob, independently of the avatar")
+    func coverLoadsOriginalAndCachesApartFromAvatar() async {
+        let userID = UUID()
+        let picture = ProfilePicture(
+            blobID: BlobID(uuid: UUID()),
+            thumbnailBlobID: BlobID(uuid: UUID())
+        )
+        let minted = Counter()
+        var mintedBlobs: [BlobID] = []
+
+        let store = ProfileAvatarStore(
+            cache: Self.cache(),
+            mintURL: { blobID, _ in
+                mintedBlobs.append(blobID)
+                minted.increment()
+                return URL(string: "https://example.test/\(blobID)")!
+            },
+            fetch: { _ in Self.bytes }
+        )
+
+        await store.load(.cover(userID), picture: picture)
+
+        #expect(mintedBlobs == [picture.blobID])
+        #expect(store.data(for: AvatarSubject.cover(userID)) == Self.bytes)
+        #expect(store.data(for: userID) == nil)
+
+        await store.load(.user(userID), picture: picture)
+
+        #expect(mintedBlobs == [picture.blobID, picture.thumbnailBlobID])
+        #expect(store.data(for: userID) == Self.bytes)
+        #expect(minted.value == 2)
+    }
+
     /// Bytes already on disk are the common case at launch, and paying for a round trip there would
     /// put a blurhash on screen for the length of one.
     @Test("Bytes already on disk need no fetch")
diff --git a/FlipcashTests/ProfileCoverFillTests.swift b/FlipcashTests/ProfileCoverFillTests.swift
new file mode 100644
index 000000000..d9f416401
--- /dev/null
+++ b/FlipcashTests/ProfileCoverFillTests.swift
@@ -0,0 +1,34 @@
+//
+//  ProfileCoverFillTests.swift
+//  FlipcashTests
+//
+
+import SwiftUI
+import Testing
+import FlipcashCore
+import FlipcashUI
+@testable import Flipcash
+
+@MainActor
+@Suite("ProfileCoverFill")
+struct ProfileCoverFillTests {
+
+    @Test("A valid hex gives the parsed colour")
+    func validHexIsParsed() {
+        let color = ProfileCoverFill.color(for: TipCardCustomization(colorHex: "#19191A"))
+
+        #expect(color == Color(hex: "#19191A"))
+    }
+
+    @Test("An unparsable hex gives the default")
+    func invalidHexFallsBack() {
+        let color = ProfileCoverFill.color(for: TipCardCustomization(colorHex: "not-a-colour"))
+
+        #expect(color == ProfileCoverFill.fallback)
+    }
+
+    @Test("No customization gives the default")
+    func nilFallsBack() {
+        #expect(ProfileCoverFill.color(for: nil) == ProfileCoverFill.fallback)
+    }
+}
diff --git a/FlipcashTests/StartChattingFeeTests.swift b/FlipcashTests/StartChattingFeeTests.swift
new file mode 100644
index 000000000..b39617e50
--- /dev/null
+++ b/FlipcashTests/StartChattingFeeTests.swift
@@ -0,0 +1,57 @@
+//
+//  StartChattingFeeTests.swift
+//  FlipcashTests
+//
+
+import Foundation
+import Testing
+@testable import FlipcashCore
+@testable import Flipcash
+
+@MainActor
+@Suite("StartChattingFee")
+struct StartChattingFeeTests {
+
+    private let presets = UserFlags.TipPresets(
+        currency: .usd,
+        minimum: Decimal(string: "0.25")!,
+        low: 5,
+        medium: 10,
+        high: 20
+    )
+
+    private let rates: [CurrencyCode: Rate] = [
+        .usd: Rate(fx: 1, currency: .usd),
+        .cad: Rate(fx: Decimal(string: "1.37")!, currency: .cad),
+    ]
+
+    /// 0.33 USD is 0.4521 CAD: half-up would show 0.45, which sits under the fee.
+    @Test("A fee shown in another currency rounds up, as the amount screen enforces")
+    func feeInOtherCurrencyRoundsUp() {
+        let fee = FiatAmount(value: Decimal(string: "0.33")!, currency: .usd)
+
+        let amount = StartChattingFee.amount(
+            recipientFee: fee,
+            presets: presets,
+            currency: .cad,
+            rates: rates
+        )
+
+        #expect(amount == FiatAmount(value: Decimal(string: "0.46")!, currency: .cad))
+        #expect(amount == TipFloor.toOpenDM(recipientFee: fee, presets: presets, in: .cad, rates: rates)?.displayed)
+    }
+
+    @Test("No fee falls back to the preset minimum")
+    func nilFeeFallsBackToPresetMinimum() {
+        let amount = StartChattingFee.amount(recipientFee: nil, presets: presets, currency: .usd, rates: rates)
+
+        #expect(amount == FiatAmount(value: Decimal(string: "0.25")!, currency: .usd))
+    }
+
+    @Test("No fee and no presets gives nothing")
+    func nilFeeAndNilPresetsIsNil() {
+        let amount = StartChattingFee.amount(recipientFee: nil, presets: nil, currency: .usd, rates: rates)
+
+        #expect(amount == nil)
+    }
+}
diff --git a/FlipcashTests/TipCardExportTests.swift b/FlipcashTests/TipCardExportTests.swift
index 26a8c197a..fa419c618 100644
--- a/FlipcashTests/TipCardExportTests.swift
+++ b/FlipcashTests/TipCardExportTests.swift
@@ -18,7 +18,7 @@ struct TipCardExportTests {
         let url = try #require(TipCardExport.file(for: .svg, codeData: .placeholder35, name: "Ada"))
         defer { TipCardExport.discard(url) }
 
-        #expect(url.lastPathComponent == "Tip Ada.svg")
+        #expect(url.lastPathComponent == "Chat with Ada.svg")
 
         let svg = try String(contentsOf: url, encoding: .utf8)
         #expect(svg.hasPrefix("<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"1024\""))
@@ -34,7 +34,7 @@ struct TipCardExportTests {
         let url = try #require(TipCardExport.file(for: .png, codeData: .placeholder35, name: "Ada"))
         defer { TipCardExport.discard(url) }
 
-        #expect(url.lastPathComponent == "Tip Ada.png")
+        #expect(url.lastPathComponent == "Chat with Ada.png")
 
         let image = try #require(UIImage(data: try Data(contentsOf: url)))
         #expect(image.size == CGSize(width: 1024, height: 1024))
@@ -54,7 +54,7 @@ struct TipCardExportTests {
         let url = try #require(TipCardExport.file(for: .svg, codeData: .placeholder35, name: "../../etc/Ada"))
         defer { TipCardExport.discard(url) }
 
-        #expect(url.lastPathComponent == "Tip .. .. etc Ada.svg")
+        #expect(url.lastPathComponent == "Chat with .. .. etc Ada.svg")
     }
 
     @Test("Discarding an export takes its directory with it")
diff --git a/FlipcashUITests/Smoke/DisplayNameSmokeTests.swift b/FlipcashUITests/Smoke/DisplayNameSmokeTests.swift
index 51d9338f2..6627dee1b 100644
--- a/FlipcashUITests/Smoke/DisplayNameSmokeTests.swift
+++ b/FlipcashUITests/Smoke/DisplayNameSmokeTests.swift
@@ -37,19 +37,19 @@ final class DisplayNameSmokeTests: BaseUITestCase {
         // arrives already tippable.
         createFreshAccount()
 
-        // MARK: The card is there, with its actions.
+        // MARK: The profile is there, with its actions.
         settings.openYouTab(from: self)
         XCTAssertTrue(
-            app.buttons["you-share-button"].waitForExistence(timeout: 30),
-            "Expected the tip card's Share action on a named account. On screen: [\(visibleText())]"
+            app.buttons["you-share"].waitForExistence(timeout: 30),
+            "Expected the profile's Share menu on a named account. On screen: [\(visibleText())]"
         )
         XCTAssertTrue(
-            app.buttons["you-download-button"].exists,
-            "Expected the tip card's Download action alongside Share"
+            app.staticTexts["profile-name"].exists,
+            "Expected the profile header's name, not the name-less setup prompt"
         )
         XCTAssertTrue(
-            app.buttons["you-fullscreen-button"].exists,
-            "Expected the card itself, not the name-less setup prompt"
+            app.buttons["you-edit-profile"].exists,
+            "Expected the Edit Profile button under the stats"
         )
 
         // MARK: Change the name from Settings.
@@ -110,14 +110,14 @@ final class DisplayNameSmokeTests: BaseUITestCase {
             "Expected the name editor to pop back to Settings once the name saved. On screen: [\(visibleText())]"
         )
 
-        // MARK: The card survives the rename.
+        // MARK: The profile survives the rename.
         // Unwind the last screen by hand: the tab bar stays hidden while the
         // You tab has a stack, so there is no You button to tap back to.
         waitAndTap(app.navigationBars.buttons.firstMatch)
         assertMainScreenReached(timeout: 30, "Expected the You tab root after backing out of Settings")
         XCTAssertTrue(
-            app.buttons["you-share-button"].waitForExistence(timeout: 30),
-            "Expected the tip card still on the You tab after renaming"
+            app.buttons["you-share"].waitForExistence(timeout: 30),
+            "Expected the profile still on the You tab after renaming"
         )
     }
 }
diff --git a/FlipcashUITests/Smoke/ProfileCardSmokeTests.swift b/FlipcashUITests/Smoke/ProfileCardSmokeTests.swift
new file mode 100644
index 000000000..052fbf14f
--- /dev/null
+++ b/FlipcashUITests/Smoke/ProfileCardSmokeTests.swift
@@ -0,0 +1,36 @@
+//
+//  ProfileCardSmokeTests.swift
+//  FlipcashUITests
+//
+
+import XCTest
+
+/// Covers the profile card the You tab's Share menu presents full screen, and its Close button.
+///
+/// **Prerequisites:** the `FLIPCASH_UI_TEST_ACCESS_KEY` account needs a display
+/// name — without one the tab has no Share menu and no card to show.
+@MainActor
+final class ProfileCardSmokeTests: BaseUITestCase {
+
+    override var requiresAuthentication: Bool { true }
+
+    /// Share → Show Profile Card presents the card with its Download action, and Close returns.
+    func testShowProfileCard_opensAndCloses() throws {
+        assertMainScreenReached()
+        waitAndTap(app.tabBars.buttons["You"].firstMatch)
+        waitAndTap(app.buttons["you-share"])
+        waitAndTap(app.buttons["Show Profile Card"])
+
+        XCTAssertTrue(
+            app.buttons["you-download-button"].waitForExistence(timeout: 10),
+            "Expected the profile card with its Download action"
+        )
+
+        waitAndTap(app.buttons["profile-card-close"])
+
+        XCTAssertTrue(
+            app.buttons["you-share"].waitForExistence(timeout: 10),
+            "Expected Close to return to the You tab"
+        )
+    }
+}
diff --git a/FlipcashUITests/Smoke/TipCardFullScreenSmokeTests.swift b/FlipcashUITests/Smoke/TipCardFullScreenSmokeTests.swift
deleted file mode 100644
index 91f6b0bbd..000000000
--- a/FlipcashUITests/Smoke/TipCardFullScreenSmokeTests.swift
+++ /dev/null
@@ -1,62 +0,0 @@
-//
-//  TipCardFullScreenSmokeTests.swift
-//  FlipcashUITests
-//
-
-import XCTest
-
-/// Covers the You tab's full-screen tip card and the pull that puts it back:
-/// up closes it, down does not.
-///
-/// **Prerequisites:** the `FLIPCASH_UI_TEST_ACCESS_KEY` account needs a display
-/// name — without one the tab shows the add-your-name invitation and there is
-/// no card to expand.
-@MainActor
-final class TipCardFullScreenSmokeTests: BaseUITestCase {
-
-    override var requiresAuthentication: Bool { true }
-
-    /// Pulling the expanded card up toward its slot puts it back, no close tap.
-    func testExpandedTipCard_pullUp_collapses() throws {
-        let closeButton = expandTipCard()
-
-        pullCard(from: 0.6, to: 0.25)
-
-        XCTAssertTrue(
-            closeButton.waitForNonExistence(timeout: 10),
-            "Expected the pull up to put the card back"
-        )
-    }
-
-    /// Down is where expanding already took the card, so a downward pull is
-    /// resisted rather than read as a dismissal.
-    func testExpandedTipCard_pullDown_staysExpanded() throws {
-        let closeButton = expandTipCard()
-
-        pullCard(from: 0.4, to: 0.75)
-
-        XCTAssertTrue(closeButton.exists, "Expected the card to stay expanded")
-    }
-
-    // MARK: - Helpers -
-
-    /// Opens the card full screen and returns its close control.
-    private func expandTipCard() -> XCUIElement {
-        assertMainScreenReached()
-        waitAndTap(app.tabBars.buttons["You"].firstMatch)
-        waitAndTap(app.buttons["you-fullscreen-button"])
-
-        let closeButton = app.buttons["you-close-fullscreen-button"]
-        XCTAssertTrue(closeButton.waitForExistence(timeout: 10), "Expected the card to expand")
-        return closeButton
-    }
-
-    /// Drags the middle of the screen between two normalized heights — where
-    /// the expanded card is, and slowly enough that only the distance counts,
-    /// never a flick's projection.
-    private func pullCard(from start: CGFloat, to end: CGFloat) {
-        let origin = app.coordinate(withNormalizedOffset: CGVector(dx: 0.5, dy: start))
-        let destination = app.coordinate(withNormalizedOffset: CGVector(dx: 0.5, dy: end))
-        origin.press(forDuration: 0.2, thenDragTo: destination)
-    }
-}

From b657c1f4886badbe7401e8c12fabb646a3dceaf1 Mon Sep 17 00:00:00 2001
From: Brandon McAnsh <git@bmcreations.dev>
Date: Tue, 6 Oct 2026 08:11:55 -0400
Subject: [PATCH 04/45] fix(you): keep banner control ids, close profile card
 from router, own cover cache pool

---
 .maestro/you-tab-download.yaml                | 11 +++--
 .../Deep Links/DeepLinkController.swift       |  6 +--
 .../Core/Controllers/ProfileAvatarStore.swift | 19 +++++++-
 Flipcash/Core/Navigation/AppRouter.swift      | 22 +++++++--
 Flipcash/Core/Screens/Main/Tips/TipFlow.swift |  4 +-
 .../Screens/Main/You/ProfileCardScreen.swift  |  9 ++--
 .../Core/Screens/Main/You/YouScreen.swift     | 21 +++++----
 .../Screens/Profile/ProfileCoverBanner.swift  |  3 ++
 .../Flip API/Services/BlobService.swift       |  2 +-
 .../FlipcashCore/Images/BlobCache.swift       |  4 ++
 .../Navigation/YouTabRoutingTests.swift       | 46 +++++++++++++++++++
 FlipcashTests/ProfileAvatarStoreTests.swift   | 32 ++++++++++++-
 FlipcashTests/StartChattingFeeTests.swift     | 22 +++++++++
 13 files changed, 171 insertions(+), 30 deletions(-)

diff --git a/.maestro/you-tab-download.yaml b/.maestro/you-tab-download.yaml
index b914d542c..fee120cc7 100644
--- a/.maestro/you-tab-download.yaml
+++ b/.maestro/you-tab-download.yaml
@@ -1,10 +1,12 @@
-# Drives the You tab's export path end to end, once per format: card page ->
-# Download -> pick a format -> the system share sheet holding the written file.
+# Drives the You tab's export path end to end, once per format: Share menu ->
+# Show Profile Card -> Download -> pick a format -> the system share sheet holding the written file.
 appId: com.flipcash.app.ios
 ---
 - launchApp
 - tapOn: "You"
-- assertVisible: "Full Screen"
+- tapOn:
+    id: "you-share"
+- tapOn: "Show Profile Card"
 
 # --- SVG ---
 - tapOn:
@@ -23,6 +25,9 @@ appId: com.flipcash.app.ios
 # Relaunching is the cheapest way to get the system sheet off screen.
 - launchApp
 - tapOn: "You"
+- tapOn:
+    id: "you-share"
+- tapOn: "Show Profile Card"
 - tapOn:
     id: "you-download-button"
 - tapOn:
diff --git a/Flipcash/Core/Controllers/Deep Links/DeepLinkController.swift b/Flipcash/Core/Controllers/Deep Links/DeepLinkController.swift
index d28088ec5..9d58e58f5 100644
--- a/Flipcash/Core/Controllers/Deep Links/DeepLinkController.swift	
+++ b/Flipcash/Core/Controllers/Deep Links/DeepLinkController.swift	
@@ -254,8 +254,8 @@ struct DeepLinkAction {
     }
 
     /// Whether a person link names the viewer, answerable without a lookup only when the id or the
-    /// handle is already known locally. A link to the viewer keeps opening their own tip card, as it
-    /// did before person links opened a profile.
+    /// handle is already known locally. A link to the viewer opens their own profile, the same as
+    /// scanning their own code.
     static func isOwnLink(
         _ identifier: ProfileIdentifier,
         selfUserID: UserID,
@@ -425,7 +425,7 @@ struct DeepLinkAction {
             if let container = sessionAuthenticator.loggedInContainer {
                 Analytics.deeplinkRouted(kind: kind)
                 // `begin` owns the own-id case: a self link lands on the user's
-                // own tip card rather than starting a tip.
+                // own profile rather than starting a tip.
                 container.tipFlow.begin(userID: userID)
             }
 
diff --git a/Flipcash/Core/Controllers/ProfileAvatarStore.swift b/Flipcash/Core/Controllers/ProfileAvatarStore.swift
index 755d96b96..9b76165aa 100644
--- a/Flipcash/Core/Controllers/ProfileAvatarStore.swift
+++ b/Flipcash/Core/Controllers/ProfileAvatarStore.swift
@@ -54,6 +54,7 @@ final class ProfileAvatarStore {
     /// merely turned away could not learn that the fetch it skipped had failed, and nothing retried.
     @ObservationIgnored private var inFlight: [AvatarSubject: Task<Void, Never>] = [:]
     @ObservationIgnored private let cache: BlobCache
+    @ObservationIgnored private let coverCache: BlobCache
     @ObservationIgnored private let mintURL: (BlobID, AvatarSubject) async throws -> URL?
     @ObservationIgnored private let fetch: (URL) async throws -> Data
 
@@ -63,19 +64,27 @@ final class ProfileAvatarStore {
     ///   - fetch: downloads the bytes at a URL.
     init(
         cache: BlobCache = .profilePictures,
+        coverCache: BlobCache = .profileCovers,
         mintURL: @escaping (BlobID, AvatarSubject) async throws -> URL?,
         fetch: @escaping (URL) async throws -> Data = { url in
             try await URLSession.shared.data(from: url).0
         }
     ) {
         self.cache   = cache
+        self.coverCache = coverCache
         self.mintURL = mintURL
         self.fetch   = fetch
     }
 
-    convenience init(flipClient: FlipClient, owner: KeyPair, cache: BlobCache = .profilePictures) {
+    convenience init(
+        flipClient: FlipClient,
+        owner: KeyPair,
+        cache: BlobCache = .profilePictures,
+        coverCache: BlobCache = .profileCovers
+    ) {
         self.init(
             cache: cache,
+            coverCache: coverCache,
             mintURL: { blobID, subject in
                 try await flipClient.blobDownloadURL(
                     blobID: blobID,
@@ -112,6 +121,7 @@ final class ProfileAvatarStore {
         // A different blob under the same id is a changed picture, not a cache hit.
         if blobBySubject[subject] == blobID, dataBySubject[subject] != nil { return }
 
+        let cache = cache(for: subject)
         if let cached = cache.data(for: blobID) {
             store(cached, subject: subject, blobID: blobID)
             return
@@ -133,13 +143,18 @@ final class ProfileAvatarStore {
         await task.value
     }
 
+    /// Covers hold the full-size blob, so they get their own budget rather than crowding out thumbnails.
+    private func cache(for subject: AvatarSubject) -> BlobCache {
+        if case .cover = subject { coverCache } else { cache }
+    }
+
     /// Download URLs expire, so one is minted per fetch and never stored.
     private func download(blobID: BlobID, subject: AvatarSubject) async {
         do {
             guard let url = try await mintURL(blobID, subject) else { return }
 
             let data = try await fetch(url)
-            cache.write(data, for: blobID)
+            cache(for: subject).write(data, for: blobID)
             store(data, subject: subject, blobID: blobID)
         } catch {
             guard !Task.isCancelled else { return }
diff --git a/Flipcash/Core/Navigation/AppRouter.swift b/Flipcash/Core/Navigation/AppRouter.swift
index 324483a24..1941c09bf 100644
--- a/Flipcash/Core/Navigation/AppRouter.swift
+++ b/Flipcash/Core/Navigation/AppRouter.swift
@@ -63,7 +63,16 @@ final class AppRouter {
     /// is showing; the topmost-stack mutators (`push`, `popTopmost`, …) fall
     /// back to this so in-tab navigation lands on the right stack.
     /// `HomeTabView` keeps it in sync with the selected tab.
-    var activeTabStack: Stack?
+    var activeTabStack: Stack? {
+        didSet {
+            if activeTabStack != oldValue { isShowingProfileCard = false }
+        }
+    }
+
+    /// Whether the You tab's profile card is up. It is a cover local to `YouScreen`, which the
+    /// sheet stack cannot see, so the router closes it itself whenever sheets are dismissed, a
+    /// tab is requested or the selected tab changes — otherwise a deep link would land beneath it.
+    var isShowingProfileCard = false
 
     /// A token the wallet should open in its expanded card state, rather than
     /// as a pushed screen. Deep links use this so following a link lands where
@@ -86,7 +95,11 @@ final class AppRouter {
     /// A tab the router wants brought forward, named by the stack it owns.
     /// `HomeTabView` selects it and clears this. Deep-link routing only; nothing
     /// else drives tab selection.
-    var requestedTabStack: Stack?
+    var requestedTabStack: Stack? {
+        didSet {
+            if requestedTabStack != nil { isShowingProfileCard = false }
+        }
+    }
 
     /// The stack that `push`/`pop`-style calls target: the presented sheet's
     /// stack, or — when no sheet is up and a tab is the active surface — the
@@ -458,6 +471,7 @@ final class AppRouter {
     /// re-open instead.
     func dismissSheet() {
         guard let dismissing = presentedSheets.popLast() else { return }
+        isShowingProfileCard = false
         dismissedStacks.insert(dismissing.stack)
         logger.info("Dismissed sheet", metadata: [
             "sheet": "\(dismissing)",
@@ -577,10 +591,10 @@ final class AppRouter {
         logger.info("Routed to wallet", metadata: ["stack": "\(Stack.balance)"])
     }
 
-    /// Surfaces the user's own tip card: the You tab at its root.
+    /// Surfaces the user's own profile: the You tab at its root.
     ///
     /// Not expressible as `navigate(to:)` — the You tab's stack is entered by
-    /// tab selection and has no destination that names the card.
+    /// tab selection and has no destination that names the profile.
     ///
     /// Idempotent, like `navigate(to:)`: the scanner decodes a tipcode every
     /// frame until its camera tears down, so arriving is not allowed to re-fire
diff --git a/Flipcash/Core/Screens/Main/Tips/TipFlow.swift b/Flipcash/Core/Screens/Main/Tips/TipFlow.swift
index 40b6abe53..6f7790feb 100644
--- a/Flipcash/Core/Screens/Main/Tips/TipFlow.swift
+++ b/Flipcash/Core/Screens/Main/Tips/TipFlow.swift
@@ -50,7 +50,7 @@ final class TipFlow {
     // MARK: - Entry -
 
     /// Handles a scanned or deeplinked tipcode. Gates in order: own-id codes
-    /// (routed to the user's own tip card), then a tippable profile (held +
+    /// (routed to the user's own profile), then a tippable profile (held +
     /// profile creation presented).
     ///
     /// No balance gate: this flow no longer moves money, it opens a chat. The
@@ -60,7 +60,7 @@ final class TipFlow {
     /// conversation they can read and reply in.
     func begin(userID: UserID) {
         // Tipping yourself is a payment no-op, so there's no flow to start from
-        // your own code — show the user their own tip card rather than swallow
+        // your own code — show the user their own profile rather than swallow
         // the scan or tap. `showOwnTipCard()` absorbs the repeat calls the
         // per-frame scanner makes until the camera tears down.
         guard userID != session.userID else {
diff --git a/Flipcash/Core/Screens/Main/You/ProfileCardScreen.swift b/Flipcash/Core/Screens/Main/You/ProfileCardScreen.swift
index e092b1b46..06376bedc 100644
--- a/Flipcash/Core/Screens/Main/You/ProfileCardScreen.swift
+++ b/Flipcash/Core/Screens/Main/You/ProfileCardScreen.swift
@@ -15,9 +15,8 @@ struct ProfileCardScreen: View {
     @Environment(SessionContainer.self) private var sessionContainer
     @Environment(\.dismiss) private var dismiss
 
-    /// Warms the share-sheet preview image ahead of the share tap so it never
-    /// lands on the tap.
-    @State private var previewCache = TipCodePreviewCache()
+    /// Warmed by `YouScreen`, which outlives this screen, so reopening reuses the render.
+    let previewCache: TipCodePreviewCache
     @State private var isShowingDownloadOptions = false
 
     /// The format tapped in the download sheet, held until the sheet is gone so
@@ -69,6 +68,7 @@ struct ProfileCardScreen: View {
                         .padding(.top, 24)
                 }
                 .padding(.horizontal, Self.horizontalInset)
+                .containerRelativeFrame(.vertical, alignment: .center)
             }
         }
         .sheet(isPresented: $isShowingDownloadOptions, onDismiss: exportPendingDownload) {
@@ -77,9 +77,6 @@ struct ProfileCardScreen: View {
                 onCancel: { isShowingDownloadOptions = false }
             )
         }
-        .task(id: profile?.profilePicture?.thumbnailBlobID) {
-            previewCache.warm(TipCode.Payload(userID: sessionContainer.session.userID))
-        }
         .onAppear(perform: boostBrightness)
         .onDisappear(perform: restoreBrightness)
     }
diff --git a/Flipcash/Core/Screens/Main/You/YouScreen.swift b/Flipcash/Core/Screens/Main/You/YouScreen.swift
index f76799d82..5ebc56671 100644
--- a/Flipcash/Core/Screens/Main/You/YouScreen.swift
+++ b/Flipcash/Core/Screens/Main/You/YouScreen.swift
@@ -27,7 +27,6 @@ struct YouScreen: View {
     /// Warms the share-sheet preview image ahead of the share tap so it never
     /// lands on the tap; keyed by user.
     @State private var previewCache = TipCodePreviewCache()
-    @State private var isShowingProfileCard = false
 
     /// The balance gate, raised when the claim row is tapped below the minimum.
     @State private var usernameDialog: DialogItem?
@@ -115,15 +114,21 @@ struct YouScreen: View {
             }
             .onGeometryChange(for: CGFloat.self) { $0.safeAreaInsets.top } action: { safeAreaTop = $0 }
         }
-        .fullScreenCover(isPresented: $isShowingProfileCard) {
-            ProfileCardScreen()
+        .fullScreenCover(isPresented: Bindable(router).isShowingProfileCard) {
+            ProfileCardScreen(previewCache: previewCache)
         }
         .task(id: profilePicture?.thumbnailBlobID) {
-            await sessionContainer.profileAvatars.load(userID: sessionContainer.session.userID, picture: profilePicture)
             // There is no card to share, and so no preview worth rendering, until
-            // the profile has a name.
-            guard displayName != nil else { return }
-            previewCache.warm(TipCode.Payload(userID: sessionContainer.session.userID))
+            // the profile has a name. Warmed before the avatar download so a slow
+            // network cannot hold it back.
+            if displayName != nil {
+                previewCache.warm(TipCode.Payload(userID: sessionContainer.session.userID))
+            }
+            await sessionContainer.profileAvatars.load(userID: sessionContainer.session.userID, picture: profilePicture)
+        }
+        // A cash link raises the bill without touching the router, and it would draw under the card.
+        .onChange(of: sessionContainer.session.isShowingBill) { _, isShowing in
+            if isShowing { router.isShowingProfileCard = false }
         }
         .dialog(item: $usernameDialog)
     }
@@ -167,7 +172,7 @@ struct YouScreen: View {
     private var shareMenu: some View {
         Menu {
             Button("Share Profile", action: shareTipCard)
-            Button("Show Profile Card") { isShowingProfileCard = true }
+            Button("Show Profile Card") { router.isShowingProfileCard = true }
         } label: {
             bannerControl(systemName: "square.and.arrow.up")
         }
diff --git a/Flipcash/Core/Screens/Profile/ProfileCoverBanner.swift b/Flipcash/Core/Screens/Profile/ProfileCoverBanner.swift
index 846f37548..9fe5ec8e1 100644
--- a/Flipcash/Core/Screens/Profile/ProfileCoverBanner.swift
+++ b/Flipcash/Core/Screens/Profile/ProfileCoverBanner.swift
@@ -32,6 +32,9 @@ struct ProfileCoverBanner<Actions: View>: View {
             .task(id: coverPicture?.blobID) {
                 await sessionContainer.profileAvatars.load(.cover(userID), picture: coverPicture)
             }
+            // `.contain` keeps the Share and Settings buttons as their own elements; a bare
+            // identifier here would overwrite theirs.
+            .accessibilityElement(children: .contain)
             .accessibilityIdentifier("profile-cover")
     }
 
diff --git a/FlipcashCore/Sources/FlipcashCore/Clients/Flip API/Services/BlobService.swift b/FlipcashCore/Sources/FlipcashCore/Clients/Flip API/Services/BlobService.swift
index 9bba3e255..cfb1e3958 100644
--- a/FlipcashCore/Sources/FlipcashCore/Clients/Flip API/Services/BlobService.swift	
+++ b/FlipcashCore/Sources/FlipcashCore/Clients/Flip API/Services/BlobService.swift	
@@ -219,7 +219,7 @@ extension ErrorBlob: ServerError {
 
 /// The surface a blob read is authorized through, for blobs the caller does
 /// not own. See `flipcash.blob.v1.AccessContext`.
-public enum BlobAccessContext: Sendable {
+public enum BlobAccessContext: Sendable, Equatable {
 
     /// Reading a rendition of `userID`'s current profile picture.
     case userProfile(UserID)
diff --git a/FlipcashCore/Sources/FlipcashCore/Images/BlobCache.swift b/FlipcashCore/Sources/FlipcashCore/Images/BlobCache.swift
index b5f0b0fc3..8532063bd 100644
--- a/FlipcashCore/Sources/FlipcashCore/Images/BlobCache.swift
+++ b/FlipcashCore/Sources/FlipcashCore/Images/BlobCache.swift
@@ -37,6 +37,10 @@ public final class BlobCache: @unchecked Sendable {
     /// the directory needs a ceiling; the coldest entries go first.
     public static let profilePictures = BlobCache(name: "Avatars", limitBytes: 24 * 1024 * 1024)
 
+    /// Full-size profile covers. Kept apart from ``profilePictures`` so a few megabyte banners
+    /// cannot evict the avatar thumbnails.
+    public static let profileCovers = BlobCache(name: "Covers", limitBytes: 48 * 1024 * 1024)
+
     /// The parent of every kind's directory.
     ///
     /// Having one lets ``clearAll()`` delete the lot without a registry of kinds to keep in sync. A
diff --git a/FlipcashTests/Navigation/YouTabRoutingTests.swift b/FlipcashTests/Navigation/YouTabRoutingTests.swift
index d50055124..a5a11e1ef 100644
--- a/FlipcashTests/Navigation/YouTabRoutingTests.swift
+++ b/FlipcashTests/Navigation/YouTabRoutingTests.swift
@@ -99,4 +99,50 @@ struct YouTabRoutingTests {
         router.popTopmost()
         #expect(router[.you].isEmpty)
     }
+
+    // MARK: - Profile card -
+
+    @Test("dismissing a sheet closes the profile card")
+    func dismissSheet_closesProfileCard() {
+        let router = AppRouter()
+        router.present(.give)
+        router.isShowingProfileCard = true
+
+        router.dismissSheet()
+
+        #expect(!router.isShowingProfileCard)
+    }
+
+    @Test("changing the selected tab closes the profile card")
+    func tabChange_closesProfileCard() {
+        let router = AppRouter()
+        router.activeTabStack = .you
+        router.isShowingProfileCard = true
+
+        router.activeTabStack = .balance
+
+        #expect(!router.isShowingProfileCard)
+    }
+
+    @Test("re-publishing the same tab leaves the profile card up")
+    func sameTab_keepsProfileCard() {
+        let router = AppRouter()
+        router.activeTabStack = .you
+        router.isShowingProfileCard = true
+
+        router.activeTabStack = .you
+
+        #expect(router.isShowingProfileCard)
+    }
+
+    @Test("a deep-link tab request closes the profile card")
+    func tabRequest_closesProfileCard() {
+        let router = AppRouter()
+        router.activeTabStack = .you
+        router.isShowingProfileCard = true
+
+        router.requestedTabStack = .balance
+
+        #expect(!router.isShowingProfileCard)
+    }
 }
diff --git a/FlipcashTests/ProfileAvatarStoreTests.swift b/FlipcashTests/ProfileAvatarStoreTests.swift
index 9f6076e46..e865f0b0e 100644
--- a/FlipcashTests/ProfileAvatarStoreTests.swift
+++ b/FlipcashTests/ProfileAvatarStoreTests.swift
@@ -135,11 +135,14 @@ struct ProfileAvatarStoreTests {
         )
         let minted = Counter()
         var mintedBlobs: [BlobID] = []
+        var mintedContexts: [BlobAccessContext] = []
 
         let store = ProfileAvatarStore(
             cache: Self.cache(),
-            mintURL: { blobID, _ in
+            coverCache: Self.cache(),
+            mintURL: { blobID, subject in
                 mintedBlobs.append(blobID)
+                mintedContexts.append(subject.accessContext)
                 minted.increment()
                 return URL(string: "https://example.test/\(blobID)")!
             },
@@ -149,6 +152,7 @@ struct ProfileAvatarStoreTests {
         await store.load(.cover(userID), picture: picture)
 
         #expect(mintedBlobs == [picture.blobID])
+        #expect(mintedContexts == [.userProfile(userID)])
         #expect(store.data(for: AvatarSubject.cover(userID)) == Self.bytes)
         #expect(store.data(for: userID) == nil)
 
@@ -159,6 +163,32 @@ struct ProfileAvatarStoreTests {
         #expect(minted.value == 2)
     }
 
+    /// A full-size cover in the avatar pool would evict thumbnails, which the pools are split to prevent.
+    @Test("A cover is written to the cover pool, not the avatar pool")
+    func coverUsesItsOwnPool() async {
+        let userID = UUID()
+        let picture = ProfilePicture(blobID: BlobID(uuid: UUID()), thumbnailBlobID: BlobID(uuid: UUID()))
+        let avatarCache = Self.cache()
+        let coverCache = Self.cache()
+
+        let store = ProfileAvatarStore(
+            cache: avatarCache,
+            coverCache: coverCache,
+            mintURL: { _, _ in URL(string: "https://example.test/cover")! },
+            fetch: { _ in Self.bytes }
+        )
+
+        await store.load(.cover(userID), picture: picture)
+
+        #expect(coverCache.holds(picture.blobID))
+        #expect(!avatarCache.holds(picture.blobID))
+
+        await store.load(.user(userID), picture: picture)
+
+        #expect(avatarCache.holds(picture.thumbnailBlobID))
+        #expect(!coverCache.holds(picture.thumbnailBlobID))
+    }
+
     /// Bytes already on disk are the common case at launch, and paying for a round trip there would
     /// put a blurhash on screen for the length of one.
     @Test("Bytes already on disk need no fetch")
diff --git a/FlipcashTests/StartChattingFeeTests.swift b/FlipcashTests/StartChattingFeeTests.swift
index b39617e50..e84af8b7c 100644
--- a/FlipcashTests/StartChattingFeeTests.swift
+++ b/FlipcashTests/StartChattingFeeTests.swift
@@ -54,4 +54,26 @@ struct StartChattingFeeTests {
 
         #expect(amount == nil)
     }
+
+    /// The session overload only supplies the user's balance currency and cached rates.
+    @Test("The profile's fee is read in the rates controller's balance currency")
+    func profileFeeUsesBalanceCurrency() {
+        let ratesController = RatesController(container: .mock, database: .mock)
+        let currency = ratesController.balanceCurrency
+        // In the balance currency already, so the result does not depend on loaded rates.
+        let fee = FiatAmount(value: Decimal(string: "0.33")!, currency: currency)
+        let profile = Profile(displayName: "Ted", phone: Optional<Phone>.none, email: nil, minDmChatInitFee: fee)
+
+        let amount = StartChattingFee.amount(for: profile, session: .mock, ratesController: ratesController)
+
+        let expected = StartChattingFee.amount(
+            recipientFee: fee,
+            presets: nil,
+            currency: currency,
+            rates: ratesController.cachedRates
+        )
+        #expect(amount != nil)
+        #expect(amount == expected)
+        #expect(amount?.currency == currency)
+    }
 }

From c0a2c10bd719cb22be13cc40721c75365efc40ee Mon Sep 17 00:00:00 2001
From: Brandon McAnsh <git@bmcreations.dev>
Date: Tue, 6 Oct 2026 08:27:35 -0400
Subject: [PATCH 05/45] feat(profile): other-user profile with overflow menu
 and pinned action

---
 .../Controllers/ConversationController.swift  |   6 +
 .../Conversation/StartChattingSheet.swift     |  12 +-
 .../Screens/Profile/ChatMuteStatusLabel.swift |   6 +-
 .../Screens/Profile/ProfileMenuItems.swift    |  53 +++
 .../Screens/Profile/ProfilePinnedAction.swift |  38 ++
 .../Screens/Profile/ProfileStatusChip.swift   |  24 ++
 .../Screens/Profile/UserProfileScreen.swift   | 390 +++++++++++-------
 .../Chat/MentionDestinationTests.swift        |   5 -
 FlipcashTests/ProfileMenuItemsTests.swift     |  41 ++
 FlipcashTests/ProfilePinnedActionTests.swift  |  55 +++
 .../UserProfileChatActionsTests.swift         |  36 +-
 .../Smoke/BlockUnblockSmokeTests.swift        |   3 +-
 12 files changed, 473 insertions(+), 196 deletions(-)
 create mode 100644 Flipcash/Core/Screens/Profile/ProfileMenuItems.swift
 create mode 100644 Flipcash/Core/Screens/Profile/ProfilePinnedAction.swift
 create mode 100644 Flipcash/Core/Screens/Profile/ProfileStatusChip.swift
 create mode 100644 FlipcashTests/ProfileMenuItemsTests.swift
 create mode 100644 FlipcashTests/ProfilePinnedActionTests.swift

diff --git a/Flipcash/Core/Controllers/ConversationController.swift b/Flipcash/Core/Controllers/ConversationController.swift
index e3d320973..59adb17c3 100644
--- a/Flipcash/Core/Controllers/ConversationController.swift
+++ b/Flipcash/Core/Controllers/ConversationController.swift
@@ -1683,6 +1683,12 @@ final class ConversationController {
         }
     }
 
+    /// The ID of the tip DM with `userID`, or nil when the chat hasn't started. The single "chat
+    /// started" rule: the visible DM. Hidden chats are excluded, and a block takes precedence anyway.
+    func tipDMID(withUserID userID: UserID) -> ConversationID? {
+        tipDM(withUserID: userID)?.id
+    }
+
     private func contactName(for conversationID: ConversationID) -> String? {
         guard let name = contactNaming.contactDisplayName(forDMChat: conversationID),
               !name.isEmpty else {
diff --git a/Flipcash/Core/Screens/Conversation/StartChattingSheet.swift b/Flipcash/Core/Screens/Conversation/StartChattingSheet.swift
index 7fec0ebde..79215f782 100644
--- a/Flipcash/Core/Screens/Conversation/StartChattingSheet.swift
+++ b/Flipcash/Core/Screens/Conversation/StartChattingSheet.swift
@@ -33,11 +33,15 @@ struct StartChattingSheet: View {
     /// opened for once the send lands and the floor no longer applies.
     let fee: FiatAmount
 
+    /// Called once the payment lands, before the sheet's success hold and dismissal.
+    var didSucceed: () -> Void = {}
+
     var body: some View {
         StartChattingSheetContent(
             sessionContainer: sessionContainer,
             target: target,
-            fee: fee
+            fee: fee,
+            onSuccess: didSucceed
         )
     }
 }
@@ -51,15 +55,18 @@ private struct StartChattingSheetContent: View {
     @State private var didSucceed: Bool = false
 
     private let fee: FiatAmount
+    private let onSuccess: () -> Void
 
     // MARK: - Init -
 
     init(
         sessionContainer: SessionContainer,
         target: SendTarget,
-        fee: FiatAmount
+        fee: FiatAmount,
+        onSuccess: @escaping () -> Void
     ) {
         self.fee = fee
+        self.onSuccess = onSuccess
         _viewModel = State(initialValue: SendAmountViewModel(
             sessionContainer: sessionContainer,
             target: target
@@ -108,6 +115,7 @@ private struct StartChattingSheetContent: View {
                     switch await viewModel.submit(entered: amount.value) {
                     case .success:
                         didSucceed = true
+                        onSuccess()
                     case .recipientNotFound:
                         dismiss()
                         throw StartChattingDismissed()
diff --git a/Flipcash/Core/Screens/Profile/ChatMuteStatusLabel.swift b/Flipcash/Core/Screens/Profile/ChatMuteStatusLabel.swift
index 240d5e337..2893a134c 100644
--- a/Flipcash/Core/Screens/Profile/ChatMuteStatusLabel.swift
+++ b/Flipcash/Core/Screens/Profile/ChatMuteStatusLabel.swift
@@ -103,10 +103,6 @@ struct ChatMuteStatusLabel: View {
     }
 
     private func chipLabel(_ string: String) -> some View {
-        HStack(spacing: 4) {
-            Image(systemName: "bell.slash")
-            Text(string)
-        }
-        .chip(.tinted(.warning, on: .warningSecondary))
+        ProfileStatusChip(systemImage: "bell.slash", text: string, tint: .warning, fill: .warningSecondary)
     }
 }
diff --git a/Flipcash/Core/Screens/Profile/ProfileMenuItems.swift b/Flipcash/Core/Screens/Profile/ProfileMenuItems.swift
new file mode 100644
index 000000000..0bc421a3c
--- /dev/null
+++ b/Flipcash/Core/Screens/Profile/ProfileMenuItems.swift
@@ -0,0 +1,53 @@
+//
+//  ProfileMenuItems.swift
+//  Flipcash
+//
+
+nonisolated enum ProfileMenuItem: Equatable {
+    case mute
+    case unmute
+    case report
+    case block
+    case unblock
+
+    var title: String {
+        switch self {
+        case .mute:    return "Mute"
+        case .unmute:  return "Unmute"
+        case .report:  return "Report"
+        case .block:   return "Block"
+        case .unblock: return "Unblock"
+        }
+    }
+
+    var systemImage: String {
+        switch self {
+        case .mute:    return "bell.slash"
+        case .unmute:  return "bell"
+        case .report:  return "flag"
+        case .block:   return "nosign"
+        case .unblock: return "checkmark.circle"
+        }
+    }
+
+    /// Whether the entry is drawn as a destructive action. Unblock restores something, so it isn't.
+    var isDestructive: Bool {
+        switch self {
+        case .report, .block:                 return true
+        case .mute, .unmute, .unblock:        return false
+        }
+    }
+}
+
+/// The entries of another user's overflow menu.
+nonisolated enum ProfileMenuItems {
+
+    /// Mute and Unmute need a DM to silence and are hidden while blocked, since the DM is hidden too.
+    static func resolve(isBlocked: Bool, hasDM: Bool, isMuted: Bool) -> [ProfileMenuItem] {
+        if isBlocked { return [.report, .unblock] }
+        var items: [ProfileMenuItem] = []
+        if hasDM { items.append(isMuted ? .unmute : .mute) }
+        items.append(contentsOf: [.report, .block])
+        return items
+    }
+}
diff --git a/Flipcash/Core/Screens/Profile/ProfilePinnedAction.swift b/Flipcash/Core/Screens/Profile/ProfilePinnedAction.swift
new file mode 100644
index 000000000..452a34a66
--- /dev/null
+++ b/Flipcash/Core/Screens/Profile/ProfilePinnedAction.swift
@@ -0,0 +1,38 @@
+//
+//  ProfilePinnedAction.swift
+//  Flipcash
+//
+
+import FlipcashCore
+
+/// The one button pinned under another user's profile, decided from who the viewer is looking at.
+nonisolated enum ProfilePinnedAction: Equatable {
+    case none
+    case unblock
+    case openChat(ConversationID)
+    /// Pays `FiatAmount` to open the chat.
+    case startChatting(FiatAmount)
+    /// The fee isn't known yet, so the tap opens the amount screen instead of the confirmation sheet.
+    case startChattingUnpriced
+
+    /// Blocked beats everything but the viewer's own profile: a blocked person's DM is hidden, and
+    /// opening or starting a chat with them would undo the block.
+    static func resolve(isSelf: Bool, isBlocked: Bool, dmID: ConversationID?, fee: FiatAmount?) -> ProfilePinnedAction {
+        if isSelf { return .none }
+        if isBlocked { return .unblock }
+        if let dmID { return .openChat(dmID) }
+        if let fee { return .startChatting(fee) }
+        return .startChattingUnpriced
+    }
+
+    /// The button's label, or nil when nothing is pinned.
+    var title: String? {
+        switch self {
+        case .none:                  return nil
+        case .unblock:               return "Unblock"
+        case .openChat:              return "Open Chat"
+        case .startChatting(let fee): return "Send \(fee.formatted()) to Start Chatting"
+        case .startChattingUnpriced: return "Start Chatting"
+        }
+    }
+}
diff --git a/Flipcash/Core/Screens/Profile/ProfileStatusChip.swift b/Flipcash/Core/Screens/Profile/ProfileStatusChip.swift
new file mode 100644
index 000000000..0ead93e56
--- /dev/null
+++ b/Flipcash/Core/Screens/Profile/ProfileStatusChip.swift
@@ -0,0 +1,24 @@
+//
+//  ProfileStatusChip.swift
+//  Flipcash
+//
+
+import SwiftUI
+import FlipcashUI
+
+/// A tinted capsule stating one setting of the viewer's over a profile, such as muted or blocked.
+struct ProfileStatusChip: View {
+
+    let systemImage: String
+    let text: String
+    let tint: Color
+    let fill: Color
+
+    var body: some View {
+        HStack(spacing: 4) {
+            Image(systemName: systemImage)
+            Text(text)
+        }
+        .chip(.tinted(tint, on: fill))
+    }
+}
diff --git a/Flipcash/Core/Screens/Profile/UserProfileScreen.swift b/Flipcash/Core/Screens/Profile/UserProfileScreen.swift
index 907dbd597..64001e347 100644
--- a/Flipcash/Core/Screens/Profile/UserProfileScreen.swift
+++ b/Flipcash/Core/Screens/Profile/UserProfileScreen.swift
@@ -9,12 +9,11 @@ import SwiftUI
 import FlipcashCore
 import FlipcashUI
 
-/// The counterpart's Flipcash profile, carrying the actions the viewer has over the person rather
-/// than over one chat: muting the DM with them, and blocking them outright.
+/// Another user's Flipcash profile: the shared header and stats, a ⋯ menu carrying the actions the
+/// viewer has over the person, and one pinned button that starts, opens, or restores the chat.
 ///
 /// Reached from a tip DM's title, from a face in a group transcript, and from a person link. All land
-/// here because all are the same question — who is this — so Block works on the person either way. The mute row
-/// silences the DM with them, so it shows only when the profile was opened from that DM.
+/// here because all are the same question — who is this — so Block works on the person either way.
 struct UserProfileScreen: View {
     let userID: UserID
     let origin: UserProfileOrigin
@@ -26,15 +25,6 @@ struct UserProfileScreen: View {
     var body: some View {
         let seed = sessionContainer.conversationController.counterpartSeed(forUserID: userID)
         UserProfileContent(
-            // Nil until a tip creates the chat server-side, and re-read on every pass, so a DM that
-            // appears while the screen is open brings its mute row with it.
-            conversationID: origin.showsMute
-                ? sessionContainer.conversationController.tipDM(withUserID: userID)?.id
-                : nil,
-            showsChatActions: origin.showsChatActions(
-                profileUserID: userID,
-                selfUserID: sessionContainer.conversationController.selfUserID
-            ),
             model: UserProfileViewModel(
                 userID: userID,
                 flipClient: sessionContainer.flipClient,
@@ -52,154 +42,261 @@ struct UserProfileScreen: View {
 }
 
 private struct UserProfileContent: View {
-    /// The DM to mute, or nil when there is no chat with this person yet or the profile wasn't
-    /// opened from it.
-    let conversationID: ConversationID?
-    /// Whether to offer Message and Send Cash — see ``UserProfileOrigin/showsChatActions(profileUserID:selfUserID:)``.
-    let showsChatActions: Bool
 
     @Environment(AppRouter.self) private var router
+    @Environment(SessionContainer.self) private var sessionContainer
     @Environment(RatesController.self) private var ratesController
     @Environment(ConversationController.self) private var conversationController
+    @Environment(BlocklistController.self) private var blocklistController
 
     @State private var model: UserProfileViewModel
     @State private var dialogItem: DialogItem?
-
-    init(conversationID: ConversationID?, showsChatActions: Bool, model: UserProfileViewModel) {
-        self.conversationID = conversationID
-        self.showsChatActions = showsChatActions
+    @State private var isPickingMuteDuration = false
+    @State private var isReporting = false
+    @State private var startChattingRequest: StartChattingRequest?
+    /// Set when the payment lands; promoted to `awaitingChat` once the sheet has dismissed.
+    @State private var didPayToStartChatting = false
+    /// True from the sheet's dismissal until the chat's record arrives over the feed, so the push
+    /// happens once and only for a chat this screen just paid for.
+    @State private var awaitingChat = false
+
+    init(model: UserProfileViewModel) {
         _model = State(initialValue: model)
     }
 
+    /// What the start-chatting sheet is opened for, snapshotted at the tap.
+    private struct StartChattingRequest: Identifiable {
+        let target: SendTarget
+        let fee: FiatAmount
+
+        var id: SendTarget { target }
+    }
+
+    // MARK: - Derived state -
+
+    private var session: Session { sessionContainer.session }
+
+    private var isSelf: Bool { model.userID == session.userID }
+
+    private var isBlocked: Bool { blocklistController.isBlocked(model.userID) }
+
+    private var dmID: ConversationID? { conversationController.tipDMID(withUserID: model.userID) }
+
+    private var fee: FiatAmount? {
+        let currency = ratesController.balanceCurrency
+        return StartChattingFee.amount(
+            recipientFee: model.minDmChatInitFee,
+            presets: session.userFlags?.tipPresets(for: currency),
+            currency: currency,
+            rates: ratesController.cachedRates
+        )
+    }
+
+    private var pinnedAction: ProfilePinnedAction {
+        ProfilePinnedAction.resolve(isSelf: isSelf, isBlocked: isBlocked, dmID: dmID, fee: fee)
+    }
+
+    private var isMuted: Bool {
+        guard let dmID else { return false }
+        return conversationController.conversation(withID: dmID)?.isMuted() ?? false
+    }
+
+    private var menuItems: [ProfileMenuItem] {
+        guard !isSelf else { return [] }
+        return ProfileMenuItems.resolve(isBlocked: isBlocked, hasDM: dmID != nil, isMuted: isMuted)
+    }
+
+    private var sendTarget: SendTarget {
+        .tip(TipRecipient(userID: model.userID, displayName: model.displayName, username: model.username, origin: .tipcard))
+    }
+
+    // MARK: - Body -
+
     var body: some View {
         Background(color: .backgroundMain) {
-            VStack(spacing: 16) {
-                ContactAvatarView(
-                    id: model.userID.uuidString,
-                    displayName: model.displayName,
-                    imageData: model.imageData,
-                    blurhash: model.blurhash,
-                    size: 88
-                )
-                .padding(.top, 40)
-
-                VStack(spacing: 0) {
-                    // The handle and join date read as a block under the name, so
-                    // they group tighter than the screen's other spacing (node
-                    // 9443:8928).
-                    VStack(spacing: 5) {
-                        Text(model.displayName)
-                            .font(.appDisplaySmall)
-                            .foregroundStyle(.textMain)
-
-                        if let handle = model.handle {
-                            Text(handle)
-                                .font(.appTextSmall)
-                                .foregroundStyle(.textSecondary)
-                        }
+            ScrollView {
+                VStack(spacing: 16) {
+                    ProfileHeaderView(
+                        userID: model.userID,
+                        displayName: model.displayName,
+                        handle: model.handle,
+                        bio: model.bio,
+                        avatarData: model.imageData,
+                        avatarBlurhash: model.blurhash,
+                        coverPicture: model.coverPicture,
+                        customization: model.customization,
+                        statusChip: statusChip,
+                        bannerActions: { EmptyView() },
+                        underHandle: { EmptyView() }
+                    )
+
+                    ProfileStatsCard(minimumToChat: fee, joinedAt: model.joinedAt)
+                }
+                .padding(.horizontal, 20)
+            }
+        }
+        .safeAreaInset(edge: .bottom) {
+            pinnedButton
+        }
+        .navigationTitle("")
+        .toolbarTitleDisplayMode(.inline)
+        .toolbar { toolbarContent }
+        .dialog(item: $dialogItem)
+        .sheet(isPresented: $isPickingMuteDuration) {
+            if let dmID {
+                MuteChatSheet(conversationID: dmID, isPresented: $isPickingMuteDuration)
+            }
+        }
+        .fullScreenCover(isPresented: $isReporting) {
+            NavigationStack {
+                ReportFlowScreen(target: .user(model.userID))
+            }
+        }
+        .sheet(item: $startChattingRequest, onDismiss: {
+            guard didPayToStartChatting else { return }
+            didPayToStartChatting = false
+            awaitingChat = true
+        }) { request in
+            StartChattingSheet(target: request.target, fee: request.fee) {
+                didPayToStartChatting = true
+            }
+        }
+        .onChange(of: dmID) { _, id in
+            guard awaitingChat, let id else { return }
+            awaitingChat = false
+            router.push(.tipConversation(id))
+        }
+        // The record normally lands within a moment; past this the profile stays put and its
+        // button has already flipped to Open Chat.
+        .task(id: awaitingChat) {
+            guard awaitingChat else { return }
+            try? await Task.sleep(for: .seconds(10))
+            guard !Task.isCancelled else { return }
+            awaitingChat = false
+        }
+        .task { await model.loadProfile() }
+    }
 
-                        if let joined = model.joinedText {
-                            Text(joined)
-                                .font(.appTextSmall)
-                                .foregroundStyle(.textSecondary)
-                        }
-                    }
+    // MARK: - Header chip -
 
-                    // Centered between the join date and the first row's text, 25pt each side;
-                    // the row's own top inset supplies the lower 25.
-                    HStack(spacing: 0) {
-                        if showsChatActions {
-                            ProfileActionButton(title: "Message") {
-                                Image(systemName: "bubble.left.fill")
-                                    .font(.appTextLarge)
-                            } action: {
-                                router.push(.tipConversationForUser(model.userID))
-                            }
-                            .accessibilityIdentifier("profile-message")
-
-                            // Hidden for now; the destination and `startSendCash` stay wired, so
-                            // bringing it back is uncommenting this.
-                            // ProfileActionButton(title: "Send Cash") {
-                            //     // The chat's collapsed Send Cash style, so € and ¥ read the same here.
-                            //     Text(ratesController.balanceCurrency.compactSymbol)
-                            //         .font(.appTextXL)
-                            // } action: {
-                            //     router.push(.tipConversationForUserSendingCash(model.userID))
-                            // }
-                            // .accessibilityIdentifier("profile-send-cash")
-                        }
+    private var statusChip: AnyView? {
+        if isBlocked {
+            return AnyView(
+                ProfileStatusChip(systemImage: "nosign", text: "Blocked", tint: .warning, fill: .warningSecondary)
+                    .accessibilityIdentifier("profile-blocked-badge")
+            )
+        }
+        if let dmID {
+            return AnyView(ChatMuteStatusLabel(conversationID: dmID))
+        }
+        return nil
+    }
 
-                        ProfileActionButton(title: "Share") {
-                            Image.asset(.shareOS)
-                                .renderingMode(.template)
-                                .resizable()
-                                .scaledToFit()
-                                .frame(width: 20, height: 20)
-                        } action: {
-                            model.share()
-                        }
-                        .accessibilityIdentifier("profile-share")
-                    }
-                    .padding(.top, 25)
+    // MARK: - Toolbar -
 
-                    // Under the actions rather than the name, so the actions sit at the same height on
-                    // every profile; only a DM's profile, the one with a mute, holds the chip's line.
-                    if let conversationID {
-                        ChatMuteStatusLabel(conversationID: conversationID)
-                            .padding(.top, 16)
-                    }
+    @ToolbarContentBuilder
+    private var toolbarContent: some ToolbarContent {
+        ToolbarItem(placement: .topBarTrailing) {
+            Button {
+                model.share()
+            } label: {
+                Image.asset(.shareOS)
+                    .renderingMode(.template)
+            }
+            .accessibilityIdentifier("profile-share")
+        }
 
-                    VStack(spacing: 0) {
-                        // Mute, then report, then block: the reversible and routine first, then the
-                        // one that asks someone else to look, then the one that ends the relationship.
-                        // Same shape as a group's profile, where leaving holds the last place.
-                        if let conversationID {
-                            ChatMuteRow(conversationID: conversationID, insets: rowInsets)
+        if !menuItems.isEmpty {
+            ToolbarItem(placement: .topBarTrailing) {
+                Menu {
+                    ForEach(menuItems, id: \.title) { item in
+                        Button(role: item.isDestructive ? .destructive : nil) {
+                            perform(item)
+                        } label: {
+                            Label(item.title, systemImage: item.systemImage)
                         }
+                    }
+                } label: {
+                    Image.system(.ellipsis)
+                }
+                .accessibilityIdentifier("profile-overflow")
+            }
+        }
+    }
 
-                        ReportRow(target: .user(model.userID), insets: rowInsets)
+    private func perform(_ item: ProfileMenuItem) {
+        switch item {
+        case .mute:
+            isPickingMuteDuration = true
+        case .unmute:
+            guard let dmID else { return }
+            Task {
+                do {
+                    try await conversationController.unmute(conversationID: dmID)
+                } catch {
+                    ErrorReporting.captureError(error, reason: "Failed to unmute chat from profile")
+                }
+            }
+        case .report:
+            isReporting = true
+        case .block:
+            dialogItem = blockDialog()
+        case .unblock:
+            Task { await model.unblock() }
+        }
+    }
 
-                        Row(insets: rowInsets) {
-                            Image(systemName: "nosign")
-                                .frame(minWidth: 45)
-                            Text("Block")
-                                .foregroundStyle(.textMain)
-                            Spacer()
-                        } action: {
-                            dialogItem = blockDialog()
-                        }
-                        .accessibilityIdentifier("chat-block")
-                    }
-                    .font(.appDisplayXS)
+    // MARK: - Pinned action -
+
+    @ViewBuilder
+    private var pinnedButton: some View {
+        if let title = pinnedAction.title {
+            VStack(spacing: 8) {
+                Button(title) {
+                    tapPinned()
                 }
+                .buttonStyle(.filled)
+                .accessibilityIdentifier("profile-pinned-action")
 
-                Spacer()
+                if showsE2eeFooter {
+                    E2eeFooter(kind: .dm)
+                }
             }
             .padding(.horizontal, 20)
+            .padding(.bottom, 8)
+        } else if showsE2eeFooter {
+            E2eeFooter(kind: .dm)
         }
-        .safeAreaInset(edge: .bottom) {
-            if showsE2eeFooter {
-                E2eeFooter(kind: .dm)
+    }
+
+    private func tapPinned() {
+        switch pinnedAction {
+        case .none:
+            break
+        case .unblock:
+            Task { await model.unblock() }
+        case .openChat(let id):
+            router.push(.tipConversation(id))
+        case .startChattingUnpriced:
+            router.presentSendAmount(sendTarget)
+        case .startChatting(let fee):
+            let rate = ratesController.rateForBalanceCurrency()
+            if let dialog = giveCashGate(session: session, rate: rate).blockingDialog(router: router, addMoneySource: .chat, context: .sendTips) {
+                session.dialogItem = dialog
+                return
             }
+            startChattingRequest = StartChattingRequest(target: sendTarget, fee: fee)
         }
-        .navigationTitle("")
-        .toolbarTitleDisplayMode(.inline)
-        .dialog(item: $dialogItem)
-        .task { await model.loadProfile() }
     }
 
     /// Only a DM that will actually be encrypted claims to be — see ``E2eePolicy``.
     private var showsE2eeFooter: Bool {
-        guard let conversationID, let conversation = conversationController.conversation(withID: conversationID) else {
+        guard let dmID, let conversation = conversationController.conversation(withID: dmID) else {
             return false
         }
         return E2eePolicy.shouldEncrypt(conversation)
     }
 
-    private var rowInsets: EdgeInsets {
-        .init(top: 25, leading: 0, bottom: 25, trailing: 0)
-    }
-
     private func blockDialog() -> DialogItem {
         .alert(
             title: "Block \(model.displayName)?",
@@ -224,25 +321,6 @@ nonisolated enum UserProfileOrigin: Hashable {
     /// A `flipcash.com/<handle>` or `flipcash.com/<userId>` link opened into the app.
     case deeplink
 
-    /// Whether the profile offers Message and Send Cash: not from the DM they would lead back
-    /// into, and never on the viewer's own profile.
-    func showsChatActions(profileUserID: UserID, selfUserID: UserID) -> Bool {
-        guard profileUserID != selfUserID else { return false }
-        switch self {
-        case .directMessage:                    return false
-        case .groupMember, .mention, .deeplink: return true
-        }
-    }
-
-    /// Whether the profile offers muting the DM with this person: only from that DM, since from a
-    /// group the row would read as muting the group.
-    var showsMute: Bool {
-        switch self {
-        case .directMessage:                    return true
-        case .groupMember, .mention, .deeplink: return false
-        }
-    }
-
     /// Whether the profile was fetched and cached just before the screen opened, so the screen
     /// reads the cache instead of fetching again. A link is looked up before it navigates.
     var arrivesFetched: Bool {
@@ -273,7 +351,11 @@ final class UserProfileViewModel {
 
     private(set) var username: Username?
     private(set) var blurhash: String?
-    private(set) var joinedText: String?
+    private(set) var bio: String?
+    private(set) var coverPicture: ProfilePicture?
+    private(set) var customization: TipCardCustomization?
+    private(set) var joinedAt: Date?
+    private(set) var minDmChatInitFee: FiatAmount?
 
     /// What to call this person: their name when they have one, their handle
     /// when they don't. A handle is public and stable, so it beats the generic
@@ -342,9 +424,11 @@ final class UserProfileViewModel {
         if let name = profile.displayName, !name.isEmpty { self.name = name }
         if let username = profile.username { self.username = username }
         if blurhash == nil { blurhash = profile.profilePicture?.thumbnailBlurhash }
-        if let joined = profile.joinedLine {
-            joinedText = joined
-        }
+        bio = profile.bio
+        coverPicture = profile.coverPicture
+        customization = profile.tipCardCustomization
+        if let joinedAt = profile.joinedAt { self.joinedAt = joinedAt }
+        minDmChatInitFee = profile.minDmChatInitFee
     }
 
     /// Opens the share sheet on this person's public link, the one their own You tab shares.
@@ -353,6 +437,16 @@ final class UserProfileViewModel {
         ShareSheet.present(activityItem: item) { _ in }
     }
 
+    /// Lifts the block; the badge and pinned button follow the blocklist. A failure says so.
+    func unblock() async {
+        do {
+            try await blocklistController.unblock(userID: userID)
+        } catch {
+            session.dialogItem = .error(title: "Something Went Wrong", subtitle: "We were unable to unblock the user. Please try again")
+            ErrorReporting.captureError(error, reason: "Failed to unblock user")
+        }
+    }
+
     /// Blocks the user and closes the profile — see ``UserProfileOrigin/blockReturnsToOpener``. The
     /// blocklist reconcile hides the conversation.
     func block() async {
diff --git a/FlipcashTests/Chat/MentionDestinationTests.swift b/FlipcashTests/Chat/MentionDestinationTests.swift
index c1bda37a4..3958f7278 100644
--- a/FlipcashTests/Chat/MentionDestinationTests.swift
+++ b/FlipcashTests/Chat/MentionDestinationTests.swift
@@ -59,9 +59,4 @@ import FlipcashCore
     @Test func aFailedLookupIsNotReadAsUnclaimed() {
         #expect(MentionDestination.destination(for: .failure(Offline()), counterpart: nil) == .lookupFailed)
     }
-
-    @Test func aMentionOffersChatActionsButNotMute() {
-        #expect(UserProfileOrigin.mention.showsChatActions(profileUserID: Self.otherID, selfUserID: Self.counterpartID))
-        #expect(!UserProfileOrigin.mention.showsMute)
-    }
 }
diff --git a/FlipcashTests/ProfileMenuItemsTests.swift b/FlipcashTests/ProfileMenuItemsTests.swift
new file mode 100644
index 000000000..944e32b80
--- /dev/null
+++ b/FlipcashTests/ProfileMenuItemsTests.swift
@@ -0,0 +1,41 @@
+//
+//  ProfileMenuItemsTests.swift
+//  FlipcashTests
+//
+
+import Testing
+@testable import Flipcash
+
+@MainActor
+@Suite("ProfileMenuItems")
+struct ProfileMenuItemsTests {
+
+    @Test("A DM that is audible offers Mute, Report and Block")
+    func dm_unmuted() {
+        #expect(ProfileMenuItems.resolve(isBlocked: false, hasDM: true, isMuted: false) == [.mute, .report, .block])
+    }
+
+    @Test("A muted DM offers Unmute in Mute's place")
+    func dm_muted() {
+        #expect(ProfileMenuItems.resolve(isBlocked: false, hasDM: true, isMuted: true) == [.unmute, .report, .block])
+    }
+
+    @Test("Without a DM there is nothing to mute")
+    func noDM() {
+        #expect(ProfileMenuItems.resolve(isBlocked: false, hasDM: false, isMuted: false) == [.report, .block])
+    }
+
+    @Test("A blocked profile offers Report and Unblock, with no Mute", arguments: [true, false])
+    func blocked(hasDM: Bool) {
+        #expect(ProfileMenuItems.resolve(isBlocked: true, hasDM: hasDM, isMuted: false) == [.report, .unblock])
+    }
+
+    @Test("Report, Block and Unblock are destructive; Unblock and the mutes are not")
+    func destructive() {
+        #expect(ProfileMenuItem.report.isDestructive)
+        #expect(ProfileMenuItem.block.isDestructive)
+        #expect(!ProfileMenuItem.unblock.isDestructive)
+        #expect(!ProfileMenuItem.mute.isDestructive)
+        #expect(!ProfileMenuItem.unmute.isDestructive)
+    }
+}
diff --git a/FlipcashTests/ProfilePinnedActionTests.swift b/FlipcashTests/ProfilePinnedActionTests.swift
new file mode 100644
index 000000000..e80725b71
--- /dev/null
+++ b/FlipcashTests/ProfilePinnedActionTests.swift
@@ -0,0 +1,55 @@
+//
+//  ProfilePinnedActionTests.swift
+//  FlipcashTests
+//
+
+import Foundation
+import Testing
+import FlipcashCore
+@testable import Flipcash
+
+@MainActor
+@Suite("ProfilePinnedAction")
+struct ProfilePinnedActionTests {
+
+    private let fee = FiatAmount(value: Decimal(string: "0.50")!, currency: .usd)
+    private let dmID = ConversationID(data: Data(repeating: 7, count: 32))
+
+    @Test("The viewer's own profile pins nothing")
+    func isSelf_none() {
+        #expect(ProfilePinnedAction.resolve(isSelf: true, isBlocked: false, dmID: dmID, fee: fee) == .none)
+    }
+
+    @Test("A blocked profile pins Unblock whether or not a DM exists", arguments: [true, false])
+    func blocked_unblock(hasDM: Bool) {
+        let action = ProfilePinnedAction.resolve(isSelf: false, isBlocked: true, dmID: hasDM ? dmID : nil, fee: fee)
+        #expect(action == .unblock)
+    }
+
+    @Test("An existing DM pins Open Chat")
+    func dm_openChat() {
+        let action = ProfilePinnedAction.resolve(isSelf: false, isBlocked: false, dmID: dmID, fee: fee)
+        #expect(action == .openChat(dmID))
+    }
+
+    @Test("No DM and a fee pins the priced start")
+    func noDM_fee_startChatting() {
+        let action = ProfilePinnedAction.resolve(isSelf: false, isBlocked: false, dmID: nil, fee: fee)
+        #expect(action == .startChatting(fee))
+    }
+
+    @Test("No DM and no fee pins the unpriced start")
+    func noDM_noFee_unpriced() {
+        let action = ProfilePinnedAction.resolve(isSelf: false, isBlocked: false, dmID: nil, fee: nil)
+        #expect(action == .startChattingUnpriced)
+    }
+
+    @Test("Labels")
+    func labels() {
+        #expect(ProfilePinnedAction.startChatting(fee).title == "Send \(fee.formatted()) to Start Chatting")
+        #expect(ProfilePinnedAction.startChattingUnpriced.title == "Start Chatting")
+        #expect(ProfilePinnedAction.openChat(dmID).title == "Open Chat")
+        #expect(ProfilePinnedAction.unblock.title == "Unblock")
+        #expect(ProfilePinnedAction.none.title == nil)
+    }
+}
diff --git a/FlipcashTests/UserProfileChatActionsTests.swift b/FlipcashTests/UserProfileChatActionsTests.swift
index 2f82fa4d3..52f4c4a23 100644
--- a/FlipcashTests/UserProfileChatActionsTests.swift
+++ b/FlipcashTests/UserProfileChatActionsTests.swift
@@ -8,45 +8,11 @@ import Testing
 import FlipcashCore
 @testable import Flipcash
 
-/// A person's profile offers Message and Send Cash into the DM with them, except where that would
-/// lead back to where the viewer came from or point at themselves.
+/// How a person's profile behaves by the surface it was opened from.
 @MainActor
 @Suite("User profile chat actions")
 struct UserProfileChatActionsTests {
 
-    // MARK: - Visibility -
-
-    @Test("A group member's profile offers the chat actions")
-    func groupMember_showsChatActions() {
-        #expect(UserProfileOrigin.groupMember.showsChatActions(profileUserID: UUID(), selfUserID: UUID()))
-    }
-
-    @Test("A profile opened from the DM with that person hides the chat actions")
-    func directMessage_hidesChatActions() {
-        #expect(!UserProfileOrigin.directMessage.showsChatActions(profileUserID: UUID(), selfUserID: UUID()))
-    }
-
-    @Test(
-        "The viewer's own profile hides the chat actions from either origin",
-        arguments: [UserProfileOrigin.groupMember, .directMessage, .mention, .deeplink]
-    )
-    func ownProfile_hidesChatActions(_ origin: UserProfileOrigin) {
-        let me = UUID()
-        #expect(!origin.showsChatActions(profileUserID: me, selfUserID: me))
-    }
-
-    @Test("A profile opened from a person link offers the chat actions but not mute")
-    func deeplink_showsChatActionsButNotMute() {
-        #expect(UserProfileOrigin.deeplink.showsChatActions(profileUserID: UUID(), selfUserID: UUID()))
-        #expect(!UserProfileOrigin.deeplink.showsMute)
-    }
-
-    @Test("Only a profile opened from the DM offers muting it")
-    func mute_showsOnlyFromDirectMessage() {
-        #expect(UserProfileOrigin.directMessage.showsMute)
-        #expect(!UserProfileOrigin.groupMember.showsMute)
-    }
-
     @Test("Blocking from a link-opened profile returns to where the link was followed")
     func deeplink_blockReturnsToOpener() {
         #expect(UserProfileOrigin.deeplink.blockReturnsToOpener)
diff --git a/FlipcashUITests/Smoke/BlockUnblockSmokeTests.swift b/FlipcashUITests/Smoke/BlockUnblockSmokeTests.swift
index c4ecac6c1..8395481fb 100644
--- a/FlipcashUITests/Smoke/BlockUnblockSmokeTests.swift
+++ b/FlipcashUITests/Smoke/BlockUnblockSmokeTests.swift
@@ -77,7 +77,8 @@ final class BlockUnblockSmokeTests: BaseUITestCase {
         titleButton.tap()
 
         // MARK: Block from the profile screen.
-        waitAndTap(app.buttons["Block"], timeout: 30, "Expected the Block row on the profile screen")
+        waitAndTap(app.buttons["profile-overflow"], timeout: 30, "Expected the overflow menu on the profile screen")
+        waitAndTap(app.buttons["Block"], timeout: 10, "Expected Block in the profile's overflow menu")
         let blockDialog = app.otherElements
             .matching(NSPredicate(format: "identifier BEGINSWITH %@", "Block "))
             .firstMatch

From 338c5a592f768788d40eed2f8c35efdfdffdb313 Mon Sep 17 00:00:00 2001
From: Brandon McAnsh <git@bmcreations.dev>
Date: Tue, 6 Oct 2026 08:58:28 -0400
Subject: [PATCH 06/45] fix(profile): open chat reliably after paying and align
 overflow actions

Push the new chat when the DM record lands before the start-chatting sheet
dismisses, and only when the profile is still in front. Open Chat from a DM
returns to it instead of pushing a copy. Unmute from the menu reports errors
and analytics like the mute sheet, Start Chatting runs the give-cash gate in
both branches, and the toolbar buttons get accessibility labels.
---
 Flipcash/Core/Navigation/AppRouter.swift      | 13 +++
 .../Screens/Profile/PostPaymentChat.swift     | 48 +++++++++++
 .../Screens/Profile/ProfileMenuItems.swift    |  3 +
 .../Screens/Profile/UserProfileScreen.swift   | 86 ++++++++++++++-----
 FlipcashTests/PostPaymentChatTests.swift      | 76 ++++++++++++++++
 FlipcashTests/ProfileMenuItemsTests.swift     |  2 +-
 .../UserProfileChatActionsTests.swift         |  8 ++
 7 files changed, 212 insertions(+), 24 deletions(-)
 create mode 100644 Flipcash/Core/Screens/Profile/PostPaymentChat.swift
 create mode 100644 FlipcashTests/PostPaymentChatTests.swift

diff --git a/Flipcash/Core/Navigation/AppRouter.swift b/Flipcash/Core/Navigation/AppRouter.swift
index 1941c09bf..7fd7ac122 100644
--- a/Flipcash/Core/Navigation/AppRouter.swift
+++ b/Flipcash/Core/Navigation/AppRouter.swift
@@ -267,6 +267,19 @@ final class AppRouter {
         return StackPosition(stack: stack, depth: max(self[stack].count - 1, 0))
     }
 
+    /// The topmost stack and how many destinations it holds — the position of the screen on top of it.
+    /// `nil` when there is no topmost stack.
+    func positionOfTopmost() -> StackPosition? {
+        guard let stack = topmostStack else { return nil }
+        return StackPosition(stack: stack, depth: self[stack].count)
+    }
+
+    /// Whether `position` is still the topmost stack's top, so nothing has been pushed over it and no
+    /// other tab or sheet is in front.
+    func isTopmost(_ position: StackPosition) -> Bool {
+        positionOfTopmost() == position
+    }
+
     /// Pops `position.stack` back down to `position.depth`, leaving whatever sat beneath intact.
     func popTo(_ position: StackPosition) {
         popLast(self[position.stack].count - position.depth, on: position.stack)
diff --git a/Flipcash/Core/Screens/Profile/PostPaymentChat.swift b/Flipcash/Core/Screens/Profile/PostPaymentChat.swift
new file mode 100644
index 000000000..e3f1f9263
--- /dev/null
+++ b/Flipcash/Core/Screens/Profile/PostPaymentChat.swift
@@ -0,0 +1,48 @@
+//
+//  PostPaymentChat.swift
+//  Flipcash
+//
+
+import FlipcashCore
+
+/// Tracks the hand-off from paying to start a chat to opening that chat, which spans the sheet's
+/// dismissal and the DM record arriving over the feed in either order.
+nonisolated struct PostPaymentChat: Equatable {
+
+    /// Set when the payment lands, consumed by the sheet's dismissal.
+    private(set) var didPay = false
+
+    /// True from the sheet's dismissal until the DM's record arrives, so the push happens once and
+    /// only for a chat this screen just paid for.
+    private(set) var isAwaitingChat = false
+
+    /// Records that the payment succeeded.
+    mutating func paymentSucceeded() {
+        didPay = true
+    }
+
+    /// Consumes the success flag and returns the chat to push now, or `nil` when the record hasn't
+    /// landed yet (the push waits for it) or the screen is no longer in front (the push is dropped).
+    mutating func sheetDismissed(dmID: ConversationID?, isScreenInFront: Bool) -> ConversationID? {
+        guard didPay else { return nil }
+        didPay = false
+        guard isScreenInFront else { return nil }
+        guard let dmID else {
+            isAwaitingChat = true
+            return nil
+        }
+        return dmID
+    }
+
+    /// Returns the chat to push when its record arrives while one is awaited.
+    mutating func dmArrived(_ dmID: ConversationID?, isScreenInFront: Bool) -> ConversationID? {
+        guard isAwaitingChat, let dmID else { return nil }
+        isAwaitingChat = false
+        return isScreenInFront ? dmID : nil
+    }
+
+    /// Stops waiting for a record that never came.
+    mutating func gaveUp() {
+        isAwaitingChat = false
+    }
+}
diff --git a/Flipcash/Core/Screens/Profile/ProfileMenuItems.swift b/Flipcash/Core/Screens/Profile/ProfileMenuItems.swift
index 0bc421a3c..490fb0430 100644
--- a/Flipcash/Core/Screens/Profile/ProfileMenuItems.swift
+++ b/Flipcash/Core/Screens/Profile/ProfileMenuItems.swift
@@ -3,6 +3,7 @@
 //  Flipcash
 //
 
+/// An entry in another user's overflow menu.
 nonisolated enum ProfileMenuItem: Equatable {
     case mute
     case unmute
@@ -10,6 +11,7 @@ nonisolated enum ProfileMenuItem: Equatable {
     case block
     case unblock
 
+    /// The entry's label.
     var title: String {
         switch self {
         case .mute:    return "Mute"
@@ -20,6 +22,7 @@ nonisolated enum ProfileMenuItem: Equatable {
         }
     }
 
+    /// The SF Symbol drawn beside the label.
     var systemImage: String {
         switch self {
         case .mute:    return "bell.slash"
diff --git a/Flipcash/Core/Screens/Profile/UserProfileScreen.swift b/Flipcash/Core/Screens/Profile/UserProfileScreen.swift
index 64001e347..d2ac09caf 100644
--- a/Flipcash/Core/Screens/Profile/UserProfileScreen.swift
+++ b/Flipcash/Core/Screens/Profile/UserProfileScreen.swift
@@ -25,6 +25,7 @@ struct UserProfileScreen: View {
     var body: some View {
         let seed = sessionContainer.conversationController.counterpartSeed(forUserID: userID)
         UserProfileContent(
+            origin: origin,
             model: UserProfileViewModel(
                 userID: userID,
                 flipClient: sessionContainer.flipClient,
@@ -49,18 +50,19 @@ private struct UserProfileContent: View {
     @Environment(ConversationController.self) private var conversationController
     @Environment(BlocklistController.self) private var blocklistController
 
+    let origin: UserProfileOrigin
+
     @State private var model: UserProfileViewModel
     @State private var dialogItem: DialogItem?
     @State private var isPickingMuteDuration = false
     @State private var isReporting = false
     @State private var startChattingRequest: StartChattingRequest?
-    /// Set when the payment lands; promoted to `awaitingChat` once the sheet has dismissed.
-    @State private var didPayToStartChatting = false
-    /// True from the sheet's dismissal until the chat's record arrives over the feed, so the push
-    /// happens once and only for a chat this screen just paid for.
-    @State private var awaitingChat = false
+    @State private var postPayment = PostPaymentChat()
+    /// Where this screen sits in its stack, recorded when it first appears.
+    @State private var position: AppRouter.StackPosition?
 
-    init(model: UserProfileViewModel) {
+    init(origin: UserProfileOrigin, model: UserProfileViewModel) {
+        self.origin = origin
         _model = State(initialValue: model)
     }
 
@@ -106,6 +108,12 @@ private struct UserProfileContent: View {
         return ProfileMenuItems.resolve(isBlocked: isBlocked, hasDM: dmID != nil, isMuted: isMuted)
     }
 
+    /// Whether this profile is the visible top of its stack, with its tab or sheet active.
+    private var isScreenInFront: Bool {
+        guard let position else { return false }
+        return router.isTopmost(position)
+    }
+
     private var sendTarget: SendTarget {
         .tip(TipRecipient(userID: model.userID, displayName: model.displayName, username: model.username, origin: .tipcard))
     }
@@ -153,26 +161,29 @@ private struct UserProfileContent: View {
             }
         }
         .sheet(item: $startChattingRequest, onDismiss: {
-            guard didPayToStartChatting else { return }
-            didPayToStartChatting = false
-            awaitingChat = true
+            if let id = postPayment.sheetDismissed(dmID: dmID, isScreenInFront: isScreenInFront) {
+                router.push(.tipConversation(id))
+            }
         }) { request in
             StartChattingSheet(target: request.target, fee: request.fee) {
-                didPayToStartChatting = true
+                postPayment.paymentSucceeded()
             }
         }
         .onChange(of: dmID) { _, id in
-            guard awaitingChat, let id else { return }
-            awaitingChat = false
-            router.push(.tipConversation(id))
+            if let id = postPayment.dmArrived(id, isScreenInFront: isScreenInFront) {
+                router.push(.tipConversation(id))
+            }
         }
         // The record normally lands within a moment; past this the profile stays put and its
         // button has already flipped to Open Chat.
-        .task(id: awaitingChat) {
-            guard awaitingChat else { return }
+        .task(id: postPayment.isAwaitingChat) {
+            guard postPayment.isAwaitingChat else { return }
             try? await Task.sleep(for: .seconds(10))
             guard !Task.isCancelled else { return }
-            awaitingChat = false
+            postPayment.gaveUp()
+        }
+        .onAppear {
+            if position == nil { position = router.positionOfTopmost() }
         }
         .task { await model.loadProfile() }
     }
@@ -203,6 +214,7 @@ private struct UserProfileContent: View {
                 Image.asset(.shareOS)
                     .renderingMode(.template)
             }
+            .accessibilityLabel("Share profile")
             .accessibilityIdentifier("profile-share")
         }
 
@@ -219,6 +231,7 @@ private struct UserProfileContent: View {
                 } label: {
                     Image.system(.ellipsis)
                 }
+                .accessibilityLabel("More")
                 .accessibilityIdentifier("profile-overflow")
             }
         }
@@ -230,11 +243,18 @@ private struct UserProfileContent: View {
             isPickingMuteDuration = true
         case .unmute:
             guard let dmID else { return }
+            let chatType = conversationController.conversation(withID: dmID)?.type
             Task {
                 do {
                     try await conversationController.unmute(conversationID: dmID)
+                    Analytics.chatUnmuted(chatType: chatType, error: nil)
                 } catch {
-                    ErrorReporting.captureError(error, reason: "Failed to unmute chat from profile")
+                    Analytics.chatUnmuted(chatType: chatType, error: error)
+                    session.dialogItem = .error(
+                        title: "Something Went Wrong",
+                        subtitle: "We were unable to unmute this chat. Please try again"
+                    )
+                    ErrorReporting.captureError(error, reason: "Failed to unmute chat")
                 }
             }
         case .report:
@@ -276,19 +296,30 @@ private struct UserProfileContent: View {
         case .unblock:
             Task { await model.unblock() }
         case .openChat(let id):
-            router.push(.tipConversation(id))
+            if origin.returnsToExistingDM {
+                router.popTopmost()
+            } else {
+                router.push(.tipConversation(id))
+            }
         case .startChattingUnpriced:
+            guard passesGiveCashGate() else { return }
             router.presentSendAmount(sendTarget)
         case .startChatting(let fee):
-            let rate = ratesController.rateForBalanceCurrency()
-            if let dialog = giveCashGate(session: session, rate: rate).blockingDialog(router: router, addMoneySource: .chat, context: .sendTips) {
-                session.dialogItem = dialog
-                return
-            }
+            guard passesGiveCashGate() else { return }
             startChattingRequest = StartChattingRequest(target: sendTarget, fee: fee)
         }
     }
 
+    /// Shows the blocking dialog and returns false when the viewer can't pay yet.
+    private func passesGiveCashGate() -> Bool {
+        let rate = ratesController.rateForBalanceCurrency()
+        guard let dialog = giveCashGate(session: session, rate: rate).blockingDialog(router: router, addMoneySource: .chat, context: .sendTips) else {
+            return true
+        }
+        session.dialogItem = dialog
+        return false
+    }
+
     /// Only a DM that will actually be encrypted claims to be — see ``E2eePolicy``.
     private var showsE2eeFooter: Bool {
         guard let dmID, let conversation = conversationController.conversation(withID: dmID) else {
@@ -321,6 +352,15 @@ nonisolated enum UserProfileOrigin: Hashable {
     /// A `flipcash.com/<handle>` or `flipcash.com/<userId>` link opened into the app.
     case deeplink
 
+    /// Whether Open Chat returns to the DM the profile was opened from rather than pushing a
+    /// second copy of it.
+    var returnsToExistingDM: Bool {
+        switch self {
+        case .directMessage:                          return true
+        case .groupMember, .mention, .deeplink:       return false
+        }
+    }
+
     /// Whether the profile was fetched and cached just before the screen opened, so the screen
     /// reads the cache instead of fetching again. A link is looked up before it navigates.
     var arrivesFetched: Bool {
diff --git a/FlipcashTests/PostPaymentChatTests.swift b/FlipcashTests/PostPaymentChatTests.swift
new file mode 100644
index 000000000..7f76fd87e
--- /dev/null
+++ b/FlipcashTests/PostPaymentChatTests.swift
@@ -0,0 +1,76 @@
+//
+//  PostPaymentChatTests.swift
+//  FlipcashTests
+//
+
+import Foundation
+import Testing
+import FlipcashCore
+@testable import Flipcash
+
+@MainActor
+@Suite("PostPaymentChat")
+struct PostPaymentChatTests {
+
+    private let dmID = ConversationID(data: Data(repeating: 7, count: 32))
+
+    @Test("A record that landed before the sheet dismissed is pushed at dismissal")
+    func recordFirst_pushesAtDismissal() {
+        var state = PostPaymentChat()
+        state.paymentSucceeded()
+        #expect(state.sheetDismissed(dmID: dmID, isScreenInFront: true) == dmID)
+        #expect(!state.isAwaitingChat)
+    }
+
+    @Test("A record that lands after dismissal is pushed on arrival, once")
+    func dismissalFirst_pushesOnArrival() {
+        var state = PostPaymentChat()
+        state.paymentSucceeded()
+        #expect(state.sheetDismissed(dmID: nil, isScreenInFront: true) == nil)
+        #expect(state.isAwaitingChat)
+        #expect(state.dmArrived(dmID, isScreenInFront: true) == dmID)
+        #expect(state.dmArrived(dmID, isScreenInFront: true) == nil)
+    }
+
+    @Test("Dismissing without a payment pushes nothing and waits for nothing")
+    func noPayment_nothing() {
+        var state = PostPaymentChat()
+        #expect(state.sheetDismissed(dmID: dmID, isScreenInFront: true) == nil)
+        #expect(!state.isAwaitingChat)
+    }
+
+    @Test("A late success after an early dismissal doesn't leak into the next dismissal")
+    func lateSuccess_doesNotLeak() {
+        var state = PostPaymentChat()
+        #expect(state.sheetDismissed(dmID: nil, isScreenInFront: true) == nil)
+        state.paymentSucceeded()
+        #expect(state.sheetDismissed(dmID: dmID, isScreenInFront: true) == dmID)
+        #expect(state.sheetDismissed(dmID: dmID, isScreenInFront: true) == nil)
+    }
+
+    @Test("A screen no longer in front drops the push at dismissal")
+    func notInFront_atDismissal_drops() {
+        var state = PostPaymentChat()
+        state.paymentSucceeded()
+        #expect(state.sheetDismissed(dmID: dmID, isScreenInFront: false) == nil)
+        #expect(!state.isAwaitingChat)
+    }
+
+    @Test("A screen no longer in front drops the push on arrival")
+    func notInFront_onArrival_drops() {
+        var state = PostPaymentChat()
+        state.paymentSucceeded()
+        _ = state.sheetDismissed(dmID: nil, isScreenInFront: true)
+        #expect(state.dmArrived(dmID, isScreenInFront: false) == nil)
+        #expect(!state.isAwaitingChat)
+    }
+
+    @Test("Giving up stops the wait")
+    func gaveUp_stopsWaiting() {
+        var state = PostPaymentChat()
+        state.paymentSucceeded()
+        _ = state.sheetDismissed(dmID: nil, isScreenInFront: true)
+        state.gaveUp()
+        #expect(state.dmArrived(dmID, isScreenInFront: true) == nil)
+    }
+}
diff --git a/FlipcashTests/ProfileMenuItemsTests.swift b/FlipcashTests/ProfileMenuItemsTests.swift
index 944e32b80..e36ab099a 100644
--- a/FlipcashTests/ProfileMenuItemsTests.swift
+++ b/FlipcashTests/ProfileMenuItemsTests.swift
@@ -30,7 +30,7 @@ struct ProfileMenuItemsTests {
         #expect(ProfileMenuItems.resolve(isBlocked: true, hasDM: hasDM, isMuted: false) == [.report, .unblock])
     }
 
-    @Test("Report, Block and Unblock are destructive; Unblock and the mutes are not")
+    @Test("Report and Block are destructive; Unblock and the mutes are not")
     func destructive() {
         #expect(ProfileMenuItem.report.isDestructive)
         #expect(ProfileMenuItem.block.isDestructive)
diff --git a/FlipcashTests/UserProfileChatActionsTests.swift b/FlipcashTests/UserProfileChatActionsTests.swift
index 52f4c4a23..b0c52c384 100644
--- a/FlipcashTests/UserProfileChatActionsTests.swift
+++ b/FlipcashTests/UserProfileChatActionsTests.swift
@@ -34,6 +34,14 @@ struct UserProfileChatActionsTests {
         #expect(!UserProfileOrigin.mention.arrivesFetched)
     }
 
+    @Test("Open Chat returns to the DM only when the profile was opened from that DM")
+    func openChat_returnsToDMOnlyFromDirectMessage() {
+        #expect(UserProfileOrigin.directMessage.returnsToExistingDM)
+        #expect(!UserProfileOrigin.groupMember.returnsToExistingDM)
+        #expect(!UserProfileOrigin.mention.returnsToExistingDM)
+        #expect(!UserProfileOrigin.deeplink.returnsToExistingDM)
+    }
+
     // MARK: - Destinations -
 
     @Test("The origin is part of the profile destination's identity but not its log keys")

From 8cea0f055f375e65a0188016498e63b1119c09df Mon Sep 17 00:00:00 2001
From: Brandon McAnsh <git@bmcreations.dev>
Date: Tue, 6 Oct 2026 09:22:54 -0400
Subject: [PATCH 07/45] fix(profile): match the Figma layout for both profiles

The profile screens had the right controls in a centred, inset-card
layout that didn't follow the design. Follow nodes 10961:314 and
10990:494 instead: a full-bleed 214pt banner (flat #323234 when there is
no cover), a left-aligned 84pt avatar overlapping it, Edit Profile and
Share in the avatar row, left-aligned name, handle and bio, and a
two-column stats card with labels above values.

Share opens a sheet with Share Profile, Show Profile Card and Copy Link
in place of the menu. The other-user profile draws its back and overflow
buttons over the banner with no navigation bar, and the pinned button is
white over a fade. The Finish Your Profile card and the card-colour
cover fallback are gone, with their tests.
---
 .../Screens/Main/You/ProfileTutorial.swift    |  92 -----------
 .../Core/Screens/Main/You/YouScreen.swift     | 153 ++++++++----------
 .../Screens/Profile/ProfileCoverBanner.swift  |  46 +++---
 .../Screens/Profile/ProfileCoverFill.swift    |  20 ---
 .../Screens/Profile/ProfileHeaderView.swift   | 138 +++++++++++-----
 .../Screens/Profile/ProfileShareSheet.swift   | 106 ++++++++++++
 .../Screens/Profile/ProfileStatsCard.swift    |  29 ++--
 .../Screens/Profile/UserProfileScreen.swift   | 119 +++++++++++---
 FlipcashTests/ProfileCoverFillTests.swift     |  34 ----
 FlipcashTests/ProfileTutorialStateTests.swift |  68 --------
 .../Sources/FlipcashUI/Theme/Colors.swift     |   2 +
 11 files changed, 412 insertions(+), 395 deletions(-)
 delete mode 100644 Flipcash/Core/Screens/Main/You/ProfileTutorial.swift
 delete mode 100644 Flipcash/Core/Screens/Profile/ProfileCoverFill.swift
 create mode 100644 Flipcash/Core/Screens/Profile/ProfileShareSheet.swift
 delete mode 100644 FlipcashTests/ProfileCoverFillTests.swift
 delete mode 100644 FlipcashTests/ProfileTutorialStateTests.swift

diff --git a/Flipcash/Core/Screens/Main/You/ProfileTutorial.swift b/Flipcash/Core/Screens/Main/You/ProfileTutorial.swift
deleted file mode 100644
index 513eb13d4..000000000
--- a/Flipcash/Core/Screens/Main/You/ProfileTutorial.swift
+++ /dev/null
@@ -1,92 +0,0 @@
-//
-//  ProfileTutorial.swift
-//  Flipcash
-//
-
-import SwiftUI
-import FlipcashCore
-import FlipcashUI
-
-/// A chore in the You tab's "Finish Your Profile" checklist (Figma node
-/// 9544:18140).
-nonisolated enum ProfileTutorialItem: TutorialItemPresentable {
-    case displayName(isCompleted: Bool)
-    case profilePicture(isCompleted: Bool)
-    case minimumTipAmount(isCompleted: Bool)
-
-    var id: String { title }
-
-    var isCompleted: Bool {
-        switch self {
-        case .displayName(let done), .profilePicture(let done), .minimumTipAmount(let done): return done
-        }
-    }
-
-    var title: String {
-        switch self {
-        case .displayName:      return "Add your display name"
-        case .profilePicture:   return "Add a profile picture"
-        case .minimumTipAmount: return "Set your minimum to chat"
-        }
-    }
-
-    var subtitle: String {
-        switch self {
-        case .displayName:      return "Choose the name people see in chat"
-        case .profilePicture:   return "Select a photo from your gallery"
-        case .minimumTipAmount: return "Decide what someone must send to start chatting"
-        }
-    }
-
-    @MainActor var icon: Image {
-        switch self {
-        case .displayName:      return .asset(.pencil)
-        case .profilePicture:   return .asset(.peopleCircle)
-        case .minimumTipAmount: return .asset(.coins)
-        }
-    }
-}
-
-/// Whether the You tab draws the profile checklist, and with which chores
-/// checked off.
-///
-/// Every chore is read straight off the profile rather than from a local
-/// dismissal flag, so a name, picture or fee that disappears across a profile
-/// refresh puts the card back on its own.
-struct ProfileTutorialState: Equatable {
-
-    /// Withholds the card until a profile has loaded, so a session that has not
-    /// fetched one yet does not flash an all-incomplete checklist.
-    let hasProfile: Bool
-    let hasDisplayName: Bool
-    let hasProfilePicture: Bool
-    let hasMinimumTipAmount: Bool
-
-    init(hasProfile: Bool, hasDisplayName: Bool, hasProfilePicture: Bool, hasMinimumTipAmount: Bool) {
-        self.hasProfile = hasProfile
-        self.hasDisplayName = hasDisplayName
-        self.hasProfilePicture = hasProfilePicture
-        self.hasMinimumTipAmount = hasMinimumTipAmount
-    }
-
-    init(profile: Profile?) {
-        self.init(
-            hasProfile: profile != nil,
-            hasDisplayName: profile?.displayName?.isEmpty == false,
-            hasProfilePicture: profile?.profilePicture != nil,
-            hasMinimumTipAmount: profile?.minDmChatInitFee != nil
-        )
-    }
-
-    var items: [ProfileTutorialItem] {
-        [
-            .displayName(isCompleted: hasDisplayName),
-            .profilePicture(isCompleted: hasProfilePicture),
-            .minimumTipAmount(isCompleted: hasMinimumTipAmount),
-        ]
-    }
-
-    var isComplete: Bool { hasDisplayName && hasProfilePicture && hasMinimumTipAmount }
-
-    var isVisible: Bool { hasProfile && !isComplete }
-}
diff --git a/Flipcash/Core/Screens/Main/You/YouScreen.swift b/Flipcash/Core/Screens/Main/You/YouScreen.swift
index 5ebc56671..88a9568d4 100644
--- a/Flipcash/Core/Screens/Main/You/YouScreen.swift
+++ b/Flipcash/Core/Screens/Main/You/YouScreen.swift
@@ -9,11 +9,12 @@ import FlipcashCore
 import FlipcashUI
 
 /// The "You" tab: the user's own profile — cover, avatar, name, handle and bio — with the stats
-/// card, an Edit Profile button, and the finish-your-profile checklist.
+/// card.
 ///
-/// The banner carries two controls: Share, whose menu shares the profile link or presents the
-/// tip card full screen (`ProfileCardScreen`), and the gear that pushes Settings. Settings pushes
-/// onto the tab's `.you` stack, so it never touches the v1 scanner's Settings sheet.
+/// The banner carries the "You" title and the gear that pushes Settings; the action row beside the
+/// avatar carries Edit Profile and Share, whose sheet shares the profile link, presents the tip card
+/// full screen (`ProfileCardScreen`), or copies the link. Settings pushes onto the tab's `.you`
+/// stack, so it never touches the v1 scanner's Settings sheet.
 ///
 /// A profile with no display name has no card: the page then shows the add-your-name invitation
 /// in place of the name block and drops Share, but still renders — the gear is this account's only
@@ -23,6 +24,7 @@ struct YouScreen: View {
     @Environment(SessionContainer.self) private var sessionContainer
     @Environment(AppRouter.self) private var router
     @Environment(RatesController.self) private var ratesController
+    @Environment(ToastController.self) private var toasts
 
     /// Warms the share-sheet preview image ahead of the share tap so it never
     /// lands on the tap; keyed by user.
@@ -31,18 +33,12 @@ struct YouScreen: View {
     /// The balance gate, raised when the claim row is tapped below the minimum.
     @State private var usernameDialog: DialogItem?
 
-    /// The top safe-area inset, which sizes the hand-drawn top fade.
-    @State private var safeAreaTop: CGFloat = 0
-
-    /// The page's horizontal inset.
-    private static let horizontalInset: CGFloat = 20
+    @State private var isShowingShare = false
+    @State private var shareChoice: ProfileShareChoice?
 
     /// The gap the page keeps between its last row and the tab bar.
     private static let tabBarGap: CGFloat = 24
 
-    /// How far below the safe area the top fade runs out. Matches `WalletScreen`.
-    private static let topFadeLength: CGFloat = 20
-
     /// Bottom inset for the scrolling content. Mirrors `WalletScreen`: the iOS 26
     /// tab bar sits in the safe area, so the gap is the whole inset there; the
     /// legacy pill floats over the content and has to be cleared on top of it,
@@ -59,11 +55,11 @@ struct YouScreen: View {
             ScrollView(showsIndicators: false) {
                 VStack(spacing: 0) {
                     header
-                        .padding(.top, 8)
 
                     if displayName == nil {
                         setupPrompt
                             .padding(.top, 24)
+                            .padding(.horizontal, ProfileHeaderView<EmptyView, EmptyView, EmptyView>.inset)
                     } else {
                         ProfileStatsCard(
                             minimumToChat: StartChattingFee.amount(
@@ -73,47 +69,15 @@ struct YouScreen: View {
                             ),
                             joinedAt: profile?.joinedAt
                         )
-                        .padding(.top, 24)
-
-                        // The Edit Profile slice repoints this to `.editProfile`.
-                        Button("Edit Profile") {
-                            router.push(.settings)
-                        }
-                        .buttonStyle(.filled05)
-                        .padding(.top, 12)
-                        .accessibilityIdentifier("you-edit-profile")
-                    }
-
-                    if profileTutorialState.isVisible {
-                        TutorialChecklistCard(
-                            title: "Finish Your Profile",
-                            items: profileTutorialState.items,
-                            onTap: handleProfileTutorialTap
-                        )
-                        .padding(.top, 32)
-                        .accessibilityIdentifier("you-profile-tutorial-card")
+                        .padding(.top, 19)
                     }
                 }
-                .padding(.horizontal, Self.horizontalInset)
                 .padding(.bottom, bottomContentInset)
             }
-            // The app-wide soft edge effect is drawn from a bar's own
-            // background, and this tab has no navigation bar at all, so it
-            // covers the bottom (tab bar) but not the top — what scrolls up
-            // into the status bar has to be faded by hand. Same treatment as
-            // `WalletScreen`, the app's other bar-less tab.
-            .overlay(alignment: .top) {
-                LinearGradient(
-                    colors: [Color.backgroundMain, Color.backgroundMain.opacity(0)],
-                    startPoint: .top,
-                    endPoint: .bottom
-                )
-                .frame(height: safeAreaTop + Self.topFadeLength)
-                .ignoresSafeArea(edges: .top)
-                .allowsHitTesting(false)
-            }
-            .onGeometryChange(for: CGFloat.self) { $0.safeAreaInsets.top } action: { safeAreaTop = $0 }
+            // The banner runs under the status bar.
+            .ignoresSafeArea(edges: .top)
         }
+        .toolbar(.hidden, for: .navigationBar)
         .fullScreenCover(isPresented: Bindable(router).isShowingProfileCard) {
             ProfileCardScreen(previewCache: previewCache)
         }
@@ -131,6 +95,9 @@ struct YouScreen: View {
             if isShowing { router.isShowingProfileCard = false }
         }
         .dialog(item: $usernameDialog)
+        .sheet(isPresented: $isShowingShare, onDismiss: handleShareChoice) {
+            ProfileShareSheet(subtitle: shareSubtitle, offersCard: true) { shareChoice = $0 }
+        }
     }
 
     // MARK: - Header -
@@ -144,23 +111,37 @@ struct YouScreen: View {
             avatarData: sessionContainer.profileAvatars.data(for: sessionContainer.session.userID),
             avatarBlurhash: profilePicture?.thumbnailBlurhash,
             coverPicture: profile?.coverPicture,
-            customization: profile?.tipCardCustomization,
             statusChip: nil,
-            bannerActions: {
-                HStack(spacing: 8) {
-                    if displayName != nil {
-                        shareMenu
-                    }
+            bannerControls: {
+                HStack {
+                    Text("You")
+                        .font(.default(size: 23, weight: .semibold))
+                        .foregroundStyle(Color.textMain)
+                    Spacer()
                     settingsGear
                 }
+                .padding(.leading, ProfileHeaderView<EmptyView, EmptyView, EmptyView>.inset)
+                .padding(.trailing, 12)
+                .padding(.top, 65)
+            },
+            rowActions: {
+                ProfileEditCapsule {
+                    // The Edit Profile slice repoints this to `.editProfile`.
+                    router.push(.settings)
+                }
+                .accessibilityIdentifier("you-edit-profile")
+
+                if displayName != nil {
+                    shareButton
+                }
             },
             underHandle: {
                 if shouldPromptForUsername {
                     Button(action: claimUsername) {
                         Text("Claim your username ›")
-                            .font(.appTextSmall)
+                            .font(.default(size: 14, weight: .medium))
                             .foregroundStyle(Color.textMain)
-                            .padding(.vertical, 4)
+                            .frame(minHeight: 22)
                     }
                     .buttonStyle(.plain)
                     .accessibilityIdentifier("you-claim-username")
@@ -169,13 +150,13 @@ struct YouScreen: View {
         )
     }
 
-    private var shareMenu: some View {
-        Menu {
-            Button("Share Profile", action: shareTipCard)
-            Button("Show Profile Card") { router.isShowingProfileCard = true }
+    private var shareButton: some View {
+        Button {
+            isShowingShare = true
         } label: {
-            bannerControl(systemName: "square.and.arrow.up")
+            ProfileActionCircle(image: Image.asset(.shareOS))
         }
+        .buttonStyle(.plain)
         .accessibilityLabel("Share")
         .accessibilityIdentifier("you-share")
     }
@@ -184,23 +165,17 @@ struct YouScreen: View {
         Button {
             router.push(.settings)
         } label: {
-            bannerControl(systemName: "gearshape")
+            Image(systemName: "gearshape")
+                .font(.system(size: 22))
+                .foregroundStyle(Color.textMain)
+                .frame(width: 44, height: 44)
+                .contentShape(Rectangle())
         }
         .buttonStyle(.plain)
         .accessibilityLabel("Settings")
         .accessibilityIdentifier("you-settings")
     }
 
-    /// A glyph on a dark disc, legible over any cover picture.
-    private func bannerControl(systemName: String) -> some View {
-        Image(systemName: systemName)
-            .font(.system(size: 16))
-            .foregroundStyle(Color.white)
-            .frame(width: 36, height: 36)
-            .background(Color.black.opacity(0.4), in: Circle())
-            .contentShape(Circle())
-    }
-
     // MARK: - No name -
 
     /// Stands in for the name block until the profile has a display name: the card the
@@ -298,7 +273,6 @@ struct YouScreen: View {
 
     private var profile: Profile? { sessionContainer.session.profile }
     private var profilePicture: ProfilePicture? { profile?.profilePicture }
-    private var profileTutorialState: ProfileTutorialState { .init(profile: profile) }
 
     private var displayName: String? {
         guard let name = profile?.displayName, !name.isEmpty else { return nil }
@@ -322,6 +296,11 @@ struct YouScreen: View {
         TipCode.Payload(userID: sessionContainer.session.userID).codeData()
     }
 
+    private var shareSubtitle: String? {
+        guard let displayName else { return nil }
+        return [displayName, username?.handle].compactMap { $0 }.joined(separator: " · ")
+    }
+
     private var url: URL { .tipcard(for: sessionContainer.session.userID, username: username) }
 
     // MARK: - Actions -
@@ -335,6 +314,21 @@ struct YouScreen: View {
         ShareSheet.present(activityItem: item) { _ in }
     }
 
+    private func handleShareChoice() {
+        defer { shareChoice = nil }
+        switch shareChoice {
+        case .share:    shareTipCard()
+        case .showCard: router.isShowingProfileCard = true
+        case .copyLink: copyLink()
+        case nil:       break
+        }
+    }
+
+    private func copyLink() {
+        UIPasteboard.general.string = url.absoluteString
+        toasts.show(.init("Copied", systemImage: "checkmark.circle.fill", duration: .seconds(2)))
+    }
+
     /// Opens the claim screen once the balance clears the minimum, and the
     /// balance gate until then.
     private func claimUsername() {
@@ -346,17 +340,6 @@ struct YouScreen: View {
         }
     }
 
-    private func handleProfileTutorialTap(_ item: ProfileTutorialItem) {
-        switch item {
-        case .displayName:
-            router.push(.changeDisplayName)
-        case .profilePicture:
-            router.push(.changeProfilePicture)
-        case .minimumTipAmount:
-            router.push(.setMinimumTip(isSetupStep: true))
-        }
-    }
-
     /// Names the minimum and offers the way to meet it. The row draws no
     /// shortfall, so the dialog is where the squatting rule gets stated.
     private func presentBalanceGate(minimum: FiatAmount) {
diff --git a/Flipcash/Core/Screens/Profile/ProfileCoverBanner.swift b/Flipcash/Core/Screens/Profile/ProfileCoverBanner.swift
index 9fe5ec8e1..37ed844b8 100644
--- a/Flipcash/Core/Screens/Profile/ProfileCoverBanner.swift
+++ b/Flipcash/Core/Screens/Profile/ProfileCoverBanner.swift
@@ -7,33 +7,34 @@ import SwiftUI
 import FlipcashCore
 import FlipcashUI
 
-/// A profile's 3:1 cover: the picture once it has loaded, the blurhash while it does, and the
-/// profile-card colour when there is no picture.
-struct ProfileCoverBanner<Actions: View>: View {
+/// A profile's full-bleed cover: the picture once it has loaded, the blurhash while it does, and a
+/// flat gray when there is no picture.
+///
+/// Sized from the top of the screen, so the caller lets it run under the status bar.
+struct ProfileCoverBanner<Controls: View>: View {
 
     @Environment(SessionContainer.self) private var sessionContainer
 
     let userID: UserID
     let coverPicture: ProfilePicture?
-    let customization: TipCardCustomization?
-    @ViewBuilder let actions: () -> Actions
+    @ViewBuilder let controls: () -> Controls
 
-    private static var aspectRatio: CGFloat { 3 }
+    static var height: CGFloat { 214 }
 
     var body: some View {
         Color.clear
-            .aspectRatio(Self.aspectRatio, contentMode: .fit)
+            .frame(height: Self.height)
+            .frame(maxWidth: .infinity)
             .overlay { cover }
-            .overlay(alignment: .topTrailing) {
-                actions()
-                    .padding(8)
+            .clipped()
+            .overlay(alignment: .top) {
+                controls()
             }
-            .clipShape(RoundedRectangle(cornerRadius: 16, style: .continuous))
             .task(id: coverPicture?.blobID) {
                 await sessionContainer.profileAvatars.load(.cover(userID), picture: coverPicture)
             }
-            // `.contain` keeps the Share and Settings buttons as their own elements; a bare
-            // identifier here would overwrite theirs.
+            // `.contain` keeps the banner's controls as their own elements; a bare identifier
+            // here would overwrite theirs.
             .accessibilityElement(children: .contain)
             .accessibilityIdentifier("profile-cover")
     }
@@ -43,18 +44,21 @@ struct ProfileCoverBanner<Actions: View>: View {
         if let coverPicture {
             let data = sessionContainer.profileAvatars.data(for: .cover(userID))
             if let data, let image = ContactAvatarCache.shared.image(forKey: "cover-\(coverPicture.blobID)", data: data) {
-                Image(uiImage: image)
-                    .resizable()
-                    .scaledToFill()
+                shaded(image)
             } else if let preview = BlurHashCache.shared.image(for: coverPicture.thumbnailBlurhash) {
-                Image(uiImage: preview)
-                    .resizable()
-                    .scaledToFill()
+                shaded(preview)
             } else {
-                ProfileCoverFill.color(for: customization)
+                Color.coverPlaceholder
             }
         } else {
-            ProfileCoverFill.color(for: customization)
+            Color.coverPlaceholder
         }
     }
+
+    private func shaded(_ image: UIImage) -> some View {
+        Image(uiImage: image)
+            .resizable()
+            .scaledToFill()
+            .overlay { Color.black.opacity(0.16) }
+    }
 }
diff --git a/Flipcash/Core/Screens/Profile/ProfileCoverFill.swift b/Flipcash/Core/Screens/Profile/ProfileCoverFill.swift
deleted file mode 100644
index baf76140b..000000000
--- a/Flipcash/Core/Screens/Profile/ProfileCoverFill.swift
+++ /dev/null
@@ -1,20 +0,0 @@
-//
-//  ProfileCoverFill.swift
-//  Flipcash
-//
-
-import SwiftUI
-import FlipcashCore
-import FlipcashUI
-
-/// The solid colour a cover banner shows when the profile has no cover picture.
-enum ProfileCoverFill {
-
-    /// The card tone used when a profile carries no colour, or one that doesn't parse.
-    static let fallback = Color.backgroundRow
-
-    /// The customization's colour, or ``fallback`` when it is absent or not a `#RRGGBB` hex.
-    static func color(for customization: TipCardCustomization?) -> Color {
-        customization.flatMap { Color(hex: $0.colorHex) } ?? fallback
-    }
-}
diff --git a/Flipcash/Core/Screens/Profile/ProfileHeaderView.swift b/Flipcash/Core/Screens/Profile/ProfileHeaderView.swift
index 50cc54705..92e886184 100644
--- a/Flipcash/Core/Screens/Profile/ProfileHeaderView.swift
+++ b/Flipcash/Core/Screens/Profile/ProfileHeaderView.swift
@@ -7,10 +7,12 @@ import SwiftUI
 import FlipcashCore
 import FlipcashUI
 
-/// A profile's top block: cover, avatar overlapping it, name, handle and bio.
+/// A profile's top block: a full-bleed cover, the avatar overlapping it, an action row, then name,
+/// handle and bio, all left-aligned on a 24pt inset.
 ///
-/// A nil `displayName` leaves the name block out, for a profile that has not named itself yet.
-struct ProfileHeaderView<BannerActions: View, UnderHandle: View>: View {
+/// The caller lets the view run under the status bar. A nil `displayName` leaves the name block out,
+/// for a profile that has not named itself yet.
+struct ProfileHeaderView<BannerControls: View, RowActions: View, UnderHandle: View>: View {
 
     let userID: UserID
     let displayName: String?
@@ -19,65 +21,123 @@ struct ProfileHeaderView<BannerActions: View, UnderHandle: View>: View {
     let avatarData: Data?
     let avatarBlurhash: String?
     let coverPicture: ProfilePicture?
-    let customization: TipCardCustomization?
     let statusChip: AnyView?
-    @ViewBuilder let bannerActions: () -> BannerActions
+    @ViewBuilder let bannerControls: () -> BannerControls
+    @ViewBuilder let rowActions: () -> RowActions
     @ViewBuilder let underHandle: () -> UnderHandle
 
-    private static var avatarSize: CGFloat { 88 }
+    static var inset: CGFloat { 24 }
+
+    private static var avatarSize: CGFloat { 84 }
+    /// How far the avatar rises over the banner.
+    private static var avatarOverlap: CGFloat { 42 }
 
     var body: some View {
-        VStack(spacing: 0) {
+        VStack(alignment: .leading, spacing: 0) {
             ProfileCoverBanner(
                 userID: userID,
                 coverPicture: coverPicture,
-                customization: customization,
-                actions: bannerActions
+                controls: bannerControls
             )
 
-            ContactAvatarView(
-                id: userID.uuidString,
-                displayName: displayName ?? "",
-                imageData: avatarData,
-                blurhash: avatarBlurhash,
-                size: Self.avatarSize
-            )
-            .overlay { Circle().strokeBorder(Color.backgroundMain, lineWidth: 4) }
-            .padding(.top, -Self.avatarSize / 2)
+            HStack(alignment: .top, spacing: 0) {
+                ContactAvatarView(
+                    id: userID.uuidString,
+                    displayName: displayName ?? "",
+                    imageData: avatarData,
+                    blurhash: avatarBlurhash,
+                    size: Self.avatarSize
+                )
+                .overlay { Circle().strokeBorder(Color.backgroundMain, lineWidth: 5) }
+                .padding(.top, -Self.avatarOverlap)
+
+                Spacer(minLength: 8)
+
+                HStack(spacing: 14) {
+                    rowActions()
+                }
+                .padding(.top, 20)
+            }
+            .padding(.horizontal, Self.inset)
 
             if let displayName {
-                VStack(spacing: 4) {
-                    Text(displayName)
-                        .font(.appDisplaySmall)
-                        .foregroundStyle(Color.textMain)
-                        .multilineTextAlignment(.center)
-                        .accessibilityIdentifier("profile-name")
+                VStack(alignment: .leading, spacing: 0) {
+                    HStack(spacing: 8) {
+                        Text(displayName)
+                            .font(.default(size: 28, weight: .bold))
+                            .tracking(-0.6)
+                            .lineSpacing(1)
+                            .frame(minHeight: 35)
+                            .foregroundStyle(Color.textMain)
+                            .accessibilityIdentifier("profile-name")
+
+                        if let statusChip {
+                            statusChip
+                                .fixedSize()
+                        }
+                    }
 
                     if let handle {
                         Text(handle)
-                            .font(.appTextMedium)
+                            .font(.default(size: 14, weight: .regular))
+                            .frame(minHeight: 22)
                             .foregroundStyle(Color.textSecondary)
                             .accessibilityIdentifier("profile-handle")
                     }
 
                     underHandle()
-                }
-                .padding(.top, 12)
-
-                if let statusChip {
-                    statusChip
-                        .padding(.top, 8)
-                }
 
-                if let bio, !bio.isEmpty {
-                    Text(bio)
-                        .font(.appTextSmall)
-                        .foregroundStyle(Color.textMain)
-                        .multilineTextAlignment(.center)
-                        .padding(.top, 12)
-                        .accessibilityIdentifier("profile-bio")
+                    if let bio, !bio.isEmpty {
+                        Text(bio)
+                            .font(.default(size: 15, weight: .regular))
+                            .lineSpacing(4)
+                            .foregroundStyle(Color.textMain)
+                            .multilineTextAlignment(.leading)
+                            .frame(maxWidth: .infinity, alignment: .leading)
+                            .padding(.top, 14)
+                            .accessibilityIdentifier("profile-bio")
+                    }
                 }
+                .padding(.top, 7)
+                .padding(.horizontal, Self.inset)
             }
         }
     }
 }
+
+/// A 38pt disc in the header's action row, filled at the row-surface tint.
+struct ProfileActionCircle: View {
+
+    let image: Image
+
+    var body: some View {
+        image
+            .renderingMode(.template)
+            .resizable()
+            .scaledToFit()
+            .frame(width: 22, height: 22)
+            .foregroundStyle(Color.textMain)
+            .frame(width: 38, height: 38)
+            .background(Color.rowSeparator, in: Circle())
+            .contentShape(Circle())
+    }
+}
+
+/// The header's "Edit Profile" capsule.
+struct ProfileEditCapsule: View {
+
+    let action: () -> Void
+
+    var body: some View {
+        Button(action: action) {
+            Text("Edit Profile")
+                .font(.default(size: 12, weight: .semibold))
+                .foregroundStyle(Color.textMain)
+                .padding(.horizontal, 18)
+                .frame(height: 38)
+                .background(Color.rowSeparator, in: RoundedRectangle(cornerRadius: 22, style: .continuous))
+                .contentShape(Rectangle())
+        }
+        .buttonStyle(.plain)
+    }
+}
diff --git a/Flipcash/Core/Screens/Profile/ProfileShareSheet.swift b/Flipcash/Core/Screens/Profile/ProfileShareSheet.swift
new file mode 100644
index 000000000..f99a409af
--- /dev/null
+++ b/Flipcash/Core/Screens/Profile/ProfileShareSheet.swift
@@ -0,0 +1,106 @@
+//
+//  ProfileShareSheet.swift
+//  Flipcash
+//
+
+import SwiftUI
+import FlipcashUI
+
+/// What a row of ``ProfileShareSheet`` asks for.
+enum ProfileShareChoice {
+    case share
+    case showCard
+    case copyLink
+}
+
+/// The bottom sheet behind a profile's Share button: share the link, show the profile card, or copy the link.
+///
+/// A row dismisses the sheet and reports its choice through `onChoose`; the presenter acts on it from
+/// the sheet's `onDismiss`, so a share sheet or cover never presents over a sheet that is leaving.
+/// `offersCard` false drops the card row, for a profile that has no card to show.
+struct ProfileShareSheet: View {
+
+    let subtitle: String?
+    let offersCard: Bool
+    let onChoose: (ProfileShareChoice) -> Void
+
+    @Environment(\.dismiss) private var dismiss
+
+    var body: some View {
+        VStack(spacing: 0) {
+            Capsule()
+                .fill(Color(r: 102, g: 102, b: 106))
+                .frame(width: 40, height: 4)
+                .padding(.top, 8)
+
+            VStack(spacing: 4) {
+                Text("Share Profile")
+                    .font(.default(size: 21, weight: .semibold))
+                    .foregroundStyle(Color.textMain)
+                if let subtitle {
+                    Text(subtitle)
+                        .font(.default(size: 13, weight: .regular))
+                        .foregroundStyle(Color.textSecondary)
+                }
+            }
+            .padding(.top, 20)
+            .padding(.bottom, 12)
+
+            row(icon: Image.asset(.shareOS), title: "Share Profile", identifier: "profile-share-row", choice: .share)
+            if offersCard {
+                separator
+                row(icon: Image(systemName: "person.crop.rectangle"), title: "Show Profile Card", identifier: "profile-card-row", choice: .showCard)
+            }
+            separator
+            row(icon: Image.asset(.chainLink), title: "Copy Link", identifier: "profile-copy-link-row", choice: .copyLink)
+
+            Spacer(minLength: 0)
+        }
+        .frame(maxWidth: .infinity)
+        .presentationDetents([.height(detentHeight)])
+        .presentationDragIndicator(.hidden)
+        .presentationBackground(Color.backgroundSecondary)
+        .presentationCornerRadius(28)
+    }
+
+    /// Handle, title block and rows, plus room for the home indicator.
+    private var detentHeight: CGFloat {
+        let rows: CGFloat = offersCard ? 3 : 2
+        return 12 + 4 + 20 + 52 + 12 + rows * 64 + 34
+    }
+
+    private var separator: some View {
+        Color(r: 58, g: 58, b: 60)
+            .frame(height: 1)
+            .padding(.leading, 54)
+    }
+
+    private func row(icon: Image, title: String, identifier: String, choice: ProfileShareChoice) -> some View {
+        Button {
+            onChoose(choice)
+            dismiss()
+        } label: {
+            HStack(spacing: 6) {
+                icon
+                    .renderingMode(.template)
+                    .resizable()
+                    .scaledToFit()
+                    .frame(width: 24, height: 24)
+                Text(title)
+                    .font(.default(size: 16, weight: .medium))
+                Spacer(minLength: 8)
+                Image(systemName: "chevron.right")
+                    .font(.system(size: 14, weight: .semibold))
+                    .frame(width: 20, height: 20)
+                    .foregroundStyle(Color.textSecondary)
+            }
+            .foregroundStyle(Color.textMain)
+            .padding(.leading, 24)
+            .padding(.trailing, 24)
+            .frame(height: 64)
+            .contentShape(Rectangle())
+        }
+        .buttonStyle(.plain)
+        .accessibilityIdentifier(identifier)
+    }
+}
diff --git a/Flipcash/Core/Screens/Profile/ProfileStatsCard.swift b/Flipcash/Core/Screens/Profile/ProfileStatsCard.swift
index 39ee5766b..b5504d496 100644
--- a/Flipcash/Core/Screens/Profile/ProfileStatsCard.swift
+++ b/Flipcash/Core/Screens/Profile/ProfileStatsCard.swift
@@ -18,32 +18,39 @@ struct ProfileStatsCard: View {
             stat(
                 title: "Minimum to Chat",
                 value: minimumToChat?.formatted() ?? "—",
+                valueFont: .default(size: 23, weight: .semibold),
                 identifier: "profile-stat-minimum"
             )
+            .frame(width: 176)
 
             Color.rowSeparator
-                .frame(width: 1, height: 32)
+                .frame(width: 1, height: 48)
 
             stat(
                 title: "Date Joined",
-                value: joinedAt?.formatted(.dateTime.month(.abbreviated).year()) ?? "—",
+                value: joinedAt?.formatted(.dateTime.month(.wide).year()) ?? "—",
+                valueFont: .default(size: 17, weight: .medium),
                 identifier: "profile-stat-joined"
             )
+            .frame(maxWidth: .infinity)
         }
-        .padding(.vertical, 16)
-        .background(Color.backgroundRow, in: RoundedRectangle(cornerRadius: 12, style: .continuous))
+        .frame(height: 84)
+        .background(Color.backgroundRow, in: RoundedRectangle(cornerRadius: 16, style: .continuous))
+        .padding(.horizontal, ProfileHeaderView<EmptyView, EmptyView, EmptyView>.inset)
     }
 
-    private func stat(title: String, value: String, identifier: String) -> some View {
-        VStack(spacing: 4) {
-            Text(value)
-                .font(.appTextMedium)
-                .foregroundStyle(Color.textMain)
+    private func stat(title: String, value: String, valueFont: Font, identifier: String) -> some View {
+        VStack(alignment: .leading, spacing: 0) {
             Text(title)
-                .font(.appTextSmall)
+                .font(.default(size: 11, weight: .medium))
+                .frame(minHeight: 15)
                 .foregroundStyle(Color.textSecondary)
+            Text(value)
+                .font(valueFont)
+                .foregroundStyle(Color.textMain)
         }
-        .frame(maxWidth: .infinity)
+        .padding(.leading, 16)
+        .frame(maxWidth: .infinity, alignment: .leading)
         .accessibilityElement(children: .combine)
         .accessibilityIdentifier(identifier)
     }
diff --git a/Flipcash/Core/Screens/Profile/UserProfileScreen.swift b/Flipcash/Core/Screens/Profile/UserProfileScreen.swift
index d2ac09caf..c866fad19 100644
--- a/Flipcash/Core/Screens/Profile/UserProfileScreen.swift
+++ b/Flipcash/Core/Screens/Profile/UserProfileScreen.swift
@@ -6,6 +6,7 @@
 //
 
 import SwiftUI
+import UIKit
 import FlipcashCore
 import FlipcashUI
 
@@ -49,9 +50,12 @@ private struct UserProfileContent: View {
     @Environment(RatesController.self) private var ratesController
     @Environment(ConversationController.self) private var conversationController
     @Environment(BlocklistController.self) private var blocklistController
+    @Environment(ToastController.self) private var toasts
 
     let origin: UserProfileOrigin
 
+    @State private var isShowingShare = false
+    @State private var shareChoice: ProfileShareChoice?
     @State private var model: UserProfileViewModel
     @State private var dialogItem: DialogItem?
     @State private var isPickingMuteDuration = false
@@ -123,7 +127,7 @@ private struct UserProfileContent: View {
     var body: some View {
         Background(color: .backgroundMain) {
             ScrollView {
-                VStack(spacing: 16) {
+                VStack(spacing: 0) {
                     ProfileHeaderView(
                         userID: model.userID,
                         displayName: model.displayName,
@@ -132,23 +136,28 @@ private struct UserProfileContent: View {
                         avatarData: model.imageData,
                         avatarBlurhash: model.blurhash,
                         coverPicture: model.coverPicture,
-                        customization: model.customization,
                         statusChip: statusChip,
-                        bannerActions: { EmptyView() },
+                        bannerControls: { bannerControls },
+                        rowActions: { shareButton },
                         underHandle: { EmptyView() }
                     )
 
                     ProfileStatsCard(minimumToChat: fee, joinedAt: model.joinedAt)
+                        .padding(.top, 19)
                 }
-                .padding(.horizontal, 20)
+                .padding(.bottom, 24)
             }
+            // The banner runs under the status bar.
+            .ignoresSafeArea(edges: .top)
         }
-        .safeAreaInset(edge: .bottom) {
+        .safeAreaInset(edge: .bottom, spacing: 0) {
             pinnedButton
         }
-        .navigationTitle("")
-        .toolbarTitleDisplayMode(.inline)
-        .toolbar { toolbarContent }
+        // The system bar is hidden; the interactive swipe-back stays with the navigation controller.
+        .toolbar(.hidden, for: .navigationBar)
+        .sheet(isPresented: $isShowingShare, onDismiss: handleShareChoice) {
+            ProfileShareSheet(subtitle: shareSubtitle, offersCard: false) { shareChoice = $0 }
+        }
         .dialog(item: $dialogItem)
         .sheet(isPresented: $isPickingMuteDuration) {
             if let dmID {
@@ -203,23 +212,26 @@ private struct UserProfileContent: View {
         return nil
     }
 
-    // MARK: - Toolbar -
+    // MARK: - Banner controls -
 
-    @ToolbarContentBuilder
-    private var toolbarContent: some ToolbarContent {
-        ToolbarItem(placement: .topBarTrailing) {
+    private var bannerControls: some View {
+        HStack {
             Button {
-                model.share()
+                router.popTopmost()
             } label: {
-                Image.asset(.shareOS)
-                    .renderingMode(.template)
+                Image(systemName: "chevron.left")
+                    .font(.system(size: 24, weight: .semibold))
+                    .foregroundStyle(Color.textMain)
+                    .frame(width: 44, height: 44)
+                    .contentShape(Rectangle())
             }
-            .accessibilityLabel("Share profile")
-            .accessibilityIdentifier("profile-share")
-        }
+            .buttonStyle(.plain)
+            .accessibilityLabel("Back")
+            .accessibilityIdentifier("profile-back")
+
+            Spacer()
 
-        if !menuItems.isEmpty {
-            ToolbarItem(placement: .topBarTrailing) {
+            if !menuItems.isEmpty {
                 Menu {
                     ForEach(menuItems, id: \.title) { item in
                         Button(role: item.isDestructive ? .destructive : nil) {
@@ -230,11 +242,46 @@ private struct UserProfileContent: View {
                     }
                 } label: {
                     Image.system(.ellipsis)
+                        .renderingMode(.template)
+                        .foregroundStyle(Color.textMain)
+                        .frame(width: 44, height: 44)
+                        .contentShape(Rectangle())
                 }
                 .accessibilityLabel("More")
                 .accessibilityIdentifier("profile-overflow")
             }
         }
+        .padding(.leading, ProfileHeaderView<EmptyView, EmptyView, EmptyView>.inset - 10)
+        .padding(.trailing, 12)
+        .padding(.top, 67)
+    }
+
+    private var shareButton: some View {
+        Button {
+            isShowingShare = true
+        } label: {
+            ProfileActionCircle(image: Image.asset(.shareOS))
+        }
+        .buttonStyle(.plain)
+        .accessibilityLabel("Share profile")
+        .accessibilityIdentifier("profile-share")
+    }
+
+    private func handleShareChoice() {
+        defer { shareChoice = nil }
+        switch shareChoice {
+        case .share:
+            model.share()
+        case .copyLink:
+            UIPasteboard.general.string = model.shareURL.absoluteString
+            toasts.show(.init("Copied", systemImage: "checkmark.circle.fill", duration: .seconds(2)))
+        case .showCard, nil:
+            break
+        }
+    }
+
+    private var shareSubtitle: String? {
+        [model.displayName, model.handle].compactMap { $0 }.joined(separator: " · ")
     }
 
     private func perform(_ item: ProfileMenuItem) {
@@ -272,18 +319,37 @@ private struct UserProfileContent: View {
     private var pinnedButton: some View {
         if let title = pinnedAction.title {
             VStack(spacing: 8) {
-                Button(title) {
-                    tapPinned()
+                Button(action: tapPinned) {
+                    Text(title)
+                        .font(.default(size: 15, weight: .semibold))
+                        .foregroundStyle(Color.textAction)
+                        .frame(maxWidth: .infinity)
+                        .frame(height: 60)
+                        .background(Color.action, in: RoundedRectangle(cornerRadius: 8, style: .continuous))
+                        .contentShape(Rectangle())
                 }
-                .buttonStyle(.filled)
+                .buttonStyle(.plain)
                 .accessibilityIdentifier("profile-pinned-action")
 
                 if showsE2eeFooter {
                     E2eeFooter(kind: .dm)
                 }
             }
-            .padding(.horizontal, 20)
+            .padding(.horizontal, ProfileHeaderView<EmptyView, EmptyView, EmptyView>.inset)
+            .padding(.top, 40)
             .padding(.bottom, 8)
+            .background {
+                LinearGradient(
+                    stops: [
+                        .init(color: Color.backgroundMain.opacity(0), location: 0),
+                        .init(color: Color.backgroundMain.opacity(0.96), location: 0.3),
+                        .init(color: Color.backgroundMain, location: 1)
+                    ],
+                    startPoint: .top,
+                    endPoint: .bottom
+                )
+                .ignoresSafeArea(edges: .bottom)
+            }
         } else if showsE2eeFooter {
             E2eeFooter(kind: .dm)
         }
@@ -471,9 +537,12 @@ final class UserProfileViewModel {
         minDmChatInitFee = profile.minDmChatInitFee
     }
 
+    /// This person's public link, the one their own You tab shares.
+    var shareURL: URL { .tipcard(for: userID, username: username) }
+
     /// Opens the share sheet on this person's public link, the one their own You tab shares.
     func share() {
-        let item = TipCodeShareItem.profile(url: .tipcard(for: userID, username: username), displayName: name)
+        let item = TipCodeShareItem.profile(url: shareURL, displayName: name)
         ShareSheet.present(activityItem: item) { _ in }
     }
 
diff --git a/FlipcashTests/ProfileCoverFillTests.swift b/FlipcashTests/ProfileCoverFillTests.swift
deleted file mode 100644
index d9f416401..000000000
--- a/FlipcashTests/ProfileCoverFillTests.swift
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-//  ProfileCoverFillTests.swift
-//  FlipcashTests
-//
-
-import SwiftUI
-import Testing
-import FlipcashCore
-import FlipcashUI
-@testable import Flipcash
-
-@MainActor
-@Suite("ProfileCoverFill")
-struct ProfileCoverFillTests {
-
-    @Test("A valid hex gives the parsed colour")
-    func validHexIsParsed() {
-        let color = ProfileCoverFill.color(for: TipCardCustomization(colorHex: "#19191A"))
-
-        #expect(color == Color(hex: "#19191A"))
-    }
-
-    @Test("An unparsable hex gives the default")
-    func invalidHexFallsBack() {
-        let color = ProfileCoverFill.color(for: TipCardCustomization(colorHex: "not-a-colour"))
-
-        #expect(color == ProfileCoverFill.fallback)
-    }
-
-    @Test("No customization gives the default")
-    func nilFallsBack() {
-        #expect(ProfileCoverFill.color(for: nil) == ProfileCoverFill.fallback)
-    }
-}
diff --git a/FlipcashTests/ProfileTutorialStateTests.swift b/FlipcashTests/ProfileTutorialStateTests.swift
deleted file mode 100644
index 9866dd4ff..000000000
--- a/FlipcashTests/ProfileTutorialStateTests.swift
+++ /dev/null
@@ -1,68 +0,0 @@
-//
-//  ProfileTutorialStateTests.swift
-//  FlipcashTests
-//
-
-import Foundation
-import Testing
-import FlipcashCore
-@testable import Flipcash
-
-/// The checklist is derived from the profile rather than from a dismissal flag,
-/// so it must stay silent until a profile has loaded and must disappear on its
-/// own once every chore is done.
-@Suite
-@MainActor
-struct ProfileTutorialStateTests {
-
-    private static func state(
-        hasProfile: Bool = true,
-        name: Bool = true,
-        picture: Bool = false,
-        minimumTip: Bool = false
-    ) -> ProfileTutorialState {
-        ProfileTutorialState(
-            hasProfile: hasProfile,
-            hasDisplayName: name,
-            hasProfilePicture: picture,
-            hasMinimumTipAmount: minimumTip
-        )
-    }
-
-    @Test("The checklist is withheld until a profile has loaded")
-    func withheldWithoutProfile() {
-        #expect(!Self.state(hasProfile: false).isVisible)
-    }
-
-    @Test("The checklist shows while any chore is outstanding")
-    func shownWhileIncomplete() {
-        #expect(Self.state().isVisible)
-        #expect(Self.state(name: false, picture: true, minimumTip: true).isVisible)
-        #expect(Self.state(picture: true).isVisible)
-        #expect(Self.state(minimumTip: true).isVisible)
-    }
-
-    @Test("A finished checklist disappears without needing a dismissal")
-    func hiddenWhenComplete() {
-        let state = Self.state(picture: true, minimumTip: true)
-        #expect(state.isComplete)
-        #expect(!state.isVisible)
-    }
-
-    @Test("Profile fields drive the step completion the card renders")
-    func itemsCarryProfileState() {
-        let state = Self.state(picture: true)
-        #expect(state.items == [
-            .displayName(isCompleted: true),
-            .profilePicture(isCompleted: true),
-            .minimumTipAmount(isCompleted: false),
-        ])
-    }
-
-    @Test("A name-less profile gets the checklist, with naming it first and outstanding")
-    func namelessProfileShowsNameChore() {
-        let state = ProfileTutorialState(profile: Profile(displayName: nil, phone: Phone?.none, email: nil))
-        #expect(state.isVisible)
-        #expect(state.items.first == .displayName(isCompleted: false))
-    }
-}
diff --git a/FlipcashUI/Sources/FlipcashUI/Theme/Colors.swift b/FlipcashUI/Sources/FlipcashUI/Theme/Colors.swift
index dfa0be46f..c84c40f24 100644
--- a/FlipcashUI/Sources/FlipcashUI/Theme/Colors.swift
+++ b/FlipcashUI/Sources/FlipcashUI/Theme/Colors.swift
@@ -39,6 +39,8 @@ extension ShapeStyle where Self == Color {
     public static var backgroundSecondary: Color         { Color("backgroundSecondary") }
     public static var backgroundRow: Color               { Color.white.opacity(0.05) }
     public static var rowSeparator: Color                { Color.white.opacity(0.1) }
+    /// `#323234` — the flat fill behind a profile's cover banner when the profile has no cover picture.
+    public static var coverPlaceholder: Color            { Color(r: 50, g: 50, b: 52) }
 
     public static var unreadIndicator: Color             { Color(r: 10,  g: 132, b: 255) }
 

From b3fec1993a2097baa459d0c3e09c03ab7a40823e Mon Sep 17 00:00:00 2001
From: Brandon McAnsh <git@bmcreations.dev>
Date: Tue, 6 Oct 2026 09:33:32 -0400
Subject: [PATCH 08/45] fix(profile): system toolbar and soft edges, single
 Mute entry

Move the You tab's gear and the other-user profile's back and overflow
controls into the navigation bar, so the app-wide soft scroll edge draws
the top fade. Drop the "You" title, the cover's dark overlay and the
pinned button's gradient; the pinned button now sits in a scroll edge bar.

Replace Mute/Unmute in the overflow menu with one "Mute Notifications"
entry that opens MuteChatSheet, whose "Never" option unmutes.

Top-align the stats card labels, and left-align the share sheet's
"Share User Profile" title with a shorter detent.
---
 .../Core/Screens/Main/You/YouScreen.swift     | 27 ++---
 .../Screens/Profile/ProfileCoverBanner.swift  |  7 +-
 .../Screens/Profile/ProfileMenuItems.swift    | 13 +--
 .../Screens/Profile/ProfileShareSheet.swift   | 11 ++-
 .../Screens/Profile/ProfileStatsCard.swift    |  4 +-
 .../Screens/Profile/UserProfileScreen.swift   | 99 +++++--------------
 FlipcashTests/ProfileMenuItemsTests.swift     | 22 ++---
 7 files changed, 61 insertions(+), 122 deletions(-)

diff --git a/Flipcash/Core/Screens/Main/You/YouScreen.swift b/Flipcash/Core/Screens/Main/You/YouScreen.swift
index 88a9568d4..7e94a3d52 100644
--- a/Flipcash/Core/Screens/Main/You/YouScreen.swift
+++ b/Flipcash/Core/Screens/Main/You/YouScreen.swift
@@ -11,7 +11,7 @@ import FlipcashUI
 /// The "You" tab: the user's own profile — cover, avatar, name, handle and bio — with the stats
 /// card.
 ///
-/// The banner carries the "You" title and the gear that pushes Settings; the action row beside the
+/// The navigation bar carries the gear that pushes Settings; the action row beside the
 /// avatar carries Edit Profile and Share, whose sheet shares the profile link, presents the tip card
 /// full screen (`ProfileCardScreen`), or copies the link. Settings pushes onto the tab's `.you`
 /// stack, so it never touches the v1 scanner's Settings sheet.
@@ -77,7 +77,12 @@ struct YouScreen: View {
             // The banner runs under the status bar.
             .ignoresSafeArea(edges: .top)
         }
-        .toolbar(.hidden, for: .navigationBar)
+        // The system bar carries the gear and, on iOS 26, the soft edge the banner scrolls under.
+        .toolbar {
+            ToolbarItem(placement: .topBarTrailing) {
+                settingsGear
+            }
+        }
         .fullScreenCover(isPresented: Bindable(router).isShowingProfileCard) {
             ProfileCardScreen(previewCache: previewCache)
         }
@@ -112,18 +117,7 @@ struct YouScreen: View {
             avatarBlurhash: profilePicture?.thumbnailBlurhash,
             coverPicture: profile?.coverPicture,
             statusChip: nil,
-            bannerControls: {
-                HStack {
-                    Text("You")
-                        .font(.default(size: 23, weight: .semibold))
-                        .foregroundStyle(Color.textMain)
-                    Spacer()
-                    settingsGear
-                }
-                .padding(.leading, ProfileHeaderView<EmptyView, EmptyView, EmptyView>.inset)
-                .padding(.trailing, 12)
-                .padding(.top, 65)
-            },
+            bannerControls: { EmptyView() },
             rowActions: {
                 ProfileEditCapsule {
                     // The Edit Profile slice repoints this to `.editProfile`.
@@ -166,12 +160,7 @@ struct YouScreen: View {
             router.push(.settings)
         } label: {
             Image(systemName: "gearshape")
-                .font(.system(size: 22))
-                .foregroundStyle(Color.textMain)
-                .frame(width: 44, height: 44)
-                .contentShape(Rectangle())
         }
-        .buttonStyle(.plain)
         .accessibilityLabel("Settings")
         .accessibilityIdentifier("you-settings")
     }
diff --git a/Flipcash/Core/Screens/Profile/ProfileCoverBanner.swift b/Flipcash/Core/Screens/Profile/ProfileCoverBanner.swift
index 37ed844b8..452582a80 100644
--- a/Flipcash/Core/Screens/Profile/ProfileCoverBanner.swift
+++ b/Flipcash/Core/Screens/Profile/ProfileCoverBanner.swift
@@ -44,9 +44,9 @@ struct ProfileCoverBanner<Controls: View>: View {
         if let coverPicture {
             let data = sessionContainer.profileAvatars.data(for: .cover(userID))
             if let data, let image = ContactAvatarCache.shared.image(forKey: "cover-\(coverPicture.blobID)", data: data) {
-                shaded(image)
+                fill(image)
             } else if let preview = BlurHashCache.shared.image(for: coverPicture.thumbnailBlurhash) {
-                shaded(preview)
+                fill(preview)
             } else {
                 Color.coverPlaceholder
             }
@@ -55,10 +55,9 @@ struct ProfileCoverBanner<Controls: View>: View {
         }
     }
 
-    private func shaded(_ image: UIImage) -> some View {
+    private func fill(_ image: UIImage) -> some View {
         Image(uiImage: image)
             .resizable()
             .scaledToFill()
-            .overlay { Color.black.opacity(0.16) }
     }
 }
diff --git a/Flipcash/Core/Screens/Profile/ProfileMenuItems.swift b/Flipcash/Core/Screens/Profile/ProfileMenuItems.swift
index 490fb0430..d4c79ee3a 100644
--- a/Flipcash/Core/Screens/Profile/ProfileMenuItems.swift
+++ b/Flipcash/Core/Screens/Profile/ProfileMenuItems.swift
@@ -6,7 +6,6 @@
 /// An entry in another user's overflow menu.
 nonisolated enum ProfileMenuItem: Equatable {
     case mute
-    case unmute
     case report
     case block
     case unblock
@@ -14,8 +13,7 @@ nonisolated enum ProfileMenuItem: Equatable {
     /// The entry's label.
     var title: String {
         switch self {
-        case .mute:    return "Mute"
-        case .unmute:  return "Unmute"
+        case .mute:    return "Mute Notifications"
         case .report:  return "Report"
         case .block:   return "Block"
         case .unblock: return "Unblock"
@@ -26,7 +24,6 @@ nonisolated enum ProfileMenuItem: Equatable {
     var systemImage: String {
         switch self {
         case .mute:    return "bell.slash"
-        case .unmute:  return "bell"
         case .report:  return "flag"
         case .block:   return "nosign"
         case .unblock: return "checkmark.circle"
@@ -37,7 +34,7 @@ nonisolated enum ProfileMenuItem: Equatable {
     var isDestructive: Bool {
         switch self {
         case .report, .block:                 return true
-        case .mute, .unmute, .unblock:        return false
+        case .mute, .unblock:                 return false
         }
     }
 }
@@ -45,11 +42,11 @@ nonisolated enum ProfileMenuItem: Equatable {
 /// The entries of another user's overflow menu.
 nonisolated enum ProfileMenuItems {
 
-    /// Mute and Unmute need a DM to silence and are hidden while blocked, since the DM is hidden too.
-    static func resolve(isBlocked: Bool, hasDM: Bool, isMuted: Bool) -> [ProfileMenuItem] {
+    /// Mute needs a DM to silence and is hidden while blocked, since the DM is hidden too.
+    static func resolve(isBlocked: Bool, hasDM: Bool) -> [ProfileMenuItem] {
         if isBlocked { return [.report, .unblock] }
         var items: [ProfileMenuItem] = []
-        if hasDM { items.append(isMuted ? .unmute : .mute) }
+        if hasDM { items.append(.mute) }
         items.append(contentsOf: [.report, .block])
         return items
     }
diff --git a/Flipcash/Core/Screens/Profile/ProfileShareSheet.swift b/Flipcash/Core/Screens/Profile/ProfileShareSheet.swift
index f99a409af..5b78d5688 100644
--- a/Flipcash/Core/Screens/Profile/ProfileShareSheet.swift
+++ b/Flipcash/Core/Screens/Profile/ProfileShareSheet.swift
@@ -33,8 +33,8 @@ struct ProfileShareSheet: View {
                 .frame(width: 40, height: 4)
                 .padding(.top, 8)
 
-            VStack(spacing: 4) {
-                Text("Share Profile")
+            VStack(alignment: .leading, spacing: 4) {
+                Text("Share User Profile")
                     .font(.default(size: 21, weight: .semibold))
                     .foregroundStyle(Color.textMain)
                 if let subtitle {
@@ -43,6 +43,8 @@ struct ProfileShareSheet: View {
                         .foregroundStyle(Color.textSecondary)
                 }
             }
+            .frame(maxWidth: .infinity, alignment: .leading)
+            .padding(.horizontal, 24)
             .padding(.top, 20)
             .padding(.bottom, 12)
 
@@ -63,10 +65,11 @@ struct ProfileShareSheet: View {
         .presentationCornerRadius(28)
     }
 
-    /// Handle, title block and rows, plus room for the home indicator.
+    /// Handle, title block and rows, plus a small bottom margin. The sheet floats clear of the home
+    /// indicator on its own, so no extra room is added for it.
     private var detentHeight: CGFloat {
         let rows: CGFloat = offersCard ? 3 : 2
-        return 12 + 4 + 20 + 52 + 12 + rows * 64 + 34
+        return 12 + 4 + 20 + 52 + 12 + rows * 64 + 8
     }
 
     private var separator: some View {
diff --git a/Flipcash/Core/Screens/Profile/ProfileStatsCard.swift b/Flipcash/Core/Screens/Profile/ProfileStatsCard.swift
index b5504d496..eff382dfa 100644
--- a/Flipcash/Core/Screens/Profile/ProfileStatsCard.swift
+++ b/Flipcash/Core/Screens/Profile/ProfileStatsCard.swift
@@ -50,7 +50,9 @@ struct ProfileStatsCard: View {
                 .foregroundStyle(Color.textMain)
         }
         .padding(.leading, 16)
-        .frame(maxWidth: .infinity, alignment: .leading)
+        .padding(.top, 18)
+        // Top-aligned so both labels share a baseline even though the values differ in size.
+        .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)
         .accessibilityElement(children: .combine)
         .accessibilityIdentifier(identifier)
     }
diff --git a/Flipcash/Core/Screens/Profile/UserProfileScreen.swift b/Flipcash/Core/Screens/Profile/UserProfileScreen.swift
index c866fad19..b39976e95 100644
--- a/Flipcash/Core/Screens/Profile/UserProfileScreen.swift
+++ b/Flipcash/Core/Screens/Profile/UserProfileScreen.swift
@@ -102,14 +102,9 @@ private struct UserProfileContent: View {
         ProfilePinnedAction.resolve(isSelf: isSelf, isBlocked: isBlocked, dmID: dmID, fee: fee)
     }
 
-    private var isMuted: Bool {
-        guard let dmID else { return false }
-        return conversationController.conversation(withID: dmID)?.isMuted() ?? false
-    }
-
     private var menuItems: [ProfileMenuItem] {
         guard !isSelf else { return [] }
-        return ProfileMenuItems.resolve(isBlocked: isBlocked, hasDM: dmID != nil, isMuted: isMuted)
+        return ProfileMenuItems.resolve(isBlocked: isBlocked, hasDM: dmID != nil)
     }
 
     /// Whether this profile is the visible top of its stack, with its tab or sheet active.
@@ -137,7 +132,7 @@ private struct UserProfileContent: View {
                         avatarBlurhash: model.blurhash,
                         coverPicture: model.coverPicture,
                         statusChip: statusChip,
-                        bannerControls: { bannerControls },
+                        bannerControls: { EmptyView() },
                         rowActions: { shareButton },
                         underHandle: { EmptyView() }
                     )
@@ -150,11 +145,18 @@ private struct UserProfileContent: View {
             // The banner runs under the status bar.
             .ignoresSafeArea(edges: .top)
         }
-        .safeAreaInset(edge: .bottom, spacing: 0) {
+        // On iOS 26 the pinned button joins the bottom scroll edge effect, so content fades under it.
+        .scrollEdgeBar(.bottom) {
             pinnedButton
         }
-        // The system bar is hidden; the interactive swipe-back stays with the navigation controller.
-        .toolbar(.hidden, for: .navigationBar)
+        // The system bar carries back and the overflow menu, and the soft edge the banner scrolls under.
+        .toolbar {
+            if !menuItems.isEmpty {
+                ToolbarItem(placement: .topBarTrailing) {
+                    overflowMenu
+                }
+            }
+        }
         .sheet(isPresented: $isShowingShare, onDismiss: handleShareChoice) {
             ProfileShareSheet(subtitle: shareSubtitle, offersCard: false) { shareChoice = $0 }
         }
@@ -214,46 +216,21 @@ private struct UserProfileContent: View {
 
     // MARK: - Banner controls -
 
-    private var bannerControls: some View {
-        HStack {
-            Button {
-                router.popTopmost()
-            } label: {
-                Image(systemName: "chevron.left")
-                    .font(.system(size: 24, weight: .semibold))
-                    .foregroundStyle(Color.textMain)
-                    .frame(width: 44, height: 44)
-                    .contentShape(Rectangle())
-            }
-            .buttonStyle(.plain)
-            .accessibilityLabel("Back")
-            .accessibilityIdentifier("profile-back")
-
-            Spacer()
-
-            if !menuItems.isEmpty {
-                Menu {
-                    ForEach(menuItems, id: \.title) { item in
-                        Button(role: item.isDestructive ? .destructive : nil) {
-                            perform(item)
-                        } label: {
-                            Label(item.title, systemImage: item.systemImage)
-                        }
-                    }
+    private var overflowMenu: some View {
+        Menu {
+            ForEach(menuItems, id: \.title) { item in
+                Button(role: item.isDestructive ? .destructive : nil) {
+                    perform(item)
                 } label: {
-                    Image.system(.ellipsis)
-                        .renderingMode(.template)
-                        .foregroundStyle(Color.textMain)
-                        .frame(width: 44, height: 44)
-                        .contentShape(Rectangle())
+                    Label(item.title, systemImage: item.systemImage)
                 }
-                .accessibilityLabel("More")
-                .accessibilityIdentifier("profile-overflow")
             }
+        } label: {
+            Image.system(.ellipsis)
+                .renderingMode(.template)
         }
-        .padding(.leading, ProfileHeaderView<EmptyView, EmptyView, EmptyView>.inset - 10)
-        .padding(.trailing, 12)
-        .padding(.top, 67)
+        .accessibilityLabel("More")
+        .accessibilityIdentifier("profile-overflow")
     }
 
     private var shareButton: some View {
@@ -288,22 +265,6 @@ private struct UserProfileContent: View {
         switch item {
         case .mute:
             isPickingMuteDuration = true
-        case .unmute:
-            guard let dmID else { return }
-            let chatType = conversationController.conversation(withID: dmID)?.type
-            Task {
-                do {
-                    try await conversationController.unmute(conversationID: dmID)
-                    Analytics.chatUnmuted(chatType: chatType, error: nil)
-                } catch {
-                    Analytics.chatUnmuted(chatType: chatType, error: error)
-                    session.dialogItem = .error(
-                        title: "Something Went Wrong",
-                        subtitle: "We were unable to unmute this chat. Please try again"
-                    )
-                    ErrorReporting.captureError(error, reason: "Failed to unmute chat")
-                }
-            }
         case .report:
             isReporting = true
         case .block:
@@ -336,20 +297,8 @@ private struct UserProfileContent: View {
                 }
             }
             .padding(.horizontal, ProfileHeaderView<EmptyView, EmptyView, EmptyView>.inset)
-            .padding(.top, 40)
+            .padding(.top, 12)
             .padding(.bottom, 8)
-            .background {
-                LinearGradient(
-                    stops: [
-                        .init(color: Color.backgroundMain.opacity(0), location: 0),
-                        .init(color: Color.backgroundMain.opacity(0.96), location: 0.3),
-                        .init(color: Color.backgroundMain, location: 1)
-                    ],
-                    startPoint: .top,
-                    endPoint: .bottom
-                )
-                .ignoresSafeArea(edges: .bottom)
-            }
         } else if showsE2eeFooter {
             E2eeFooter(kind: .dm)
         }
diff --git a/FlipcashTests/ProfileMenuItemsTests.swift b/FlipcashTests/ProfileMenuItemsTests.swift
index e36ab099a..f4568773d 100644
--- a/FlipcashTests/ProfileMenuItemsTests.swift
+++ b/FlipcashTests/ProfileMenuItemsTests.swift
@@ -10,32 +10,32 @@ import Testing
 @Suite("ProfileMenuItems")
 struct ProfileMenuItemsTests {
 
-    @Test("A DM that is audible offers Mute, Report and Block")
+    @Test("A DM offers Mute, Report and Block")
     func dm_unmuted() {
-        #expect(ProfileMenuItems.resolve(isBlocked: false, hasDM: true, isMuted: false) == [.mute, .report, .block])
-    }
-
-    @Test("A muted DM offers Unmute in Mute's place")
-    func dm_muted() {
-        #expect(ProfileMenuItems.resolve(isBlocked: false, hasDM: true, isMuted: true) == [.unmute, .report, .block])
+        #expect(ProfileMenuItems.resolve(isBlocked: false, hasDM: true) == [.mute, .report, .block])
     }
 
     @Test("Without a DM there is nothing to mute")
     func noDM() {
-        #expect(ProfileMenuItems.resolve(isBlocked: false, hasDM: false, isMuted: false) == [.report, .block])
+        #expect(ProfileMenuItems.resolve(isBlocked: false, hasDM: false) == [.report, .block])
     }
 
     @Test("A blocked profile offers Report and Unblock, with no Mute", arguments: [true, false])
     func blocked(hasDM: Bool) {
-        #expect(ProfileMenuItems.resolve(isBlocked: true, hasDM: hasDM, isMuted: false) == [.report, .unblock])
+        #expect(ProfileMenuItems.resolve(isBlocked: true, hasDM: hasDM) == [.report, .unblock])
+    }
+
+    @Test("Mute reads as in the chat mute row")
+    func muteLabel() {
+        #expect(ProfileMenuItem.mute.title == "Mute Notifications")
+        #expect(ProfileMenuItem.mute.systemImage == "bell.slash")
     }
 
-    @Test("Report and Block are destructive; Unblock and the mutes are not")
+    @Test("Report and Block are destructive; Unblock and Mute are not")
     func destructive() {
         #expect(ProfileMenuItem.report.isDestructive)
         #expect(ProfileMenuItem.block.isDestructive)
         #expect(!ProfileMenuItem.unblock.isDestructive)
         #expect(!ProfileMenuItem.mute.isDestructive)
-        #expect(!ProfileMenuItem.unmute.isDestructive)
     }
 }

From de9dcf4094198793f8a172b30e16786fa52ab3b9 Mon Sep 17 00:00:00 2001
From: Brandon McAnsh <git@bmcreations.dev>
Date: Tue, 6 Oct 2026 10:20:04 -0400
Subject: [PATCH 09/45] fix(profile): use the app's type, colour and sheet
 components

The profile screens matched Figma pixel values: ten font sizes, four RGB
colours and one-off radii and paddings that no other screen uses. Swap
them for the app* font tokens, the textMain/textSecondary/backgroundRow
colours, glass buttons, and the PartialSheet + ChatActionRow sheet that
Mute Notifications already uses.
---
 .../Core/Screens/Main/You/YouScreen.swift     |  7 +-
 .../Screens/Profile/ProfileHeaderView.swift   | 49 ++++------
 .../Screens/Profile/ProfileShareSheet.swift   | 96 +++++++------------
 .../Screens/Profile/ProfileStatsCard.swift    | 11 +--
 .../Screens/Profile/UserProfileScreen.swift   | 20 +---
 5 files changed, 68 insertions(+), 115 deletions(-)

diff --git a/Flipcash/Core/Screens/Main/You/YouScreen.swift b/Flipcash/Core/Screens/Main/You/YouScreen.swift
index 7e94a3d52..829a8d93d 100644
--- a/Flipcash/Core/Screens/Main/You/YouScreen.swift
+++ b/Flipcash/Core/Screens/Main/You/YouScreen.swift
@@ -133,7 +133,7 @@ struct YouScreen: View {
                 if shouldPromptForUsername {
                     Button(action: claimUsername) {
                         Text("Claim your username ›")
-                            .font(.default(size: 14, weight: .medium))
+                            .font(.appTextSmall)
                             .foregroundStyle(Color.textMain)
                             .frame(minHeight: 22)
                     }
@@ -145,12 +145,9 @@ struct YouScreen: View {
     }
 
     private var shareButton: some View {
-        Button {
+        ProfileActionCircle(image: Image.asset(.shareOS)) {
             isShowingShare = true
-        } label: {
-            ProfileActionCircle(image: Image.asset(.shareOS))
         }
-        .buttonStyle(.plain)
         .accessibilityLabel("Share")
         .accessibilityIdentifier("you-share")
     }
diff --git a/Flipcash/Core/Screens/Profile/ProfileHeaderView.swift b/Flipcash/Core/Screens/Profile/ProfileHeaderView.swift
index 92e886184..dd08d326c 100644
--- a/Flipcash/Core/Screens/Profile/ProfileHeaderView.swift
+++ b/Flipcash/Core/Screens/Profile/ProfileHeaderView.swift
@@ -53,7 +53,7 @@ struct ProfileHeaderView<BannerControls: View, RowActions: View, UnderHandle: Vi
 
                 Spacer(minLength: 8)
 
-                HStack(spacing: 14) {
+                HStack(spacing: 12) {
                     rowActions()
                 }
                 .padding(.top, 20)
@@ -64,10 +64,7 @@ struct ProfileHeaderView<BannerControls: View, RowActions: View, UnderHandle: Vi
                 VStack(alignment: .leading, spacing: 0) {
                     HStack(spacing: 8) {
                         Text(displayName)
-                            .font(.default(size: 28, weight: .bold))
-                            .tracking(-0.6)
-                            .lineSpacing(1)
-                            .frame(minHeight: 35)
+                            .font(.appDisplaySmall)
                             .foregroundStyle(Color.textMain)
                             .accessibilityIdentifier("profile-name")
 
@@ -79,8 +76,7 @@ struct ProfileHeaderView<BannerControls: View, RowActions: View, UnderHandle: Vi
 
                     if let handle {
                         Text(handle)
-                            .font(.default(size: 14, weight: .regular))
-                            .frame(minHeight: 22)
+                            .font(.appTextSmall)
                             .foregroundStyle(Color.textSecondary)
                             .accessibilityIdentifier("profile-handle")
                     }
@@ -89,41 +85,42 @@ struct ProfileHeaderView<BannerControls: View, RowActions: View, UnderHandle: Vi
 
                     if let bio, !bio.isEmpty {
                         Text(bio)
-                            .font(.default(size: 15, weight: .regular))
-                            .lineSpacing(4)
+                            .font(.appTextBody)
                             .foregroundStyle(Color.textMain)
                             .multilineTextAlignment(.leading)
                             .frame(maxWidth: .infinity, alignment: .leading)
-                            .padding(.top, 14)
+                            .padding(.top, 12)
                             .accessibilityIdentifier("profile-bio")
                     }
                 }
-                .padding(.top, 7)
+                .padding(.top, 8)
                 .padding(.horizontal, Self.inset)
             }
         }
     }
 }
 
-/// A 38pt disc in the header's action row, filled at the row-surface tint.
+/// The share button in the header's action row: an icon on the app's glass circle, the same chrome
+/// as the toolbar's gear and ⋯.
 struct ProfileActionCircle: View {
 
     let image: Image
+    let action: () -> Void
 
     var body: some View {
-        image
-            .renderingMode(.template)
-            .resizable()
-            .scaledToFit()
-            .frame(width: 22, height: 22)
-            .foregroundStyle(Color.textMain)
-            .frame(width: 38, height: 38)
-            .background(Color.rowSeparator, in: Circle())
-            .contentShape(Circle())
+        Button(action: action) {
+            image
+                .renderingMode(.template)
+                .resizable()
+                .scaledToFit()
+                .frame(width: 20, height: 20)
+                .foregroundStyle(Color.textMain)
+        }
+        .liquidGlassButtonStyle(shape: .circle)
     }
 }
 
-/// The header's "Edit Profile" capsule.
+/// The header's "Edit Profile" button, a glass capsule beside ``ProfileActionCircle``.
 struct ProfileEditCapsule: View {
 
     let action: () -> Void
@@ -131,13 +128,9 @@ struct ProfileEditCapsule: View {
     var body: some View {
         Button(action: action) {
             Text("Edit Profile")
-                .font(.default(size: 12, weight: .semibold))
+                .font(.appTextSmall)
                 .foregroundStyle(Color.textMain)
-                .padding(.horizontal, 18)
-                .frame(height: 38)
-                .background(Color.rowSeparator, in: RoundedRectangle(cornerRadius: 22, style: .continuous))
-                .contentShape(Rectangle())
         }
-        .buttonStyle(.plain)
+        .liquidGlassButtonStyle()
     }
 }
diff --git a/Flipcash/Core/Screens/Profile/ProfileShareSheet.swift b/Flipcash/Core/Screens/Profile/ProfileShareSheet.swift
index 5b78d5688..f44bb7bbf 100644
--- a/Flipcash/Core/Screens/Profile/ProfileShareSheet.swift
+++ b/Flipcash/Core/Screens/Profile/ProfileShareSheet.swift
@@ -27,83 +27,59 @@ struct ProfileShareSheet: View {
     @Environment(\.dismiss) private var dismiss
 
     var body: some View {
-        VStack(spacing: 0) {
-            Capsule()
-                .fill(Color(r: 102, g: 102, b: 106))
-                .frame(width: 40, height: 4)
-                .padding(.top, 8)
+        PartialSheet(background: .backgroundMain) {
+            VStack(spacing: 20) {
+                header
 
-            VStack(alignment: .leading, spacing: 4) {
-                Text("Share User Profile")
-                    .font(.default(size: 21, weight: .semibold))
-                    .foregroundStyle(Color.textMain)
                 if let subtitle {
                     Text(subtitle)
-                        .font(.default(size: 13, weight: .regular))
+                        .font(.appTextSmall)
                         .foregroundStyle(Color.textSecondary)
+                        .multilineTextAlignment(.center)
+                        // Same floor as ``MuteChatSheet``'s caption: `PartialSheet` can propose less
+                        // height than the text needs while it corrects to its measured size.
+                        .fixedSize(horizontal: false, vertical: true)
+                        .frame(maxWidth: .infinity)
                 }
-            }
-            .frame(maxWidth: .infinity, alignment: .leading)
-            .padding(.horizontal, 24)
-            .padding(.top, 20)
-            .padding(.bottom, 12)
 
-            row(icon: Image.asset(.shareOS), title: "Share Profile", identifier: "profile-share-row", choice: .share)
-            if offersCard {
-                separator
-                row(icon: Image(systemName: "person.crop.rectangle"), title: "Show Profile Card", identifier: "profile-card-row", choice: .showCard)
+                VStack(spacing: 12) {
+                    row(icon: Image.asset(.shareOS), title: "Share Profile", identifier: "profile-share-row", choice: .share)
+                    if offersCard {
+                        row(icon: Image(systemName: "person.crop.rectangle"), title: "Show Profile Card", identifier: "profile-card-row", choice: .showCard)
+                    }
+                    row(icon: Image.asset(.chainLink), title: "Copy Link", identifier: "profile-copy-link-row", choice: .copyLink)
+                }
             }
-            separator
-            row(icon: Image.asset(.chainLink), title: "Copy Link", identifier: "profile-copy-link-row", choice: .copyLink)
-
-            Spacer(minLength: 0)
+            .padding(.horizontal, 16)
+            .padding(.top, 20)
+            .padding(.bottom, bottomPadding)
         }
-        .frame(maxWidth: .infinity)
-        .presentationDetents([.height(detentHeight)])
-        .presentationDragIndicator(.hidden)
-        .presentationBackground(Color.backgroundSecondary)
-        .presentationCornerRadius(28)
     }
 
-    /// Handle, title block and rows, plus a small bottom margin. The sheet floats clear of the home
-    /// indicator on its own, so no extra room is added for it.
-    private var detentHeight: CGFloat {
-        let rows: CGFloat = offersCard ? 3 : 2
-        return 12 + 4 + 20 + 52 + 12 + rows * 64 + 8
+    /// Centred title with a close button, the same title bar as ``MuteChatSheet``.
+    private var header: some View {
+        ZStack {
+            Text("Share User Profile")
+                .font(.appBarButton)
+                .foregroundStyle(Color.textMain)
+
+            HStack {
+                Spacer()
+                CloseButton(style: .glass) { dismiss() }
+            }
+        }
     }
 
-    private var separator: some View {
-        Color(r: 58, g: 58, b: 60)
-            .frame(height: 1)
-            .padding(.leading, 54)
+    /// 16 under the last row, less what the sheet already holds back for the home indicator.
+    private var bottomPadding: CGFloat {
+        let reserved = UIApplication.shared.currentKeyWindow?.safeAreaInsets.bottom ?? 0
+        return max(0, 16 - reserved)
     }
 
     private func row(icon: Image, title: String, identifier: String, choice: ProfileShareChoice) -> some View {
-        Button {
+        ChatActionRow(icon: icon, title: title, accessibilityIdentifier: identifier) {
             onChoose(choice)
             dismiss()
-        } label: {
-            HStack(spacing: 6) {
-                icon
-                    .renderingMode(.template)
-                    .resizable()
-                    .scaledToFit()
-                    .frame(width: 24, height: 24)
-                Text(title)
-                    .font(.default(size: 16, weight: .medium))
-                Spacer(minLength: 8)
-                Image(systemName: "chevron.right")
-                    .font(.system(size: 14, weight: .semibold))
-                    .frame(width: 20, height: 20)
-                    .foregroundStyle(Color.textSecondary)
-            }
-            .foregroundStyle(Color.textMain)
-            .padding(.leading, 24)
-            .padding(.trailing, 24)
-            .frame(height: 64)
-            .contentShape(Rectangle())
         }
-        .buttonStyle(.plain)
-        .accessibilityIdentifier(identifier)
     }
 }
diff --git a/Flipcash/Core/Screens/Profile/ProfileStatsCard.swift b/Flipcash/Core/Screens/Profile/ProfileStatsCard.swift
index eff382dfa..109f14d57 100644
--- a/Flipcash/Core/Screens/Profile/ProfileStatsCard.swift
+++ b/Flipcash/Core/Screens/Profile/ProfileStatsCard.swift
@@ -18,7 +18,7 @@ struct ProfileStatsCard: View {
             stat(
                 title: "Minimum to Chat",
                 value: minimumToChat?.formatted() ?? "—",
-                valueFont: .default(size: 23, weight: .semibold),
+                valueFont: .appTextLarge,
                 identifier: "profile-stat-minimum"
             )
             .frame(width: 176)
@@ -29,28 +29,27 @@ struct ProfileStatsCard: View {
             stat(
                 title: "Date Joined",
                 value: joinedAt?.formatted(.dateTime.month(.wide).year()) ?? "—",
-                valueFont: .default(size: 17, weight: .medium),
+                valueFont: .appTextLarge,
                 identifier: "profile-stat-joined"
             )
             .frame(maxWidth: .infinity)
         }
         .frame(height: 84)
-        .background(Color.backgroundRow, in: RoundedRectangle(cornerRadius: 16, style: .continuous))
+        .background(Color.backgroundRow, in: RoundedRectangle(cornerRadius: Metrics.buttonRadius, style: .continuous))
         .padding(.horizontal, ProfileHeaderView<EmptyView, EmptyView, EmptyView>.inset)
     }
 
     private func stat(title: String, value: String, valueFont: Font, identifier: String) -> some View {
         VStack(alignment: .leading, spacing: 0) {
             Text(title)
-                .font(.default(size: 11, weight: .medium))
-                .frame(minHeight: 15)
+                .font(.appTextCaption)
                 .foregroundStyle(Color.textSecondary)
             Text(value)
                 .font(valueFont)
                 .foregroundStyle(Color.textMain)
         }
         .padding(.leading, 16)
-        .padding(.top, 18)
+        .padding(.top, 16)
         // Top-aligned so both labels share a baseline even though the values differ in size.
         .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)
         .accessibilityElement(children: .combine)
diff --git a/Flipcash/Core/Screens/Profile/UserProfileScreen.swift b/Flipcash/Core/Screens/Profile/UserProfileScreen.swift
index b39976e95..0230dad57 100644
--- a/Flipcash/Core/Screens/Profile/UserProfileScreen.swift
+++ b/Flipcash/Core/Screens/Profile/UserProfileScreen.swift
@@ -138,7 +138,7 @@ private struct UserProfileContent: View {
                     )
 
                     ProfileStatsCard(minimumToChat: fee, joinedAt: model.joinedAt)
-                        .padding(.top, 19)
+                        .padding(.top, 20)
                 }
                 .padding(.bottom, 24)
             }
@@ -234,12 +234,9 @@ private struct UserProfileContent: View {
     }
 
     private var shareButton: some View {
-        Button {
+        ProfileActionCircle(image: Image.asset(.shareOS)) {
             isShowingShare = true
-        } label: {
-            ProfileActionCircle(image: Image.asset(.shareOS))
         }
-        .buttonStyle(.plain)
         .accessibilityLabel("Share profile")
         .accessibilityIdentifier("profile-share")
     }
@@ -280,17 +277,8 @@ private struct UserProfileContent: View {
     private var pinnedButton: some View {
         if let title = pinnedAction.title {
             VStack(spacing: 8) {
-                Button(action: tapPinned) {
-                    Text(title)
-                        .font(.default(size: 15, weight: .semibold))
-                        .foregroundStyle(Color.textAction)
-                        .frame(maxWidth: .infinity)
-                        .frame(height: 60)
-                        .background(Color.action, in: RoundedRectangle(cornerRadius: 8, style: .continuous))
-                        .contentShape(Rectangle())
-                }
-                .buttonStyle(.plain)
-                .accessibilityIdentifier("profile-pinned-action")
+                CodeButton(style: .filled, title: title, action: tapPinned)
+                    .accessibilityIdentifier("profile-pinned-action")
 
                 if showsE2eeFooter {
                     E2eeFooter(kind: .dm)

From 1276dd92897ab0d03a5ddac7cd7f4b25d6842521 Mon Sep 17 00:00:00 2001
From: Brandon McAnsh <git@bmcreations.dev>
Date: Tue, 6 Oct 2026 10:40:48 -0400
Subject: [PATCH 10/45] fix(profile): hide the top scroll edge until the banner
 scrolls under the bar

At rest the iOS 26 soft edge only darkened the cover banner and left a hard band where it stopped.
---
 .../Core/Screens/Main/You/YouScreen.swift     |  2 ++
 .../Screens/Profile/UserProfileScreen.swift   |  2 ++
 .../FlipcashUI/Modifiers/ScrollEdge.swift     | 26 +++++++++++++++++++
 3 files changed, 30 insertions(+)

diff --git a/Flipcash/Core/Screens/Main/You/YouScreen.swift b/Flipcash/Core/Screens/Main/You/YouScreen.swift
index 829a8d93d..eee09c13c 100644
--- a/Flipcash/Core/Screens/Main/You/YouScreen.swift
+++ b/Flipcash/Core/Screens/Main/You/YouScreen.swift
@@ -76,6 +76,8 @@ struct YouScreen: View {
             }
             // The banner runs under the status bar.
             .ignoresSafeArea(edges: .top)
+            // The blur only belongs once the banner has scrolled up under the bar.
+            .hidesTopScrollEdge(untilOffset: ProfileCoverBanner<EmptyView>.height / 2)
         }
         // The system bar carries the gear and, on iOS 26, the soft edge the banner scrolls under.
         .toolbar {
diff --git a/Flipcash/Core/Screens/Profile/UserProfileScreen.swift b/Flipcash/Core/Screens/Profile/UserProfileScreen.swift
index 0230dad57..8ffc92b1b 100644
--- a/Flipcash/Core/Screens/Profile/UserProfileScreen.swift
+++ b/Flipcash/Core/Screens/Profile/UserProfileScreen.swift
@@ -144,6 +144,8 @@ private struct UserProfileContent: View {
             }
             // The banner runs under the status bar.
             .ignoresSafeArea(edges: .top)
+            // The blur only belongs once the banner has scrolled up under the bar.
+            .hidesTopScrollEdge(untilOffset: ProfileCoverBanner<EmptyView>.height / 2)
         }
         // On iOS 26 the pinned button joins the bottom scroll edge effect, so content fades under it.
         .scrollEdgeBar(.bottom) {
diff --git a/FlipcashUI/Sources/FlipcashUI/Modifiers/ScrollEdge.swift b/FlipcashUI/Sources/FlipcashUI/Modifiers/ScrollEdge.swift
index a753c172b..e43fbb126 100644
--- a/FlipcashUI/Sources/FlipcashUI/Modifiers/ScrollEdge.swift
+++ b/FlipcashUI/Sources/FlipcashUI/Modifiers/ScrollEdge.swift
@@ -20,6 +20,13 @@ extension View {
         modifier(SoftScrollEdge(edges: edges))
     }
 
+    /// Hides the top scroll edge effect until the scroll view has moved past `offset`, for a screen
+    /// whose content starts with a full-bleed image under the bar: at rest the effect would only
+    /// darken that image and leave a visible band where it stops. No-op below iOS 26.
+    public func hidesTopScrollEdge(untilOffset offset: CGFloat) -> some View {
+        modifier(HidesTopScrollEdge(offset: offset))
+    }
+
     /// Pins `bar` to `edge` so the scroll content below it runs underneath. On iOS 26+ the bar joins
     /// the scroll edge effect; before that it's a plain safe-area inset.
     @ViewBuilder
@@ -44,3 +51,22 @@ private struct SoftScrollEdge: ViewModifier {
         }
     }
 }
+
+private struct HidesTopScrollEdge: ViewModifier {
+
+    let offset: CGFloat
+
+    @State private var isPastOffset = false
+
+    func body(content: Content) -> some View {
+        if #available(iOS 26.0, *) {
+            content
+                .onScrollGeometryChange(for: Bool.self) { $0.contentOffset.y > offset } action: { _, isPast in
+                    isPastOffset = isPast
+                }
+                .scrollEdgeEffectHidden(!isPastOffset, for: .top)
+        } else {
+            content
+        }
+    }
+}

From 0184913d0309634c6a0d50e809aeeda4c33d7efa Mon Sep 17 00:00:00 2001
From: Brandon McAnsh <git@bmcreations.dev>
Date: Tue, 6 Oct 2026 10:48:13 -0400
Subject: [PATCH 11/45] fix(profile): put the encryption notice above the
 pinned button

---
 Flipcash/Core/Screens/Profile/UserProfileScreen.swift | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Flipcash/Core/Screens/Profile/UserProfileScreen.swift b/Flipcash/Core/Screens/Profile/UserProfileScreen.swift
index 8ffc92b1b..6a29005e3 100644
--- a/Flipcash/Core/Screens/Profile/UserProfileScreen.swift
+++ b/Flipcash/Core/Screens/Profile/UserProfileScreen.swift
@@ -279,12 +279,12 @@ private struct UserProfileContent: View {
     private var pinnedButton: some View {
         if let title = pinnedAction.title {
             VStack(spacing: 8) {
-                CodeButton(style: .filled, title: title, action: tapPinned)
-                    .accessibilityIdentifier("profile-pinned-action")
-
                 if showsE2eeFooter {
                     E2eeFooter(kind: .dm)
                 }
+
+                CodeButton(style: .filled, title: title, action: tapPinned)
+                    .accessibilityIdentifier("profile-pinned-action")
             }
             .padding(.horizontal, ProfileHeaderView<EmptyView, EmptyView, EmptyView>.inset)
             .padding(.top, 12)

From b01727a2195819433c17b63f3312a2f6e71c42f9 Mon Sep 17 00:00:00 2001
From: Brandon McAnsh <git@bmcreations.dev>
Date: Tue, 6 Oct 2026 10:53:45 -0400
Subject: [PATCH 12/45] fix(profile): move the Blocked and Muted badges into
 the action row

Under the handle they took the bio's spot. The action row's height comes
from the share button, so a badge appearing on mute or block no longer
moves the content below it. The stats card uses Metrics.boxRadius like the
app's other cards.
---
 .../Core/Screens/Main/You/YouScreen.swift     |  1 -
 .../Screens/Profile/ChatMuteStatusLabel.swift | 11 +++++---
 .../Screens/Profile/ProfileHeaderView.swift   | 16 +++---------
 .../Screens/Profile/ProfileStatsCard.swift    |  2 +-
 .../Screens/Profile/UserProfileScreen.swift   | 25 +++++++++++--------
 5 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/Flipcash/Core/Screens/Main/You/YouScreen.swift b/Flipcash/Core/Screens/Main/You/YouScreen.swift
index eee09c13c..06c400a5a 100644
--- a/Flipcash/Core/Screens/Main/You/YouScreen.swift
+++ b/Flipcash/Core/Screens/Main/You/YouScreen.swift
@@ -118,7 +118,6 @@ struct YouScreen: View {
             avatarData: sessionContainer.profileAvatars.data(for: sessionContainer.session.userID),
             avatarBlurhash: profilePicture?.thumbnailBlurhash,
             coverPicture: profile?.coverPicture,
-            statusChip: nil,
             bannerControls: { EmptyView() },
             rowActions: {
                 ProfileEditCapsule {
diff --git a/Flipcash/Core/Screens/Profile/ChatMuteStatusLabel.swift b/Flipcash/Core/Screens/Profile/ChatMuteStatusLabel.swift
index 2893a134c..63dec8c83 100644
--- a/Flipcash/Core/Screens/Profile/ChatMuteStatusLabel.swift
+++ b/Flipcash/Core/Screens/Profile/ChatMuteStatusLabel.swift
@@ -28,6 +28,9 @@ import FlipcashUI
 struct ChatMuteStatusLabel: View {
 
     let conversationID: ConversationID
+    /// Whether the label keeps its height while there is no mute. Off where the surrounding row
+    /// already fixes the height, so an empty label takes no space.
+    var reservesSpace = true
 
     @Environment(ConversationController.self) private var conversationController
 
@@ -65,8 +68,10 @@ struct ChatMuteStatusLabel: View {
             // Holds the line's height whether or not there is a mute, so the rows below don't move
             // the moment one lapses or is cleared — that reads as the screen re-laying itself out
             // rather than one fact going away. Never drawn, never read aloud.
-            chipLabel("Muted")
-                .hidden()
+            if reservesSpace {
+                chipLabel("Muted")
+                    .hidden()
+            }
 
             if let text {
                 chipLabel(text)
@@ -81,7 +86,7 @@ struct ChatMuteStatusLabel: View {
                     .id(text)
             }
         }
-        .padding(.top, 3)
+        .padding(.top, reservesSpace ? 3 : 0)
         // Springs in and fades out. Arriving is the event worth seeing — the user just chose it —
         // so it gets the overshoot; going away is either their unmute or a deadline passing, and
         // neither wants drawing attention to. Read against the new state, so each direction picks
diff --git a/Flipcash/Core/Screens/Profile/ProfileHeaderView.swift b/Flipcash/Core/Screens/Profile/ProfileHeaderView.swift
index dd08d326c..700fd9d99 100644
--- a/Flipcash/Core/Screens/Profile/ProfileHeaderView.swift
+++ b/Flipcash/Core/Screens/Profile/ProfileHeaderView.swift
@@ -21,7 +21,6 @@ struct ProfileHeaderView<BannerControls: View, RowActions: View, UnderHandle: Vi
     let avatarData: Data?
     let avatarBlurhash: String?
     let coverPicture: ProfilePicture?
-    let statusChip: AnyView?
     @ViewBuilder let bannerControls: () -> BannerControls
     @ViewBuilder let rowActions: () -> RowActions
     @ViewBuilder let underHandle: () -> UnderHandle
@@ -62,17 +61,10 @@ struct ProfileHeaderView<BannerControls: View, RowActions: View, UnderHandle: Vi
 
             if let displayName {
                 VStack(alignment: .leading, spacing: 0) {
-                    HStack(spacing: 8) {
-                        Text(displayName)
-                            .font(.appDisplaySmall)
-                            .foregroundStyle(Color.textMain)
-                            .accessibilityIdentifier("profile-name")
-
-                        if let statusChip {
-                            statusChip
-                                .fixedSize()
-                        }
-                    }
+                    Text(displayName)
+                        .font(.appDisplaySmall)
+                        .foregroundStyle(Color.textMain)
+                        .accessibilityIdentifier("profile-name")
 
                     if let handle {
                         Text(handle)
diff --git a/Flipcash/Core/Screens/Profile/ProfileStatsCard.swift b/Flipcash/Core/Screens/Profile/ProfileStatsCard.swift
index 109f14d57..85f054bf1 100644
--- a/Flipcash/Core/Screens/Profile/ProfileStatsCard.swift
+++ b/Flipcash/Core/Screens/Profile/ProfileStatsCard.swift
@@ -35,7 +35,7 @@ struct ProfileStatsCard: View {
             .frame(maxWidth: .infinity)
         }
         .frame(height: 84)
-        .background(Color.backgroundRow, in: RoundedRectangle(cornerRadius: Metrics.buttonRadius, style: .continuous))
+        .background(Color.backgroundRow, in: RoundedRectangle(cornerRadius: Metrics.boxRadius, style: .continuous))
         .padding(.horizontal, ProfileHeaderView<EmptyView, EmptyView, EmptyView>.inset)
     }
 
diff --git a/Flipcash/Core/Screens/Profile/UserProfileScreen.swift b/Flipcash/Core/Screens/Profile/UserProfileScreen.swift
index 6a29005e3..97217a0c9 100644
--- a/Flipcash/Core/Screens/Profile/UserProfileScreen.swift
+++ b/Flipcash/Core/Screens/Profile/UserProfileScreen.swift
@@ -131,9 +131,11 @@ private struct UserProfileContent: View {
                         avatarData: model.imageData,
                         avatarBlurhash: model.blurhash,
                         coverPicture: model.coverPicture,
-                        statusChip: statusChip,
                         bannerControls: { EmptyView() },
-                        rowActions: { shareButton },
+                        rowActions: {
+                            statusBadges
+                            shareButton
+                        },
                         underHandle: { EmptyView() }
                     )
 
@@ -201,19 +203,20 @@ private struct UserProfileContent: View {
         .task { await model.loadProfile() }
     }
 
-    // MARK: - Header chip -
+    // MARK: - Status badges -
 
-    private var statusChip: AnyView? {
-        if isBlocked {
-            return AnyView(
+    /// Blocked and muted are separate settings, so each gets its own badge. They sit in the action
+    /// row, whose height the share button sets, so one coming or going never moves the bio below.
+    private var statusBadges: some View {
+        HStack(spacing: 8) {
+            if isBlocked {
                 ProfileStatusChip(systemImage: "nosign", text: "Blocked", tint: .warning, fill: .warningSecondary)
                     .accessibilityIdentifier("profile-blocked-badge")
-            )
-        }
-        if let dmID {
-            return AnyView(ChatMuteStatusLabel(conversationID: dmID))
+            }
+            if let dmID {
+                ChatMuteStatusLabel(conversationID: dmID, reservesSpace: false)
+            }
         }
-        return nil
     }
 
     // MARK: - Banner controls -

From 07e09acf438de81b89270cd02aa26da22f88b425 Mon Sep 17 00:00:00 2001
From: Brandon McAnsh <git@bmcreations.dev>
Date: Tue, 6 Oct 2026 10:59:42 -0400
Subject: [PATCH 13/45] fix(profile): flat 38pt header buttons instead of glass

Share and Edit Profile now match the design (node 10961:323, 10961:335):
38pt tall, a 22pt share glyph, 18pt side padding on Edit Profile, and a
flat fill at 10% of the action colour. Over the #19191A background that
is the design's #303031. On glass the circle rendered at 34pt and the
capsule at 31pt.
---
 .../Screens/Profile/ProfileHeaderView.swift   | 32 ++++++++++++++-----
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/Flipcash/Core/Screens/Profile/ProfileHeaderView.swift b/Flipcash/Core/Screens/Profile/ProfileHeaderView.swift
index 700fd9d99..eec6a963d 100644
--- a/Flipcash/Core/Screens/Profile/ProfileHeaderView.swift
+++ b/Flipcash/Core/Screens/Profile/ProfileHeaderView.swift
@@ -92,8 +92,7 @@ struct ProfileHeaderView<BannerControls: View, RowActions: View, UnderHandle: Vi
     }
 }
 
-/// The share button in the header's action row: an icon on the app's glass circle, the same chrome
-/// as the toolbar's gear and ⋯.
+/// The share button in the header's action row: an icon on a flat filled circle.
 struct ProfileActionCircle: View {
 
     let image: Image
@@ -105,14 +104,14 @@ struct ProfileActionCircle: View {
                 .renderingMode(.template)
                 .resizable()
                 .scaledToFit()
-                .frame(width: 20, height: 20)
-                .foregroundStyle(Color.textMain)
+                .frame(width: 22, height: 22)
+                .frame(width: ProfileActionButtonStyle.height, height: ProfileActionButtonStyle.height)
         }
-        .liquidGlassButtonStyle(shape: .circle)
+        .buttonStyle(ProfileActionButtonStyle())
     }
 }
 
-/// The header's "Edit Profile" button, a glass capsule beside ``ProfileActionCircle``.
+/// The header's "Edit Profile" button, a flat filled capsule beside ``ProfileActionCircle``.
 struct ProfileEditCapsule: View {
 
     let action: () -> Void
@@ -121,8 +120,25 @@ struct ProfileEditCapsule: View {
         Button(action: action) {
             Text("Edit Profile")
                 .font(.appTextSmall)
-                .foregroundStyle(Color.textMain)
+                .padding(.horizontal, 18)
         }
-        .liquidGlassButtonStyle()
+        .buttonStyle(ProfileActionButtonStyle())
+    }
+}
+
+/// The header buttons' chrome: a capsule filled at 10% of the action colour, one step above the
+/// row tone of the stats card beneath them.
+private struct ProfileActionButtonStyle: ButtonStyle {
+
+    static var height: CGFloat { 38 }
+
+    func makeBody(configuration: Configuration) -> some View {
+        configuration.label
+            .foregroundStyle(Color.textMain)
+            .frame(height: Self.height)
+            .background(Capsule().fill(Color.action.opacity(0.1)))
+            .contentShape(Capsule())
+            .opacity(configuration.isPressed ? 0.7 : 1.0)
+            .animation(.easeInOut(duration: 0.1), value: configuration.isPressed)
     }
 }

From efcd20ad73fcc35c2f609c2cba9939d76d0f2540 Mon Sep 17 00:00:00 2001
From: Brandon McAnsh <git@bmcreations.dev>
Date: Tue, 6 Oct 2026 11:27:30 -0400
Subject: [PATCH 14/45] fix(profile): set the bio in the app's message font

appTextBody is Avenir Regular, a weight nothing else in the app uses, so
the bio read as a different typeface next to the header. Use
appTextMessage, the Medium weight chat bubbles use.
---
 Flipcash/Core/Screens/Profile/ProfileHeaderView.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Flipcash/Core/Screens/Profile/ProfileHeaderView.swift b/Flipcash/Core/Screens/Profile/ProfileHeaderView.swift
index eec6a963d..1373cc514 100644
--- a/Flipcash/Core/Screens/Profile/ProfileHeaderView.swift
+++ b/Flipcash/Core/Screens/Profile/ProfileHeaderView.swift
@@ -77,7 +77,7 @@ struct ProfileHeaderView<BannerControls: View, RowActions: View, UnderHandle: Vi
 
                     if let bio, !bio.isEmpty {
                         Text(bio)
-                            .font(.appTextBody)
+                            .font(.appTextMessage)
                             .foregroundStyle(Color.textMain)
                             .multilineTextAlignment(.leading)
                             .frame(maxWidth: .infinity, alignment: .leading)

From 02b37bd59efc35eb62add0574f264ec14b46faea Mon Sep 17 00:00:00 2001
From: Brandon McAnsh <git@bmcreations.dev>
Date: Tue, 6 Oct 2026 11:45:27 -0400
Subject: [PATCH 15/45] fix(profile): space the stats card label from its value
 to match the design

---
 Flipcash/Core/Screens/Profile/ProfileStatsCard.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Flipcash/Core/Screens/Profile/ProfileStatsCard.swift b/Flipcash/Core/Screens/Profile/ProfileStatsCard.swift
index 85f054bf1..85668f10b 100644
--- a/Flipcash/Core/Screens/Profile/ProfileStatsCard.swift
+++ b/Flipcash/Core/Screens/Profile/ProfileStatsCard.swift
@@ -40,7 +40,7 @@ struct ProfileStatsCard: View {
     }
 
     private func stat(title: String, value: String, valueFont: Font, identifier: String) -> some View {
-        VStack(alignment: .leading, spacing: 0) {
+        VStack(alignment: .leading, spacing: 6) {
             Text(title)
                 .font(.appTextCaption)
                 .foregroundStyle(Color.textSecondary)

From 56d06de054f08ef5c87e6e35ad43d5c56a2404d2 Mon Sep 17 00:00:00 2001
From: Brandon McAnsh <git@bmcreations.dev>
Date: Tue, 6 Oct 2026 12:16:25 -0400
Subject: [PATCH 16/45] fix(profile): raise toasts above the profile's pinned
 chat button

The profile hides the tab bar, so the toast host drew 12pt above the bottom
edge, over the pinned button. A screen can now mark a bottom bar with
toastClearance(_:); the host measures it and keeps the toast above it while
it is on screen.
---
 .../Screens/Profile/UserProfileScreen.swift   |  2 ++
 .../Views/Containers/ToastController.swift    | 36 ++++++++++++++++++-
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/Flipcash/Core/Screens/Profile/UserProfileScreen.swift b/Flipcash/Core/Screens/Profile/UserProfileScreen.swift
index 97217a0c9..e337c7390 100644
--- a/Flipcash/Core/Screens/Profile/UserProfileScreen.swift
+++ b/Flipcash/Core/Screens/Profile/UserProfileScreen.swift
@@ -152,6 +152,8 @@ private struct UserProfileContent: View {
         // On iOS 26 the pinned button joins the bottom scroll edge effect, so content fades under it.
         .scrollEdgeBar(.bottom) {
             pinnedButton
+                // Toasts rise above the button rather than covering it.
+                .toastClearance(toasts)
         }
         // The system bar carries back and the overflow menu, and the soft edge the banner scrolls under.
         .toolbar {
diff --git a/FlipcashUI/Sources/FlipcashUI/Views/Containers/ToastController.swift b/FlipcashUI/Sources/FlipcashUI/Views/Containers/ToastController.swift
index ca0597213..86779f72b 100644
--- a/FlipcashUI/Sources/FlipcashUI/Views/Containers/ToastController.swift
+++ b/FlipcashUI/Sources/FlipcashUI/Views/Containers/ToastController.swift
@@ -56,6 +56,10 @@ public final class ToastController {
         didSet { if isCovered { current = nil } }
     }
 
+    /// Extra room the toast keeps above the host's bottom edge, for a bar a screen pins there. Set
+    /// through ``View/toastClearance(_:)``.
+    public var bottomClearance: CGFloat = 0
+
     /// A controller with no toast showing.
     public init() {}
 
@@ -108,6 +112,36 @@ extension View {
     }
 }
 
+extension View {
+    /// Raises `controller`'s toast above this view, measured, for as long as it is on screen. Put it on
+    /// a bar a screen pins to the bottom edge, so a toast doesn't draw over it.
+    public func toastClearance(_ controller: ToastController) -> some View {
+        modifier(ToastClearance(controller: controller))
+    }
+}
+
+private struct ToastClearance: ViewModifier {
+    let controller: ToastController
+    @State private var height: CGFloat = 0
+    @State private var isVisible = false
+
+    func body(content: Content) -> some View {
+        content
+            .onGeometryChange(for: CGFloat.self, of: \.size.height) { newValue in
+                height = newValue
+                if isVisible { controller.bottomClearance = newValue }
+            }
+            .onAppear {
+                isVisible = true
+                controller.bottomClearance = height
+            }
+            .onDisappear {
+                isVisible = false
+                controller.bottomClearance = 0
+            }
+    }
+}
+
 private struct ToastHost: View {
     let controller: ToastController
     let bottomPadding: CGFloat
@@ -129,7 +163,7 @@ private struct ToastHost: View {
                     onDismiss: toast.action == nil ? nil : { controller.dismiss(toast.id) }
                 )
                 .allowsHitTesting(toast.action != nil)
-                .padding(.bottom, bottomPadding)
+                .padding(.bottom, bottomPadding + controller.bottomClearance)
                 .floatingToastTransition()
                 .id(toast.slot)
                 .task(id: toast.id) {

From c84475e74cd3db658e266012e82127b12e9a8cb8 Mon Sep 17 00:00:00 2001
From: Brandon McAnsh <git@bmcreations.dev>
Date: Tue, 6 Oct 2026 12:19:44 -0400
Subject: [PATCH 17/45] fix(toast): rise a fixed 56pt when no tab bar shows

The entrance moved the toast by its own padded height, so a toast raised
over the profile's pinned button travelled up from the screen edge past
the button. It now rises the 56pt a toast 12pt off the edge always did.
---
 .../Sources/FlipcashUI/Views/Containers/FloatingToast.swift   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/FlipcashUI/Sources/FlipcashUI/Views/Containers/FloatingToast.swift b/FlipcashUI/Sources/FlipcashUI/Views/Containers/FloatingToast.swift
index 84c654034..ed6076ead 100644
--- a/FlipcashUI/Sources/FlipcashUI/Views/Containers/FloatingToast.swift
+++ b/FlipcashUI/Sources/FlipcashUI/Views/Containers/FloatingToast.swift
@@ -151,7 +151,9 @@ private struct FloatingToastTransition: ViewModifier {
         content.transition(tabBar == nil ? Self.fromScreenEdge : Self.fromTabBar)
     }
 
-    private static let fromScreenEdge: AnyTransition = .move(edge: .bottom).combined(with: .opacity)
+    /// Rises a fixed distance rather than from the screen edge: a toast raised over a pinned bar would
+    /// otherwise travel the bar's height too. 56pt is the trip a toast 12pt off the edge always made.
+    private static let fromScreenEdge: AnyTransition = .offset(y: 56).combined(with: .opacity)
 
     /// Starts tucked behind the bar, which draws over the screen's content, and swells up out of it.
     private static let fromTabBar: AnyTransition = .modifier(

From 2d4560106cb46cfcabf88781c708020920d1821d Mon Sep 17 00:00:00 2001
From: Brandon McAnsh <git@bmcreations.dev>
Date: Tue, 6 Oct 2026 07:30:32 -0400
Subject: [PATCH 18/45] feat(profile): Edit Profile with bio and cover

---
 .../Navigation/AppRouter+Destination.swift    |  15 +-
 .../AppRouter+DestinationView.swift           |  16 ++
 .../Profile/ChangeCoverPictureScreen.swift    | 205 ++++++++++++++++++
 .../Screens/Main/Profile/EditBioModel.swift   | 127 +++++++++++
 .../Screens/Main/Profile/EditBioScreen.swift  | 104 +++++++++
 .../Main/Profile/EditProfileScreen.swift      | 179 +++++++++++++++
 .../Main/Profile/ProfileCreationState.swift   |   2 +-
 .../Main/Profile/ProfilePhotoScreen.swift     |   3 +-
 .../Profile/ProfilePictureUploading.swift     |  38 +++-
 .../Screens/Settings/SettingsScreen.swift     |  27 +--
 FlipcashTests/EditBioModelTests.swift         | 135 ++++++++++++
 .../Navigation/SettingsRoutingTests.swift     |  19 +-
 FlipcashTests/ProfileCreationStateTests.swift |  21 +-
 .../Smoke/DisplayNameSmokeTests.swift         |   6 +-
 .../Support/Screens/SettingsScreen.swift      |   7 +-
 15 files changed, 867 insertions(+), 37 deletions(-)
 create mode 100644 Flipcash/Core/Screens/Main/Profile/ChangeCoverPictureScreen.swift
 create mode 100644 Flipcash/Core/Screens/Main/Profile/EditBioModel.swift
 create mode 100644 Flipcash/Core/Screens/Main/Profile/EditBioScreen.swift
 create mode 100644 Flipcash/Core/Screens/Main/Profile/EditProfileScreen.swift
 create mode 100644 FlipcashTests/EditBioModelTests.swift

diff --git a/Flipcash/Core/Navigation/AppRouter+Destination.swift b/Flipcash/Core/Navigation/AppRouter+Destination.swift
index e64d65f6f..b032524ad 100644
--- a/Flipcash/Core/Navigation/AppRouter+Destination.swift
+++ b/Flipcash/Core/Navigation/AppRouter+Destination.swift
@@ -60,6 +60,12 @@ extension AppRouter {
         case settings
         /// The account's phone, email, user ID and public key, opened from Settings.
         case accountInfo
+        /// The signed-in user's profile fields in one list, opened from Settings.
+        case editProfile
+        /// The bio on its own, pushed from Edit Profile.
+        case editBio
+        /// The cover banner on its own, pushed from Edit Profile.
+        case changeCoverPicture
         /// The display name on its own, edited from Settings. The full
         /// profile-setup flow starts on the same screen but carries on to the
         /// tip card; this one returns to the settings list.
@@ -143,7 +149,8 @@ extension AppRouter {
                  .buyCurrency, .convertCurrency,
                  .withdrawCurrency, .usdcDepositEducation, .usdcDepositAddress:
                 return .balance
-            case .settings, .accountInfo, .changeDisplayName, .changeProfilePicture, .username,
+            case .settings, .accountInfo, .editProfile, .editBio, .changeCoverPicture,
+                 .changeDisplayName, .changeProfilePicture, .username,
                  .setMinimumTip,
                  .settingsAdvancedBetaFeatures, .settingsAppSettings, .settingsAccountSelection,
                  .settingsApplicationLogs, .blockedUsers, .accessKey, .withdraw:
@@ -180,6 +187,9 @@ extension AppRouter {
             case .usdcDepositAddress:           "usdcDepositAddress"
             case .settings:                     "settings"
             case .accountInfo:                  "accountInfo"
+            case .editProfile:                  "editProfile"
+            case .editBio:                      "editBio"
+            case .changeCoverPicture:           "changeCoverPicture"
             case .changeDisplayName:            "changeDisplayName"
             case .changeProfilePicture:         "changeProfilePicture"
             case .username:                     "username"
@@ -245,7 +255,8 @@ extension AppRouter {
             case .activity,
                  .discoverCurrencies, .currencyCreationSummary, .currencyCreationWizard,
                  .usdcDepositEducation, .usdcDepositAddress,
-                 .settings, .accountInfo, .changeDisplayName, .changeProfilePicture,
+                 .settings, .accountInfo, .editProfile, .editBio, .changeCoverPicture,
+                 .changeDisplayName, .changeProfilePicture,
                  .settingsAdvancedBetaFeatures, .settingsAppSettings, .settingsAccountSelection,
                  .settingsApplicationLogs, .blockedUsers, .accessKey, .withdraw,
                  .profileName, .profilePhoto, .tipcard, .usernameLookup, .newChat, .newPublicGroup,
diff --git a/Flipcash/Core/Navigation/AppRouter+DestinationView.swift b/Flipcash/Core/Navigation/AppRouter+DestinationView.swift
index 0951a5d72..69d74a4f1 100644
--- a/Flipcash/Core/Navigation/AppRouter+DestinationView.swift
+++ b/Flipcash/Core/Navigation/AppRouter+DestinationView.swift
@@ -87,6 +87,22 @@ struct DestinationView: View {
         case .accountInfo:
             AccountInfoScreen()
 
+        case .editProfile:
+            EditProfileScreen()
+
+        case .editBio:
+            // Seeded here so the field opens on the bio it is about to replace.
+            let session = sessionContainer.session
+            let flipClient = container.flipClient
+            EditBioScreen(model: EditBioModel(
+                bio: session.profile?.bio ?? "",
+                saving: { try await flipClient.setBio($0, owner: session.ownerKeyPair) },
+                refresh: { try await session.updateProfile() }
+            ))
+
+        case .changeCoverPicture:
+            ChangeCoverPictureScreen()
+
         case .changeDisplayName:
             ChangeDisplayNameScreen(currentName: sessionContainer.session.profile?.displayName ?? "")
 
diff --git a/Flipcash/Core/Screens/Main/Profile/ChangeCoverPictureScreen.swift b/Flipcash/Core/Screens/Main/Profile/ChangeCoverPictureScreen.swift
new file mode 100644
index 000000000..2feb75da8
--- /dev/null
+++ b/Flipcash/Core/Screens/Main/Profile/ChangeCoverPictureScreen.swift
@@ -0,0 +1,205 @@
+//
+//  ChangeCoverPictureScreen.swift
+//  Flipcash
+//
+
+import SwiftUI
+import UniformTypeIdentifiers
+import FlipcashCore
+import FlipcashUI
+
+private let logger = Logger(label: "flipcash.profile-cover")
+
+/// A 3:1 banner: the image when there is one, otherwise a flat fill in the profile-card colour.
+struct CoverBanner: View {
+
+    /// The cover to draw, or nil to draw ``fill``.
+    let image: UIImage?
+    /// What an empty cover is filled with.
+    let fill: Color
+
+    var body: some View {
+        Color.clear
+            .aspectRatio(3, contentMode: .fit)
+            .overlay {
+                if let image {
+                    Image(uiImage: image)
+                        .resizable()
+                        .scaledToFill()
+                } else {
+                    fill
+                }
+            }
+            .clipped()
+    }
+
+    /// The fill for an empty cover: the card colour the user chose, or the card tone when unset.
+    static func fill(for profile: Profile?) -> Color {
+        profile?.tipCardCustomization.flatMap { Color(hex: $0.colorHex) } ?? Color.backgroundRow
+    }
+}
+
+/// Changing the cover banner on its own, pushed from Edit Profile. Owns its upload state so a
+/// cover can never resume an avatar blob.
+struct ChangeCoverPictureScreen: View {
+
+    @Environment(Container.self) private var container
+    @Environment(SessionContainer.self) private var sessionContainer
+    @Environment(AppRouter.self) private var router
+
+    @State private var state = ProfileCreationState()
+    @State private var isShowingPhotoPicker = false
+    @State private var isShowingFilePicker = false
+    @State private var dialog: DialogItem?
+    @State private var buttonState: ButtonState = .normal
+
+    private var session: Session { sessionContainer.session }
+    private var profile: Profile? { session.profile }
+
+    private var currentCover: UIImage? {
+        sessionContainer.profileAvatars
+            .data(for: .cover(session.userID))
+            .flatMap(UIImage.init(data:))
+    }
+
+    var body: some View {
+        Background(color: .backgroundMain) {
+            VStack(spacing: 0) {
+                Menu {
+                    Button("Photo Library", systemImage: "photo.on.rectangle") { isShowingPhotoPicker = true }
+                    Button("Choose File", systemImage: "folder") { isShowingFilePicker = true }
+                } label: {
+                    CoverBanner(image: state.selectedImage ?? currentCover, fill: CoverBanner.fill(for: profile))
+                        .clipShape(RoundedRectangle(cornerRadius: Metrics.boxRadius))
+                        .overlay {
+                            if state.selectedImage == nil && currentCover == nil {
+                                Image(systemName: "plus")
+                                    .font(.system(size: 40, weight: .light))
+                                    .foregroundStyle(Color.textSecondary)
+                            }
+                        }
+                }
+                .menuIndicator(.hidden)
+                .disabled(state.isUploading)
+                .accessibilityIdentifier("cover-picker")
+                .padding(.top, 20)
+
+                Spacer()
+
+                Button(action: submit) {
+                    ButtonStateLabel("Save", state: buttonState)
+                }
+                .buttonStyle(.filled)
+                .disabled(!state.canSubmitPhoto || !buttonState.isNormal)
+                .accessibilityIdentifier("cover-save")
+                .padding(.bottom, 20)
+            }
+            .padding(.horizontal, 20)
+            .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
+        }
+        .navigationTitle("Cover")
+        .navigationBarTitleDisplayMode(.inline)
+        .dialog(item: $dialog)
+        .fullScreenCover(isPresented: $isShowingPhotoPicker) {
+            ImagePickerWithEditor(
+                onImagePicked: state.select,
+                onDismiss: { isShowingPhotoPicker = false }
+            )
+            .ignoresSafeArea()
+        }
+        .fileImporter(
+            isPresented: $isShowingFilePicker,
+            allowedContentTypes: [.image],
+            allowsMultipleSelection: false,
+            onCompletion: handleFileImport
+        )
+        .task(id: state.uploadAttemptID) {
+            guard state.hasPendingUpload else { return }
+            await upload()
+        }
+        // Keyed on the blob so the cover this screen just uploaded is what the banner ends up drawing.
+        .task(id: profile?.coverPicture?.blobID) {
+            await sessionContainer.profileAvatars.load(.cover(session.userID), picture: profile?.coverPicture)
+        }
+    }
+
+    private func submit() {
+        state.beginUpload()
+    }
+
+    private func upload() async {
+        buttonState = .loading
+        do {
+            try await state.uploadPhoto(
+                with: SessionProfilePictureUploader(
+                    session: session,
+                    flipClient: container.flipClient,
+                    slot: .cover
+                )
+            )
+
+            buttonState = .success
+            try? await Task.delay(milliseconds: 500)
+            guard !Task.isCancelled else { return }
+
+            state.releaseSelectedImage()
+            router.popTopmost()
+
+        } catch let error as ErrorBlob {
+            buttonState = .normal
+            guard !Task.isCancelled else { return }
+            logger.info("Cover upload failed", metadata: ["error": "\(error)"])
+            ErrorReporting.captureError(error, reason: "Cover upload failed", userFacing: true)
+            dialog = .profilePictureFailed(error)
+
+        } catch let error as ImageEncoderError {
+            buttonState = .normal
+            logger.error("Failed to encode the cover", metadata: ["error": "\(error)"])
+            ErrorReporting.captureError(error, reason: "Failed to encode the cover")
+            dialog = .imageProcessingFailed
+
+        } catch {
+            buttonState = .normal
+            guard !Task.isCancelled else { return }
+            logger.error("Failed to set cover picture", metadata: ["error": "\(error)"])
+            ErrorReporting.captureError(error, reason: "Failed to set cover picture")
+            dialog = .error(
+                title: "Couldn't Upload Your Cover",
+                subtitle: "Try again"
+            )
+        }
+    }
+
+    private func handleFileImport(_ result: Result<[URL], Error>) {
+        switch result {
+        case .failure(let error):
+            logger.info("Cover file import failed", metadata: ["error": "\(error)"])
+
+        case .success(let urls):
+            guard let url = urls.first else { return }
+            importImage(at: url)
+        }
+    }
+
+    private func importImage(at url: URL) {
+        Task {
+            guard url.startAccessingSecurityScopedResource() else { return }
+            defer { url.stopAccessingSecurityScopedResource() }
+
+            let image = await Task.detached(priority: .userInitiated) { () -> UIImage? in
+                guard let data = try? Data(contentsOf: url) else { return nil }
+                return UIImage(data: data)
+            }.value
+
+            guard let image else {
+                dialog = .error(
+                    title: "Couldn't Open That File",
+                    subtitle: "Try a different image"
+                )
+                return
+            }
+
+            state.select(image)
+        }
+    }
+}
diff --git a/Flipcash/Core/Screens/Main/Profile/EditBioModel.swift b/Flipcash/Core/Screens/Main/Profile/EditBioModel.swift
new file mode 100644
index 000000000..9168d96d5
--- /dev/null
+++ b/Flipcash/Core/Screens/Main/Profile/EditBioModel.swift
@@ -0,0 +1,127 @@
+//
+//  EditBioModel.swift
+//  Flipcash
+//
+
+import SwiftUI
+import FlipcashCore
+import FlipcashUI
+
+private let logger = Logger(label: "flipcash.edit-bio")
+
+/// The bio editor's state and its one save.
+///
+/// The calls are injected: `FlipClient` is a concrete class with a live gRPC channel, so a test
+/// has nothing to fake.
+@MainActor
+@Observable
+final class EditBioModel {
+
+    /// What the server refused the bio for, shown under the field. Cleared by the next edit.
+    enum FieldError: Equatable {
+        case moderated
+        case invalid
+
+        var message: String {
+            switch self {
+            case .moderated: "This bio isn't allowed. Try different wording"
+            case .invalid:   "This bio isn't valid"
+            }
+        }
+    }
+
+    /// Where the save is. `.saved` is held by the screen for its checkmark before it pops.
+    enum SaveState: Equatable {
+        case normal
+        case saving
+        case saved
+    }
+
+    static let maxLength = 160
+
+    /// The bio as typed. Editing it clears ``fieldError``.
+    var text: String {
+        didSet {
+            guard text != oldValue else { return }
+            fieldError = nil
+        }
+    }
+
+    private(set) var state: SaveState = .normal
+    private(set) var fieldError: FieldError?
+
+    /// A failure with no field to blame, shown as a dialog. Set to nil once shown.
+    var failure: Error?
+
+    @ObservationIgnored private let initialText: String
+    @ObservationIgnored private let validator = LengthValidator(maxLength: maxLength)
+    @ObservationIgnored private let saving: (String) async throws -> Void
+    @ObservationIgnored private let refresh: () async throws -> Void
+
+    /// - Parameters:
+    ///   - bio: the bio the profile carries now.
+    ///   - saving: submits the trimmed bio.
+    ///   - refresh: re-reads the profile so the rest of the app sees the new bio.
+    init(
+        bio: String,
+        saving: @escaping (String) async throws -> Void,
+        refresh: @escaping () async throws -> Void
+    ) {
+        self.text = bio
+        self.initialText = bio
+        self.saving = saving
+        self.refresh = refresh
+    }
+
+    /// How many more characters fit, negative once over the limit.
+    var remaining: Int {
+        Self.maxLength - text.count
+    }
+
+    /// Whether Save is enabled. Clearing the bio to empty is a change like any other.
+    var canSave: Bool {
+        state == .normal && submission != nil && submission != Self.trim(initialText)
+    }
+
+    /// The bio as it would be submitted, or nil while it is over the limit. Empty is valid, unlike
+    /// for `LengthValidator`, which rejects blank input: clearing the bio is an edit.
+    private var submission: String? {
+        let trimmed = Self.trim(text)
+        return trimmed.isEmpty ? trimmed : validator.validate(trimmed)
+    }
+
+    private static func trim(_ string: String) -> String {
+        string.trimmingCharacters(in: .whitespacesAndNewlines)
+    }
+
+    /// Submits the bio, then re-reads the profile. Failures land in ``fieldError`` or ``failure``.
+    func save() async {
+        guard canSave, let submission else { return }
+
+        state = .saving
+        fieldError = nil
+
+        do {
+            try await saving(submission)
+            try await refresh()
+            state = .saved
+
+        } catch ErrorProfile.moderated(let category) {
+            state = .normal
+            logger.info("Bio moderation denied", metadata: ["category": "\(category)"])
+            fieldError = .moderated
+
+        } catch ErrorProfile.invalidBio {
+            state = .normal
+            logger.info("Bio rejected as invalid")
+            fieldError = .invalid
+
+        } catch {
+            state = .normal
+            guard !Task.isCancelled else { return }
+            logger.error("Failed to set bio", metadata: ["error": "\(error)"])
+            ErrorReporting.captureError(error, reason: "Failed to set bio")
+            failure = error
+        }
+    }
+}
diff --git a/Flipcash/Core/Screens/Main/Profile/EditBioScreen.swift b/Flipcash/Core/Screens/Main/Profile/EditBioScreen.swift
new file mode 100644
index 000000000..71c5a4463
--- /dev/null
+++ b/Flipcash/Core/Screens/Main/Profile/EditBioScreen.swift
@@ -0,0 +1,104 @@
+//
+//  EditBioScreen.swift
+//  Flipcash
+//
+
+import SwiftUI
+import FlipcashCore
+import FlipcashUI
+
+/// Editing the bio on its own, pushed from Edit Profile.
+struct EditBioScreen: View {
+
+    @Environment(AppRouter.self) private var router
+
+    @State private var model: EditBioModel
+    @State private var dialog: DialogItem?
+    @State private var saveTask: Task<Void, Never>?
+
+    @FocusState private var isFocused: Bool
+
+    /// Takes the model rather than building it, so the field opens on the bio it is about to
+    /// replace instead of animating it in over the push.
+    init(model: EditBioModel) {
+        _model = State(initialValue: model)
+    }
+
+    private var buttonState: ButtonState {
+        switch model.state {
+        case .normal: .normal
+        case .saving: .loading
+        case .saved:  .success
+        }
+    }
+
+    var body: some View {
+        @Bindable var model = model
+
+        Background(color: .backgroundMain) {
+            VStack(alignment: .leading, spacing: 0) {
+                TextField("Add a bio", text: $model.text, axis: .vertical)
+                    .font(.appDisplayXS)
+                    .foregroundStyle(Color.textMain)
+                    .lineLimit(3...8)
+                    .focused($isFocused)
+                    .disabled(model.state != .normal)
+                    .accessibilityIdentifier("edit-bio-field")
+                    .padding(.top, 20)
+
+                Text("\(model.remaining)")
+                    .font(.appTextSmall)
+                    .foregroundStyle(model.remaining < 0 ? Color.textError : Color.textSecondary)
+                    .frame(maxWidth: .infinity, alignment: .trailing)
+                    .padding(.top, 8)
+                    .accessibilityIdentifier("edit-bio-counter")
+
+                if let fieldError = model.fieldError {
+                    Text(fieldError.message)
+                        .font(.appTextSmall)
+                        .foregroundStyle(Color.textError)
+                        .padding(.top, 8)
+                        .accessibilityIdentifier("edit-bio-error")
+                }
+
+                Spacer()
+
+                Button(action: save) {
+                    ButtonStateLabel("Save", state: buttonState)
+                }
+                .buttonStyle(.filled)
+                .disabled(!model.canSave)
+                .accessibilityIdentifier("edit-bio-save")
+                .padding(.bottom, 20)
+            }
+            .padding(.horizontal, 20)
+            .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)
+        }
+        .navigationTitle("Bio")
+        .navigationBarTitleDisplayMode(.inline)
+        .dialog(item: $dialog)
+        .onAppear { isFocused = true }
+        .onChange(of: model.failure == nil) { _, isNil in
+            guard !isNil else { return }
+            model.failure = nil
+            dialog = .error(title: "Couldn't Save Your Bio", subtitle: "Try again")
+        }
+        // Leaving the screen abandons the submission: its only continuation is a pop.
+        .onDisappear { saveTask?.cancel() }
+    }
+
+    private func save() {
+        guard saveTask == nil else { return }
+        isFocused = false
+        saveTask = Task {
+            await model.save()
+            if model.state == .saved {
+                // Same beat the other editors hold their checkmark for.
+                try? await Task.delay(milliseconds: 500)
+                guard !Task.isCancelled else { return }
+                router.popTopmost()
+            }
+            saveTask = nil
+        }
+    }
+}
diff --git a/Flipcash/Core/Screens/Main/Profile/EditProfileScreen.swift b/Flipcash/Core/Screens/Main/Profile/EditProfileScreen.swift
new file mode 100644
index 000000000..31c48b53f
--- /dev/null
+++ b/Flipcash/Core/Screens/Main/Profile/EditProfileScreen.swift
@@ -0,0 +1,179 @@
+//
+//  EditProfileScreen.swift
+//  Flipcash
+//
+
+import SwiftUI
+import FlipcashCore
+import FlipcashUI
+
+/// The signed-in user's profile fields in one list: cover, photo, then a row per field showing
+/// its current value. Pushed from Settings.
+struct EditProfileScreen: View {
+
+    @Environment(AppRouter.self) private var router
+    @Environment(SessionContainer.self) private var sessionContainer
+
+    @State private var dialog: DialogItem?
+
+    private static let avatarSize: CGFloat = 96
+    private static let rowInsets = EdgeInsets(top: 20, leading: 20, bottom: 20, trailing: 20)
+
+    private var session: Session { sessionContainer.session }
+    private var profile: Profile? { session.profile }
+
+    private var avatarImage: UIImage? {
+        sessionContainer.profileAvatars
+            .data(for: session.userID)
+            .flatMap(UIImage.init(data:))
+    }
+
+    private var coverImage: UIImage? {
+        sessionContainer.profileAvatars
+            .data(for: .cover(session.userID))
+            .flatMap(UIImage.init(data:))
+    }
+
+    /// Whether the handle still needs claiming: none yet, or one the server assigned.
+    private var needsUsernameClaim: Bool {
+        usernameNeedsClaim(
+            username: profile?.username,
+            isAutoAssigned: profile?.isUsernameAutoAssigned == true
+        )
+    }
+
+    var body: some View {
+        Background(color: .backgroundMain) {
+            ScrollView(showsIndicators: false) {
+                VStack(alignment: .leading, spacing: 0) {
+                    header
+                    fieldRows
+                }
+                .padding(.bottom, 24)
+            }
+        }
+        .navigationTitle("Edit Profile")
+        .toolbarTitleDisplayMode(.inline)
+        .dialog(item: $dialog)
+        .task(id: profile?.coverPicture?.blobID) {
+            await sessionContainer.profileAvatars.load(.cover(session.userID), picture: profile?.coverPicture)
+        }
+        .task(id: profile?.profilePicture?.thumbnailBlobID) {
+            await sessionContainer.profileAvatars.load(userID: session.userID, picture: profile?.profilePicture)
+        }
+    }
+
+    // MARK: - Header -
+
+    private var header: some View {
+        ZStack(alignment: .bottomLeading) {
+            Button {
+                router.push(.changeCoverPicture)
+            } label: {
+                CoverBanner(image: coverImage, fill: CoverBanner.fill(for: profile))
+            }
+            .buttonStyle(.plain)
+            .accessibilityIdentifier("edit-profile-cover")
+            .padding(.bottom, Self.avatarSize / 2)
+
+            Button {
+                router.push(.changeProfilePicture)
+            } label: {
+                CircleImage(image: avatarImage, size: Self.avatarSize, plusSize: 36)
+                    .overlay(Circle().stroke(Color.backgroundMain, lineWidth: 4))
+            }
+            .buttonStyle(.plain)
+            .accessibilityIdentifier("edit-profile-photo")
+            .padding(.leading, 20)
+        }
+        .padding(.bottom, 8)
+    }
+
+    // MARK: - Rows -
+
+    @ViewBuilder
+    private var fieldRows: some View {
+        FieldRow(title: "Display Name", value: nonEmpty(profile?.displayName), placeholder: "Add a name", insets: Self.rowInsets) {
+            router.push(.changeDisplayName)
+        }
+        .accessibilityIdentifier("edit-profile-name")
+
+        usernameRow
+
+        FieldRow(title: "Bio", value: nonEmpty(profile?.bio), placeholder: "Add a bio", insets: Self.rowInsets) {
+            router.push(.editBio)
+        }
+        .accessibilityIdentifier("edit-profile-bio")
+
+        FieldRow(title: "Minimum to Chat", value: minimumToChat, placeholder: "Not set", insets: Self.rowInsets) {
+            router.push(.setMinimumTip(isSetupStep: false))
+        }
+        .accessibilityIdentifier("edit-profile-minimum")
+    }
+
+    @ViewBuilder
+    private var usernameRow: some View {
+        if needsUsernameClaim {
+            FieldRow(title: "Username", value: "Claim your username", placeholder: "", insets: Self.rowInsets, valueIsPrompt: true, action: beginUsernameClaim)
+                .accessibilityIdentifier("edit-profile-username")
+        } else if let username = profile?.username {
+            // No balance gate on a held handle: the gate exists to stop squatting at claim time,
+            // and a user who already holds one has cleared it.
+            FieldRow(title: "Username", value: "@\(username.value)", placeholder: "", insets: Self.rowInsets) {
+                router.push(.username(username))
+            }
+            .accessibilityIdentifier("edit-profile-username")
+        }
+    }
+
+    private var minimumToChat: String? {
+        profile?.minDmChatInitFee?.formatted()
+    }
+
+    private func nonEmpty(_ string: String?) -> String? {
+        guard let string, !string.isEmpty else { return nil }
+        return string
+    }
+
+    // MARK: - Username claim -
+
+    /// The same entry the You tab's progress card takes: the claim screen once the balance clears
+    /// the server's minimum, the balance dialog otherwise.
+    private func beginUsernameClaim() {
+        switch usernameGate(session: session, minimum: session.userFlags?.usernameMinBalance) {
+        case .proceed:
+            router.push(.username(profile?.username))
+        case .addMoney(let minimum, _, _):
+            dialog = .usernameMinimumBalance(minimum: minimum) {
+                router.presentAddMoney(.general, source: .usernameShortfall)
+            }
+        }
+    }
+}
+
+/// A tappable row with the field's title and its current value, one line, trailing.
+private struct FieldRow: View {
+
+    let title: String
+    let value: String?
+    let placeholder: String
+    let insets: EdgeInsets
+    var valueIsPrompt = false
+    let action: VoidAction
+
+    var body: some View {
+        Row(insets: insets, accessory: .chevron) {
+            Text(title)
+                .font(.appDisplayXS)
+                .foregroundStyle(Color.textMain)
+            Spacer(minLength: 12)
+            Text(value ?? placeholder)
+                .font(.appTextMedium)
+                .foregroundStyle(value == nil || valueIsPrompt ? Color.textSecondary : Color.textMain)
+                .lineLimit(1)
+                .truncationMode(.tail)
+        } action: {
+            action()
+        }
+    }
+}
diff --git a/Flipcash/Core/Screens/Main/Profile/ProfileCreationState.swift b/Flipcash/Core/Screens/Main/Profile/ProfileCreationState.swift
index 5ffacefaf..def99b9b8 100644
--- a/Flipcash/Core/Screens/Main/Profile/ProfileCreationState.swift
+++ b/Flipcash/Core/Screens/Main/Profile/ProfileCreationState.swift
@@ -115,7 +115,7 @@ final class ProfileCreationState {
             throw ErrorBlob.rejected(reason)
         }
 
-        try await uploader.setProfilePicture(blobID: blobID)
+        try await uploader.attach(blobID: blobID)
         try await uploader.refreshProfile()
     }
 
diff --git a/Flipcash/Core/Screens/Main/Profile/ProfilePhotoScreen.swift b/Flipcash/Core/Screens/Main/Profile/ProfilePhotoScreen.swift
index 71b33b779..2b2df4ce1 100644
--- a/Flipcash/Core/Screens/Main/Profile/ProfilePhotoScreen.swift
+++ b/Flipcash/Core/Screens/Main/Profile/ProfilePhotoScreen.swift
@@ -153,7 +153,8 @@ struct ProfilePhotoScreen: View {
             try await state.uploadPhoto(
                 with: SessionProfilePictureUploader(
                     session: sessionContainer.session,
-                    flipClient: container.flipClient
+                    flipClient: container.flipClient,
+                    slot: .avatar
                 )
             )
 
diff --git a/Flipcash/Core/Screens/Main/Profile/ProfilePictureUploading.swift b/Flipcash/Core/Screens/Main/Profile/ProfilePictureUploading.swift
index de7186fd8..c67143ef5 100644
--- a/Flipcash/Core/Screens/Main/Profile/ProfilePictureUploading.swift
+++ b/Flipcash/Core/Screens/Main/Profile/ProfilePictureUploading.swift
@@ -18,18 +18,27 @@ protocol ProfilePictureUploading {
     /// is refused and `ErrorBlob.timedOut` when it is still processing.
     func awaitBlobFinalization(blobID: BlobID) async throws
 
-    /// Attaches the finalized blob to the caller's profile.
-    func setProfilePicture(blobID: BlobID) async throws
+    /// Attaches the finalized blob to the profile slot this uploader targets.
+    func attach(blobID: BlobID) async throws
 
     /// Re-reads the profile so the rest of the app sees the new picture.
     func refreshProfile() async throws
 }
 
+/// Which picture on the profile an upload replaces.
+enum ProfilePictureSlot: Sendable {
+    /// The round profile picture.
+    case avatar
+    /// The banner behind it.
+    case cover
+}
+
 /// Uploads on behalf of the signed-in owner.
 struct SessionProfilePictureUploader: ProfilePictureUploading {
 
     let session: Session
     let flipClient: FlipClient
+    let slot: ProfilePictureSlot
 
     func storeBlob(_ data: Data, mimeType: String) async throws -> BlobID {
         try await flipClient.storeBlob(data, mimeType: mimeType, owner: session.ownerKeyPair)
@@ -39,8 +48,29 @@ struct SessionProfilePictureUploader: ProfilePictureUploading {
         try await flipClient.awaitBlobFinalization(blobID: blobID, owner: session.ownerKeyPair)
     }
 
-    func setProfilePicture(blobID: BlobID) async throws {
-        try await flipClient.setProfilePicture(blobID: blobID, owner: session.ownerKeyPair)
+    func attach(blobID: BlobID) async throws {
+        let owner = session.ownerKeyPair
+        try await Self.attach(
+            blobID,
+            to: slot,
+            setAvatar: { try await flipClient.setProfilePicture(blobID: $0, owner: owner) },
+            // The `refreshProfile` that follows re-reads the cover, so the echo is dropped.
+            setCover: { _ = try await flipClient.setCoverPicture(blobID: $0, owner: owner) }
+        )
+    }
+
+    /// Routes `blobID` to the call for `slot`. Closures stand in for `FlipClient`, a concrete
+    /// class with a live gRPC channel, so a test can observe the routing.
+    static func attach(
+        _ blobID: BlobID,
+        to slot: ProfilePictureSlot,
+        setAvatar: (BlobID) async throws -> Void,
+        setCover: (BlobID) async throws -> Void
+    ) async throws {
+        switch slot {
+        case .avatar: try await setAvatar(blobID)
+        case .cover:  try await setCover(blobID)
+        }
     }
 
     func refreshProfile() async throws {
diff --git a/Flipcash/Core/Screens/Settings/SettingsScreen.swift b/Flipcash/Core/Screens/Settings/SettingsScreen.swift
index 2b1c0e785..bc0f60502 100644
--- a/Flipcash/Core/Screens/Settings/SettingsScreen.swift
+++ b/Flipcash/Core/Screens/Settings/SettingsScreen.swift
@@ -56,34 +56,15 @@ struct SettingsScreen: View {
 
     // MARK: - Sections -
 
-    /// Interim: Edit Profile replaces this section.
+    /// Interim: Slice 3 removes this row once the You tab has its own Edit Profile button.
     private var profileSection: some View {
         VStack(alignment: .leading, spacing: 0) {
             SettingsSectionHeader("Profile")
 
-            SettingsRow(systemImage: "person.text.rectangle", title: "Display Name", insets: insets) {
-                router.push(.changeDisplayName)
+            SettingsRow(systemImage: "person.text.rectangle", title: "Edit Profile", insets: insets) {
+                router.push(.editProfile)
             }
-
-            // No balance gate here: the gate exists to stop squatting at claim time. A user who
-            // already holds a handle has cleared it, and re-gating a change would hold their
-            // handle hostage to a balance that has since moved.
-            if let username = session.profile?.username {
-                SettingsRow(systemImage: "at", title: "Username", insets: insets) {
-                    router.push(.username(username))
-                }
-                .accessibilityIdentifier("account-change-username-row")
-            }
-
-            SettingsRow(asset: .profilePicture, title: "Profile Picture", insets: insets) {
-                router.push(.changeProfilePicture)
-            }
-            .accessibilityIdentifier("account-profile-picture-row")
-
-            SettingsRow(asset: .coins, title: "Minimum To Chat", insets: insets) {
-                router.push(.setMinimumTip(isSetupStep: false))
-            }
-            .accessibilityIdentifier("account-minimum-tip-row")
+            .accessibilityIdentifier("settings-edit-profile")
         }
     }
 
diff --git a/FlipcashTests/EditBioModelTests.swift b/FlipcashTests/EditBioModelTests.swift
new file mode 100644
index 000000000..802858171
--- /dev/null
+++ b/FlipcashTests/EditBioModelTests.swift
@@ -0,0 +1,135 @@
+//
+//  EditBioModelTests.swift
+//  FlipcashTests
+//
+
+import Testing
+import FlipcashAPI
+import FlipcashCore
+@testable import Flipcash
+
+@MainActor
+@Suite("EditBioModel")
+struct EditBioModelTests {
+
+    private struct Boom: Error {}
+
+    @MainActor
+    private final class Calls {
+        var saved: [String] = []
+        var refreshCount = 0
+        var order: [String] = []
+    }
+
+    private func makeModel(
+        bio: String = "Hello",
+        calls: Calls = Calls(),
+        saving: ((String) async throws -> Void)? = nil
+    ) -> EditBioModel {
+        EditBioModel(
+            bio: bio,
+            saving: { text in
+                calls.order.append("save")
+                calls.saved.append(text)
+                try await saving?(text)
+            },
+            refresh: {
+                calls.order.append("refresh")
+                calls.refreshCount += 1
+            }
+        )
+    }
+
+    @Test("The text starts as the current bio and the counter counts down from 160")
+    func initialState() {
+        let model = makeModel(bio: "Hello")
+
+        #expect(model.text == "Hello")
+        #expect(model.remaining == 155)
+    }
+
+    @Test("Save is shut while unchanged or over the limit, open when cleared")
+    func canSave() {
+        let model = makeModel(bio: "Hello")
+        #expect(!model.canSave)
+
+        model.text = "Hello there"
+        #expect(model.canSave)
+
+        model.text = String(repeating: "a", count: 161)
+        #expect(model.remaining == -1)
+        #expect(!model.canSave)
+
+        model.text = String(repeating: "a", count: 160)
+        #expect(model.canSave)
+
+        model.text = ""
+        #expect(model.canSave)
+    }
+
+    @Test("A successful save sends the trimmed text, then refreshes, then reports saved")
+    func saveSucceeds() async {
+        let calls = Calls()
+        let model = makeModel(calls: calls)
+        model.text = "  New bio \n"
+
+        await model.save()
+
+        #expect(calls.saved == ["New bio"])
+        #expect(calls.order == ["save", "refresh"])
+        #expect(model.state == .saved)
+        #expect(model.fieldError == nil)
+        #expect(model.failure == nil)
+    }
+
+    @Test("Moderation shows an inline error and keeps the text")
+    func moderated() async {
+        let calls = Calls()
+        let model = makeModel(calls: calls) { _ in throw ErrorProfile.moderated(.init()) }
+        model.text = "flagged"
+
+        await model.save()
+
+        #expect(model.state == .normal)
+        #expect(model.fieldError == .moderated)
+        #expect(model.text == "flagged")
+        #expect(model.failure == nil)
+        #expect(calls.refreshCount == 0)
+    }
+
+    @Test("An invalid bio shows an inline error and keeps the text")
+    func invalid() async {
+        let model = makeModel { _ in throw ErrorProfile.invalidBio }
+        model.text = "bad"
+
+        await model.save()
+
+        #expect(model.state == .normal)
+        #expect(model.fieldError == .invalid)
+        #expect(model.text == "bad")
+    }
+
+    @Test("Any other error has no field to blame and raises a failure")
+    func otherError() async {
+        let model = makeModel { _ in throw Boom() }
+        model.text = "something"
+
+        await model.save()
+
+        #expect(model.state == .normal)
+        #expect(model.fieldError == nil)
+        #expect(model.failure != nil)
+    }
+
+    @Test("Editing the text clears the inline error")
+    func editingClearsFieldError() async {
+        let model = makeModel { _ in throw ErrorProfile.invalidBio }
+        model.text = "bad"
+        await model.save()
+        #expect(model.fieldError == .invalid)
+
+        model.text = "better"
+
+        #expect(model.fieldError == nil)
+    }
+}
diff --git a/FlipcashTests/Navigation/SettingsRoutingTests.swift b/FlipcashTests/Navigation/SettingsRoutingTests.swift
index 72ef20b3d..e16994558 100644
--- a/FlipcashTests/Navigation/SettingsRoutingTests.swift
+++ b/FlipcashTests/Navigation/SettingsRoutingTests.swift
@@ -10,9 +10,12 @@ import Testing
 @Suite("Settings routing")
 struct SettingsRoutingTests {
 
-    @Test("Settings and Account Info are owned by the You stack", arguments: [
+    @Test("Settings, Account Info and the profile editors are owned by the You stack", arguments: [
         AppRouter.Destination.settings,
         AppRouter.Destination.accountInfo,
+        AppRouter.Destination.editProfile,
+        AppRouter.Destination.editBio,
+        AppRouter.Destination.changeCoverPicture,
     ])
     func owningStack(destination: AppRouter.Destination) {
         #expect(destination.owningStack == .you)
@@ -28,6 +31,20 @@ struct SettingsRoutingTests {
         #expect(router[.you] == AppRouter.navigationPath(.settings))
     }
 
+    @Test("Popping Edit Bio after a save returns to Edit Profile")
+    func savePopsBackToEditProfile() {
+        let router = AppRouter()
+
+        router.activeTabStack = .you
+        router.push(.editProfile)
+        router.push(.editBio)
+        #expect(router[.you] == AppRouter.navigationPath(.editProfile, .editBio))
+
+        router.popTopmost()
+
+        #expect(router[.you] == AppRouter.navigationPath(.editProfile))
+    }
+
     @Test("Log names are stable and carry no payload")
     func logNames() {
         #expect(AppRouter.Destination.settings.description == "settings")
diff --git a/FlipcashTests/ProfileCreationStateTests.swift b/FlipcashTests/ProfileCreationStateTests.swift
index d362d9d39..574b37895 100644
--- a/FlipcashTests/ProfileCreationStateTests.swift
+++ b/FlipcashTests/ProfileCreationStateTests.swift
@@ -101,6 +101,25 @@ struct ProfileCreationStateTests {
         #expect(state.selectedImage == nil)
     }
 
+    @Test("The cover slot attaches through the cover call, the avatar slot through the avatar call")
+    func slotRoutesAttach() async throws {
+        let blobID = BlobID(data: Data(repeating: 7, count: 16))
+        var calls: [String] = []
+
+        try await SessionProfilePictureUploader.attach(
+            blobID, to: .cover,
+            setAvatar: { _ in calls.append("avatar") },
+            setCover: { id in #expect(id == blobID); calls.append("cover") }
+        )
+        try await SessionProfilePictureUploader.attach(
+            blobID, to: .avatar,
+            setAvatar: { id in #expect(id == blobID); calls.append("avatar") },
+            setCover: { _ in calls.append("cover") }
+        )
+
+        #expect(calls == ["cover", "avatar"])
+    }
+
     @Test("Uploading without a photo fails before reserving anything")
     func uploadingWithoutAPhotoDoesNotReserve() async throws {
         let uploader = StubUploader()
@@ -172,7 +191,7 @@ private final class StubUploader: ProfilePictureUploading {
         try finalization.get()
     }
 
-    func setProfilePicture(blobID: BlobID) async throws {
+    func attach(blobID: BlobID) async throws {
         setPictureCount += 1
     }
 
diff --git a/FlipcashUITests/Smoke/DisplayNameSmokeTests.swift b/FlipcashUITests/Smoke/DisplayNameSmokeTests.swift
index 6627dee1b..9f0e37f22 100644
--- a/FlipcashUITests/Smoke/DisplayNameSmokeTests.swift
+++ b/FlipcashUITests/Smoke/DisplayNameSmokeTests.swift
@@ -54,6 +54,7 @@ final class DisplayNameSmokeTests: BaseUITestCase {
 
         // MARK: Change the name from Settings.
         waitAndTap(settings.gear)
+        waitAndTap(settings.editProfileRow)
         waitAndTap(settings.displayNameRow)
 
         let save = app.buttons["profile-name-next-button"]
@@ -103,17 +104,18 @@ final class DisplayNameSmokeTests: BaseUITestCase {
         // `ProfileNameScreen(completion: .back)` pops itself only once
         // `SetDisplayName` returns, so landing back on Settings is proof the
         // new name was accepted and moderated — a rejection keeps the editor up
-        // behind a dialog. It pops just the one screen, so this is Settings
+        // behind a dialog. It pops just the one screen, so this is Edit Profile
         // rather than the You tab root.
         XCTAssertTrue(
             settings.displayNameRow.waitForExistence(timeout: 60),
-            "Expected the name editor to pop back to Settings once the name saved. On screen: [\(visibleText())]"
+            "Expected the name editor to pop back to Edit Profile once the name saved. On screen: [\(visibleText())]"
         )
 
         // MARK: The profile survives the rename.
         // Unwind the last screen by hand: the tab bar stays hidden while the
         // You tab has a stack, so there is no You button to tap back to.
         waitAndTap(app.navigationBars.buttons.firstMatch)
+        waitAndTap(app.navigationBars.buttons.firstMatch)
         assertMainScreenReached(timeout: 30, "Expected the You tab root after backing out of Settings")
         XCTAssertTrue(
             app.buttons["you-share"].waitForExistence(timeout: 30),
diff --git a/FlipcashUITests/Support/Screens/SettingsScreen.swift b/FlipcashUITests/Support/Screens/SettingsScreen.swift
index 512cc8786..db7d40556 100644
--- a/FlipcashUITests/Support/Screens/SettingsScreen.swift
+++ b/FlipcashUITests/Support/Screens/SettingsScreen.swift
@@ -30,8 +30,11 @@ struct SettingsUIScreen {
     var accessKeyRow: XCUIElement { app.buttons["Access Key"] }
     var applicationLogsRow: XCUIElement { app.buttons["Application Logs"] }
 
-    /// The Profile row that opens the display-name editor.
-    var displayNameRow: XCUIElement { app.buttons["Display Name"] }
+    /// The Profile row that opens Edit Profile.
+    var editProfileRow: XCUIElement { app.buttons["settings-edit-profile"] }
+
+    /// Edit Profile's row that opens the display-name editor.
+    var displayNameRow: XCUIElement { app.buttons["edit-profile-name"] }
 
     /// The Privacy row that opens the Blocked list.
     var blockedRow: XCUIElement { app.buttons["Blocked"] }

From 0f7bbf76f290980664a41873962791f548a9e66e Mon Sep 17 00:00:00 2001
From: Brandon McAnsh <git@bmcreations.dev>
Date: Tue, 6 Oct 2026 11:06:27 -0400
Subject: [PATCH 19/45] refactor(profile): open Edit Profile from the You tab
 and reuse the profile header

The You tab's Edit Profile button now pushes Edit Profile instead of
Settings, and Settings drops its interim Profile section.

Edit Profile draws its cover with ProfileCoverBanner and its avatar at
the You tab's 84pt with the same 5pt ring, so the two screens show the
same empty cover. The parked CoverBanner, with its 3:1 card-colour
fill, is removed; the cover editor previews a picked image through
ProfileCoverBanner's new preview parameter. Row insets match Settings
(25/20), values sit against the chevron, and the empty-cover plus uses
appDisplayMedium instead of a 40pt system font.
---
 .../Navigation/AppRouter+Destination.swift    |  2 +-
 .../Profile/ChangeCoverPictureScreen.swift    | 59 ++++---------------
 .../Main/Profile/EditProfileScreen.swift      | 44 ++++++--------
 .../Core/Screens/Main/You/YouScreen.swift     |  3 +-
 .../Screens/Profile/ProfileCoverBanner.swift  | 14 ++++-
 .../Screens/Profile/ProfileHeaderView.swift   |  4 +-
 .../Screens/Settings/SettingsScreen.swift     | 13 ----
 .../Smoke/DisplayNameSmokeTests.swift         |  5 +-
 .../Support/Screens/SettingsScreen.swift      |  4 +-
 9 files changed, 51 insertions(+), 97 deletions(-)

diff --git a/Flipcash/Core/Navigation/AppRouter+Destination.swift b/Flipcash/Core/Navigation/AppRouter+Destination.swift
index b032524ad..ca52e943d 100644
--- a/Flipcash/Core/Navigation/AppRouter+Destination.swift
+++ b/Flipcash/Core/Navigation/AppRouter+Destination.swift
@@ -60,7 +60,7 @@ extension AppRouter {
         case settings
         /// The account's phone, email, user ID and public key, opened from Settings.
         case accountInfo
-        /// The signed-in user's profile fields in one list, opened from Settings.
+        /// The signed-in user's profile fields in one list, opened from the You tab's Edit Profile button.
         case editProfile
         /// The bio on its own, pushed from Edit Profile.
         case editBio
diff --git a/Flipcash/Core/Screens/Main/Profile/ChangeCoverPictureScreen.swift b/Flipcash/Core/Screens/Main/Profile/ChangeCoverPictureScreen.swift
index 2feb75da8..17894f688 100644
--- a/Flipcash/Core/Screens/Main/Profile/ChangeCoverPictureScreen.swift
+++ b/Flipcash/Core/Screens/Main/Profile/ChangeCoverPictureScreen.swift
@@ -10,35 +10,6 @@ import FlipcashUI
 
 private let logger = Logger(label: "flipcash.profile-cover")
 
-/// A 3:1 banner: the image when there is one, otherwise a flat fill in the profile-card colour.
-struct CoverBanner: View {
-
-    /// The cover to draw, or nil to draw ``fill``.
-    let image: UIImage?
-    /// What an empty cover is filled with.
-    let fill: Color
-
-    var body: some View {
-        Color.clear
-            .aspectRatio(3, contentMode: .fit)
-            .overlay {
-                if let image {
-                    Image(uiImage: image)
-                        .resizable()
-                        .scaledToFill()
-                } else {
-                    fill
-                }
-            }
-            .clipped()
-    }
-
-    /// The fill for an empty cover: the card colour the user chose, or the card tone when unset.
-    static func fill(for profile: Profile?) -> Color {
-        profile?.tipCardCustomization.flatMap { Color(hex: $0.colorHex) } ?? Color.backgroundRow
-    }
-}
-
 /// Changing the cover banner on its own, pushed from Edit Profile. Owns its upload state so a
 /// cover can never resume an avatar blob.
 struct ChangeCoverPictureScreen: View {
@@ -56,12 +27,6 @@ struct ChangeCoverPictureScreen: View {
     private var session: Session { sessionContainer.session }
     private var profile: Profile? { session.profile }
 
-    private var currentCover: UIImage? {
-        sessionContainer.profileAvatars
-            .data(for: .cover(session.userID))
-            .flatMap(UIImage.init(data:))
-    }
-
     var body: some View {
         Background(color: .backgroundMain) {
             VStack(spacing: 0) {
@@ -69,15 +34,19 @@ struct ChangeCoverPictureScreen: View {
                     Button("Photo Library", systemImage: "photo.on.rectangle") { isShowingPhotoPicker = true }
                     Button("Choose File", systemImage: "folder") { isShowingFilePicker = true }
                 } label: {
-                    CoverBanner(image: state.selectedImage ?? currentCover, fill: CoverBanner.fill(for: profile))
-                        .clipShape(RoundedRectangle(cornerRadius: Metrics.boxRadius))
-                        .overlay {
-                            if state.selectedImage == nil && currentCover == nil {
-                                Image(systemName: "plus")
-                                    .font(.system(size: 40, weight: .light))
-                                    .foregroundStyle(Color.textSecondary)
-                            }
+                    ProfileCoverBanner(
+                        userID: session.userID,
+                        coverPicture: profile?.coverPicture,
+                        preview: state.selectedImage
+                    )
+                    .clipShape(RoundedRectangle(cornerRadius: Metrics.boxRadius))
+                    .overlay {
+                        if state.selectedImage == nil && profile?.coverPicture == nil {
+                            Image(systemName: "plus")
+                                .font(.appDisplayMedium)
+                                .foregroundStyle(Color.textSecondary)
                         }
+                    }
                 }
                 .menuIndicator(.hidden)
                 .disabled(state.isUploading)
@@ -117,10 +86,6 @@ struct ChangeCoverPictureScreen: View {
             guard state.hasPendingUpload else { return }
             await upload()
         }
-        // Keyed on the blob so the cover this screen just uploaded is what the banner ends up drawing.
-        .task(id: profile?.coverPicture?.blobID) {
-            await sessionContainer.profileAvatars.load(.cover(session.userID), picture: profile?.coverPicture)
-        }
     }
 
     private func submit() {
diff --git a/Flipcash/Core/Screens/Main/Profile/EditProfileScreen.swift b/Flipcash/Core/Screens/Main/Profile/EditProfileScreen.swift
index 31c48b53f..d00e1bb0d 100644
--- a/Flipcash/Core/Screens/Main/Profile/EditProfileScreen.swift
+++ b/Flipcash/Core/Screens/Main/Profile/EditProfileScreen.swift
@@ -8,7 +8,7 @@ import FlipcashCore
 import FlipcashUI
 
 /// The signed-in user's profile fields in one list: cover, photo, then a row per field showing
-/// its current value. Pushed from Settings.
+/// its current value. Pushed from the You tab's Edit Profile button.
 struct EditProfileScreen: View {
 
     @Environment(AppRouter.self) private var router
@@ -16,24 +16,11 @@ struct EditProfileScreen: View {
 
     @State private var dialog: DialogItem?
 
-    private static let avatarSize: CGFloat = 96
-    private static let rowInsets = EdgeInsets(top: 20, leading: 20, bottom: 20, trailing: 20)
+    private static let rowInsets = EdgeInsets(top: 25, leading: 20, bottom: 25, trailing: 20)
 
     private var session: Session { sessionContainer.session }
     private var profile: Profile? { session.profile }
 
-    private var avatarImage: UIImage? {
-        sessionContainer.profileAvatars
-            .data(for: session.userID)
-            .flatMap(UIImage.init(data:))
-    }
-
-    private var coverImage: UIImage? {
-        sessionContainer.profileAvatars
-            .data(for: .cover(session.userID))
-            .flatMap(UIImage.init(data:))
-    }
-
     /// Whether the handle still needs claiming: none yet, or one the server assigned.
     private var needsUsernameClaim: Bool {
         usernameNeedsClaim(
@@ -55,9 +42,6 @@ struct EditProfileScreen: View {
         .navigationTitle("Edit Profile")
         .toolbarTitleDisplayMode(.inline)
         .dialog(item: $dialog)
-        .task(id: profile?.coverPicture?.blobID) {
-            await sessionContainer.profileAvatars.load(.cover(session.userID), picture: profile?.coverPicture)
-        }
         .task(id: profile?.profilePicture?.thumbnailBlobID) {
             await sessionContainer.profileAvatars.load(userID: session.userID, picture: profile?.profilePicture)
         }
@@ -65,28 +49,35 @@ struct EditProfileScreen: View {
 
     // MARK: - Header -
 
+    /// The You tab's cover and avatar at the same sizes, each a button to its own editor.
     private var header: some View {
-        ZStack(alignment: .bottomLeading) {
+        VStack(alignment: .leading, spacing: 0) {
             Button {
                 router.push(.changeCoverPicture)
             } label: {
-                CoverBanner(image: coverImage, fill: CoverBanner.fill(for: profile))
+                ProfileCoverBanner(userID: session.userID, coverPicture: profile?.coverPicture)
             }
             .buttonStyle(.plain)
             .accessibilityIdentifier("edit-profile-cover")
-            .padding(.bottom, Self.avatarSize / 2)
 
             Button {
                 router.push(.changeProfilePicture)
             } label: {
-                CircleImage(image: avatarImage, size: Self.avatarSize, plusSize: 36)
-                    .overlay(Circle().stroke(Color.backgroundMain, lineWidth: 4))
+                ContactAvatarView(
+                    id: session.userID.uuidString,
+                    displayName: profile?.displayName ?? "",
+                    imageData: sessionContainer.profileAvatars.data(for: session.userID),
+                    blurhash: profile?.profilePicture?.thumbnailBlurhash,
+                    size: ProfileHeaderView<EmptyView, EmptyView, EmptyView>.avatarSize
+                )
+                .overlay { Circle().strokeBorder(Color.backgroundMain, lineWidth: 5) }
             }
             .buttonStyle(.plain)
             .accessibilityIdentifier("edit-profile-photo")
-            .padding(.leading, 20)
+            .padding(.top, -ProfileHeaderView<EmptyView, EmptyView, EmptyView>.avatarOverlap)
+            .padding(.leading, ProfileHeaderView<EmptyView, EmptyView, EmptyView>.inset)
+            .padding(.bottom, 8)
         }
-        .padding(.bottom, 8)
     }
 
     // MARK: - Rows -
@@ -166,12 +157,13 @@ private struct FieldRow: View {
             Text(title)
                 .font(.appDisplayXS)
                 .foregroundStyle(Color.textMain)
-            Spacer(minLength: 12)
+            // `Row` puts its own spacer before the chevron, so the value claims the width to sit against it.
             Text(value ?? placeholder)
                 .font(.appTextMedium)
                 .foregroundStyle(value == nil || valueIsPrompt ? Color.textSecondary : Color.textMain)
                 .lineLimit(1)
                 .truncationMode(.tail)
+                .frame(maxWidth: .infinity, alignment: .trailing)
         } action: {
             action()
         }
diff --git a/Flipcash/Core/Screens/Main/You/YouScreen.swift b/Flipcash/Core/Screens/Main/You/YouScreen.swift
index 06c400a5a..79f00a6fc 100644
--- a/Flipcash/Core/Screens/Main/You/YouScreen.swift
+++ b/Flipcash/Core/Screens/Main/You/YouScreen.swift
@@ -121,8 +121,7 @@ struct YouScreen: View {
             bannerControls: { EmptyView() },
             rowActions: {
                 ProfileEditCapsule {
-                    // The Edit Profile slice repoints this to `.editProfile`.
-                    router.push(.settings)
+                    router.push(.editProfile)
                 }
                 .accessibilityIdentifier("you-edit-profile")
 
diff --git a/Flipcash/Core/Screens/Profile/ProfileCoverBanner.swift b/Flipcash/Core/Screens/Profile/ProfileCoverBanner.swift
index 452582a80..2aa005f3b 100644
--- a/Flipcash/Core/Screens/Profile/ProfileCoverBanner.swift
+++ b/Flipcash/Core/Screens/Profile/ProfileCoverBanner.swift
@@ -17,6 +17,8 @@ struct ProfileCoverBanner<Controls: View>: View {
 
     let userID: UserID
     let coverPicture: ProfilePicture?
+    /// A picked image not uploaded yet, drawn in place of the stored cover.
+    var preview: UIImage? = nil
     @ViewBuilder let controls: () -> Controls
 
     static var height: CGFloat { 214 }
@@ -41,7 +43,9 @@ struct ProfileCoverBanner<Controls: View>: View {
 
     @ViewBuilder
     private var cover: some View {
-        if let coverPicture {
+        if let preview {
+            fill(preview)
+        } else if let coverPicture {
             let data = sessionContainer.profileAvatars.data(for: .cover(userID))
             if let data, let image = ContactAvatarCache.shared.image(forKey: "cover-\(coverPicture.blobID)", data: data) {
                 fill(image)
@@ -61,3 +65,11 @@ struct ProfileCoverBanner<Controls: View>: View {
             .scaledToFill()
     }
 }
+
+extension ProfileCoverBanner where Controls == EmptyView {
+
+    /// A cover with nothing laid over it.
+    init(userID: UserID, coverPicture: ProfilePicture?, preview: UIImage? = nil) {
+        self.init(userID: userID, coverPicture: coverPicture, preview: preview, controls: { EmptyView() })
+    }
+}
diff --git a/Flipcash/Core/Screens/Profile/ProfileHeaderView.swift b/Flipcash/Core/Screens/Profile/ProfileHeaderView.swift
index 1373cc514..690618fc7 100644
--- a/Flipcash/Core/Screens/Profile/ProfileHeaderView.swift
+++ b/Flipcash/Core/Screens/Profile/ProfileHeaderView.swift
@@ -27,9 +27,9 @@ struct ProfileHeaderView<BannerControls: View, RowActions: View, UnderHandle: Vi
 
     static var inset: CGFloat { 24 }
 
-    private static var avatarSize: CGFloat { 84 }
+    static var avatarSize: CGFloat { 84 }
     /// How far the avatar rises over the banner.
-    private static var avatarOverlap: CGFloat { 42 }
+    static var avatarOverlap: CGFloat { 42 }
 
     var body: some View {
         VStack(alignment: .leading, spacing: 0) {
diff --git a/Flipcash/Core/Screens/Settings/SettingsScreen.swift b/Flipcash/Core/Screens/Settings/SettingsScreen.swift
index bc0f60502..9d22abcf7 100644
--- a/Flipcash/Core/Screens/Settings/SettingsScreen.swift
+++ b/Flipcash/Core/Screens/Settings/SettingsScreen.swift
@@ -36,7 +36,6 @@ struct SettingsScreen: View {
         Background(color: .backgroundMain) {
             ScrollView(showsIndicators: false) {
                 VStack(alignment: .leading, spacing: 0) {
-                    profileSection
                     securitySection
                     privacySection
                     advancedSection
@@ -56,18 +55,6 @@ struct SettingsScreen: View {
 
     // MARK: - Sections -
 
-    /// Interim: Slice 3 removes this row once the You tab has its own Edit Profile button.
-    private var profileSection: some View {
-        VStack(alignment: .leading, spacing: 0) {
-            SettingsSectionHeader("Profile")
-
-            SettingsRow(systemImage: "person.text.rectangle", title: "Edit Profile", insets: insets) {
-                router.push(.editProfile)
-            }
-            .accessibilityIdentifier("settings-edit-profile")
-        }
-    }
-
     private var securitySection: some View {
         VStack(alignment: .leading, spacing: 0) {
             SettingsSectionHeader("Security")
diff --git a/FlipcashUITests/Smoke/DisplayNameSmokeTests.swift b/FlipcashUITests/Smoke/DisplayNameSmokeTests.swift
index 9f0e37f22..6e8b622ad 100644
--- a/FlipcashUITests/Smoke/DisplayNameSmokeTests.swift
+++ b/FlipcashUITests/Smoke/DisplayNameSmokeTests.swift
@@ -52,9 +52,8 @@ final class DisplayNameSmokeTests: BaseUITestCase {
             "Expected the Edit Profile button under the stats"
         )
 
-        // MARK: Change the name from Settings.
-        waitAndTap(settings.gear)
-        waitAndTap(settings.editProfileRow)
+        // MARK: Change the name from Edit Profile.
+        waitAndTap(settings.editProfileButton)
         waitAndTap(settings.displayNameRow)
 
         let save = app.buttons["profile-name-next-button"]
diff --git a/FlipcashUITests/Support/Screens/SettingsScreen.swift b/FlipcashUITests/Support/Screens/SettingsScreen.swift
index db7d40556..7ecf70475 100644
--- a/FlipcashUITests/Support/Screens/SettingsScreen.swift
+++ b/FlipcashUITests/Support/Screens/SettingsScreen.swift
@@ -30,8 +30,8 @@ struct SettingsUIScreen {
     var accessKeyRow: XCUIElement { app.buttons["Access Key"] }
     var applicationLogsRow: XCUIElement { app.buttons["Application Logs"] }
 
-    /// The Profile row that opens Edit Profile.
-    var editProfileRow: XCUIElement { app.buttons["settings-edit-profile"] }
+    /// The You tab button that opens Edit Profile.
+    var editProfileButton: XCUIElement { app.buttons["you-edit-profile"] }
 
     /// Edit Profile's row that opens the display-name editor.
     var displayNameRow: XCUIElement { app.buttons["edit-profile-name"] }

From c1da07f56497948e2ecc0f73af55ad85824ac64a Mon Sep 17 00:00:00 2001
From: Brandon McAnsh <git@bmcreations.dev>
Date: Tue, 6 Oct 2026 11:25:50 -0400
Subject: [PATCH 20/45] feat(profile): lay out Edit Profile as Figma's cover
 card and field cards

The cover sits in an inset card with a Change cover chip, the avatar
overlaps its edge with a camera badge, and Name, Username, Bio and
Minimum to Chat are label/value cards that open the existing editors.
---
 .../Main/Profile/EditProfileScreen.swift      | 166 +++++++++++-------
 .../Screens/Profile/ProfileCoverBanner.swift  |   8 +-
 2 files changed, 110 insertions(+), 64 deletions(-)

diff --git a/Flipcash/Core/Screens/Main/Profile/EditProfileScreen.swift b/Flipcash/Core/Screens/Main/Profile/EditProfileScreen.swift
index d00e1bb0d..3aa937a06 100644
--- a/Flipcash/Core/Screens/Main/Profile/EditProfileScreen.swift
+++ b/Flipcash/Core/Screens/Main/Profile/EditProfileScreen.swift
@@ -7,8 +7,8 @@ import SwiftUI
 import FlipcashCore
 import FlipcashUI
 
-/// The signed-in user's profile fields in one list: cover, photo, then a row per field showing
-/// its current value. Pushed from the You tab's Edit Profile button.
+/// The signed-in user's profile fields as cards under an inset cover and photo, each opening its own
+/// editor. Pushed from the You tab's Edit Profile button.
 struct EditProfileScreen: View {
 
     @Environment(AppRouter.self) private var router
@@ -16,7 +16,9 @@ struct EditProfileScreen: View {
 
     @State private var dialog: DialogItem?
 
-    private static let rowInsets = EdgeInsets(top: 25, leading: 20, bottom: 25, trailing: 20)
+    private static let coverHeight: CGFloat = 126
+    private static let avatarSize: CGFloat = 68
+    private static let cardSpacing: CGFloat = 12
 
     private var session: Session { sessionContainer.session }
     private var profile: Profile? { session.profile }
@@ -33,10 +35,13 @@ struct EditProfileScreen: View {
         Background(color: .backgroundMain) {
             ScrollView(showsIndicators: false) {
                 VStack(alignment: .leading, spacing: 0) {
-                    header
-                    fieldRows
+                    cover
+                    photo
+                    fieldCards
+                        .padding(.top, 20)
                 }
-                .padding(.bottom, 24)
+                .padding(.horizontal, ProfileHeaderView<EmptyView, EmptyView, EmptyView>.inset)
+                .padding(.vertical, 24)
             }
         }
         .navigationTitle("Edit Profile")
@@ -47,70 +52,98 @@ struct EditProfileScreen: View {
         }
     }
 
-    // MARK: - Header -
-
-    /// The You tab's cover and avatar at the same sizes, each a button to its own editor.
-    private var header: some View {
-        VStack(alignment: .leading, spacing: 0) {
-            Button {
-                router.push(.changeCoverPicture)
-            } label: {
-                ProfileCoverBanner(userID: session.userID, coverPicture: profile?.coverPicture)
-            }
-            .buttonStyle(.plain)
-            .accessibilityIdentifier("edit-profile-cover")
+    // MARK: - Cover & photo -
+
+    private var cover: some View {
+        Button {
+            router.push(.changeCoverPicture)
+        } label: {
+            ProfileCoverBanner(userID: session.userID, coverPicture: profile?.coverPicture, bannerHeight: Self.coverHeight)
+                .clipShape(RoundedRectangle(cornerRadius: Metrics.boxRadius, style: .continuous))
+                .overlay(alignment: .topTrailing) {
+                    // Opaque: the standard chip's row fill is translucent and vanishes on a photo.
+                    Text("Change cover")
+                        .chip(.tinted(.textMain, on: .backgroundMain))
+                        .padding(Self.cardSpacing)
+                }
+        }
+        .buttonStyle(.plain)
+        .accessibilityIdentifier("edit-profile-cover")
+    }
 
-            Button {
-                router.push(.changeProfilePicture)
-            } label: {
+    /// The avatar overlapping the cover's bottom edge, with a camera badge and a caption beside it.
+    private var photo: some View {
+        Button {
+            router.push(.changeProfilePicture)
+        } label: {
+            HStack(alignment: .bottom, spacing: Self.cardSpacing) {
                 ContactAvatarView(
                     id: session.userID.uuidString,
                     displayName: profile?.displayName ?? "",
                     imageData: sessionContainer.profileAvatars.data(for: session.userID),
                     blurhash: profile?.profilePicture?.thumbnailBlurhash,
-                    size: ProfileHeaderView<EmptyView, EmptyView, EmptyView>.avatarSize
+                    size: Self.avatarSize
                 )
                 .overlay { Circle().strokeBorder(Color.backgroundMain, lineWidth: 5) }
+                .overlay(alignment: .bottomTrailing) { cameraBadge }
+
+                Text("Change photo")
+                    .font(.appTextSmall)
+                    .foregroundStyle(Color.textSecondary)
+                    .padding(.bottom, 6)
             }
-            .buttonStyle(.plain)
-            .accessibilityIdentifier("edit-profile-photo")
-            .padding(.top, -ProfileHeaderView<EmptyView, EmptyView, EmptyView>.avatarOverlap)
-            .padding(.leading, ProfileHeaderView<EmptyView, EmptyView, EmptyView>.inset)
-            .padding(.bottom, 8)
+            .contentShape(Rectangle())
         }
+        .buttonStyle(.plain)
+        .accessibilityIdentifier("edit-profile-photo")
+        .padding(.top, -Self.avatarSize / 2)
+        .padding(.leading, 16)
     }
 
-    // MARK: - Rows -
+    private var cameraBadge: some View {
+        Image.asset(.camera)
+            .resizable()
+            .scaledToFit()
+            .frame(width: 16, height: 16)
+            .frame(width: 28, height: 28)
+            // Opaque so the avatar doesn't show through; the same grey as the header's buttons.
+            .background(Circle().fill(Color.action.opacity(0.1)))
+            .background(Circle().fill(Color.backgroundMain))
+            .offset(x: 6, y: 2)
+    }
 
-    @ViewBuilder
-    private var fieldRows: some View {
-        FieldRow(title: "Display Name", value: nonEmpty(profile?.displayName), placeholder: "Add a name", insets: Self.rowInsets) {
-            router.push(.changeDisplayName)
-        }
-        .accessibilityIdentifier("edit-profile-name")
+    // MARK: - Fields -
 
-        usernameRow
+    private var fieldCards: some View {
+        VStack(spacing: Self.cardSpacing) {
+            FieldCard(title: "Name", value: nonEmpty(profile?.displayName), placeholder: "Add a name") {
+                router.push(.changeDisplayName)
+            }
+            .accessibilityIdentifier("edit-profile-name")
 
-        FieldRow(title: "Bio", value: nonEmpty(profile?.bio), placeholder: "Add a bio", insets: Self.rowInsets) {
-            router.push(.editBio)
-        }
-        .accessibilityIdentifier("edit-profile-bio")
+            usernameCard
+
+            FieldCard(title: "Bio", value: nonEmpty(profile?.bio), placeholder: "Add a bio", lineLimit: 3) {
+                router.push(.editBio)
+            }
+            .accessibilityIdentifier("edit-profile-bio")
 
-        FieldRow(title: "Minimum to Chat", value: minimumToChat, placeholder: "Not set", insets: Self.rowInsets) {
-            router.push(.setMinimumTip(isSetupStep: false))
+            FieldCard(title: "Minimum to Chat", value: minimumToChat, placeholder: "Not set") {
+                router.push(.setMinimumTip(isSetupStep: false))
+            }
+            .accessibilityIdentifier("edit-profile-minimum")
         }
-        .accessibilityIdentifier("edit-profile-minimum")
     }
 
     @ViewBuilder
-    private var usernameRow: some View {
+    private var usernameCard: some View {
         if needsUsernameClaim {
-            FieldRow(title: "Username", value: "Claim your username", placeholder: "", insets: Self.rowInsets, valueIsPrompt: true, action: beginUsernameClaim)
+            FieldCard(title: "Username", value: "Claim your username", placeholder: "", valueIsPrompt: true, action: beginUsernameClaim)
                 .accessibilityIdentifier("edit-profile-username")
         } else if let username = profile?.username {
             // No balance gate on a held handle: the gate exists to stop squatting at claim time,
             // and a user who already holds one has cleared it.
-            FieldRow(title: "Username", value: "@\(username.value)", placeholder: "", insets: Self.rowInsets) {
+            FieldCard(title: "Username", value: "@\(username.value)", placeholder: "") {
                 router.push(.username(username))
             }
             .accessibilityIdentifier("edit-profile-username")
@@ -142,30 +175,41 @@ struct EditProfileScreen: View {
     }
 }
 
-/// A tappable row with the field's title and its current value, one line, trailing.
-private struct FieldRow: View {
+/// A tappable card with the field's title over its current value, styled like the profile's stats card.
+private struct FieldCard: View {
 
     let title: String
     let value: String?
     let placeholder: String
-    let insets: EdgeInsets
     var valueIsPrompt = false
+    var lineLimit = 1
     let action: VoidAction
 
     var body: some View {
-        Row(insets: insets, accessory: .chevron) {
-            Text(title)
-                .font(.appDisplayXS)
-                .foregroundStyle(Color.textMain)
-            // `Row` puts its own spacer before the chevron, so the value claims the width to sit against it.
-            Text(value ?? placeholder)
-                .font(.appTextMedium)
-                .foregroundStyle(value == nil || valueIsPrompt ? Color.textSecondary : Color.textMain)
-                .lineLimit(1)
-                .truncationMode(.tail)
-                .frame(maxWidth: .infinity, alignment: .trailing)
-        } action: {
-            action()
+        Button(action: action) {
+            HStack(spacing: 12) {
+                VStack(alignment: .leading, spacing: 2) {
+                    Text(title)
+                        .font(.appTextSmall)
+                        .foregroundStyle(Color.textSecondary)
+                    Text(value ?? placeholder)
+                        .font(.appTextMedium)
+                        .foregroundStyle(value == nil || valueIsPrompt ? Color.textSecondary : Color.textMain)
+                        .lineLimit(lineLimit)
+                        .multilineTextAlignment(.leading)
+                }
+                .frame(maxWidth: .infinity, alignment: .leading)
+
+                Image(systemName: "chevron.right")
+                    .font(.appTextSmall)
+                    .foregroundStyle(Color.textSecondary)
+            }
+            .padding(.horizontal, 16)
+            .padding(.vertical, 12)
+            .background(Color.backgroundRow, in: RoundedRectangle(cornerRadius: Metrics.boxRadius, style: .continuous))
+            .contentShape(Rectangle())
         }
+        .buttonStyle(.plain)
+        .accessibilityElement(children: .combine)
     }
 }
diff --git a/Flipcash/Core/Screens/Profile/ProfileCoverBanner.swift b/Flipcash/Core/Screens/Profile/ProfileCoverBanner.swift
index 2aa005f3b..2f235ee98 100644
--- a/Flipcash/Core/Screens/Profile/ProfileCoverBanner.swift
+++ b/Flipcash/Core/Screens/Profile/ProfileCoverBanner.swift
@@ -19,13 +19,15 @@ struct ProfileCoverBanner<Controls: View>: View {
     let coverPicture: ProfilePicture?
     /// A picked image not uploaded yet, drawn in place of the stored cover.
     var preview: UIImage? = nil
+    /// The banner's height; a profile's own cover is ``height``.
+    var bannerHeight: CGFloat = Self.height
     @ViewBuilder let controls: () -> Controls
 
     static var height: CGFloat { 214 }
 
     var body: some View {
         Color.clear
-            .frame(height: Self.height)
+            .frame(height: bannerHeight)
             .frame(maxWidth: .infinity)
             .overlay { cover }
             .clipped()
@@ -69,7 +71,7 @@ struct ProfileCoverBanner<Controls: View>: View {
 extension ProfileCoverBanner where Controls == EmptyView {
 
     /// A cover with nothing laid over it.
-    init(userID: UserID, coverPicture: ProfilePicture?, preview: UIImage? = nil) {
-        self.init(userID: userID, coverPicture: coverPicture, preview: preview, controls: { EmptyView() })
+    init(userID: UserID, coverPicture: ProfilePicture?, preview: UIImage? = nil, bannerHeight: CGFloat = Self.height) {
+        self.init(userID: userID, coverPicture: coverPicture, preview: preview, bannerHeight: bannerHeight, controls: { EmptyView() })
     }
 }

From 3646324d730d34c4d7f306a8d951478ac6af5680 Mon Sep 17 00:00:00 2001
From: Brandon McAnsh <git@bmcreations.dev>
Date: Tue, 6 Oct 2026 11:34:06 -0400
Subject: [PATCH 21/45] fix(profile): set Edit Profile card labels in
 appTextCaption

A Medium-weight label reads as secondary next to the bold value.
---
 Flipcash/Core/Screens/Main/Profile/EditProfileScreen.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Flipcash/Core/Screens/Main/Profile/EditProfileScreen.swift b/Flipcash/Core/Screens/Main/Profile/EditProfileScreen.swift
index 3aa937a06..adb9bc1d6 100644
--- a/Flipcash/Core/Screens/Main/Profile/EditProfileScreen.swift
+++ b/Flipcash/Core/Screens/Main/Profile/EditProfileScreen.swift
@@ -190,7 +190,7 @@ private struct FieldCard: View {
             HStack(spacing: 12) {
                 VStack(alignment: .leading, spacing: 2) {
                     Text(title)
-                        .font(.appTextSmall)
+                        .font(.appTextCaption)
                         .foregroundStyle(Color.textSecondary)
                     Text(value ?? placeholder)
                         .font(.appTextMedium)

From 75096c61dc0cdb7501546a3ae0b2e5eba4811bf2 Mon Sep 17 00:00:00 2001
From: Brandon McAnsh <git@bmcreations.dev>
Date: Tue, 6 Oct 2026 11:38:08 -0400
Subject: [PATCH 22/45] feat(profile): make the Change cover chip Liquid Glass
 on iOS 26

iOS 18 keeps the opaque chip, since the row fill vanishes on a photo.
---
 .../Main/Profile/EditProfileScreen.swift      | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/Flipcash/Core/Screens/Main/Profile/EditProfileScreen.swift b/Flipcash/Core/Screens/Main/Profile/EditProfileScreen.swift
index adb9bc1d6..64fb26f6e 100644
--- a/Flipcash/Core/Screens/Main/Profile/EditProfileScreen.swift
+++ b/Flipcash/Core/Screens/Main/Profile/EditProfileScreen.swift
@@ -61,9 +61,8 @@ struct EditProfileScreen: View {
             ProfileCoverBanner(userID: session.userID, coverPicture: profile?.coverPicture, bannerHeight: Self.coverHeight)
                 .clipShape(RoundedRectangle(cornerRadius: Metrics.boxRadius, style: .continuous))
                 .overlay(alignment: .topTrailing) {
-                    // Opaque: the standard chip's row fill is translucent and vanishes on a photo.
                     Text("Change cover")
-                        .chip(.tinted(.textMain, on: .backgroundMain))
+                        .modifier(CoverChip())
                         .padding(Self.cardSpacing)
                 }
         }
@@ -213,3 +212,20 @@ private struct FieldCard: View {
         .accessibilityElement(children: .combine)
     }
 }
+
+/// The "Change cover" label over the cover photo: a Liquid Glass capsule on iOS 26, and on iOS 18 an
+/// opaque chip, since the standard chip's row fill is translucent and vanishes on a photo.
+private struct CoverChip: ViewModifier {
+    func body(content: Content) -> some View {
+        if #available(iOS 26.0, *) {
+            content
+                .font(.appTextSmall)
+                .foregroundStyle(Color.textMain)
+                .padding(.horizontal, 10)
+                .padding(.vertical, 6)
+                .glassEffect(.regular, in: .capsule)
+        } else {
+            content.chip(.tinted(.textMain, on: .backgroundMain))
+        }
+    }
+}

From ae47d4dbe8e199563d1ca69c7a4a7a7b0603b5c1 Mon Sep 17 00:00:00 2001
From: Brandon McAnsh <git@bmcreations.dev>
Date: Tue, 6 Oct 2026 11:40:20 -0400
Subject: [PATCH 23/45] feat(profile): make Change cover its own darker,
 interactive glass button

The glass takes a backgroundMain tint so the label holds on a bright
cover, and the chip is a button beside the cover card rather than a
label inside it, so the interactive glass responds to its own press.
Both open the cover editor.
---
 .../Main/Profile/EditProfileScreen.swift       | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/Flipcash/Core/Screens/Main/Profile/EditProfileScreen.swift b/Flipcash/Core/Screens/Main/Profile/EditProfileScreen.swift
index 64fb26f6e..4c5ecbf82 100644
--- a/Flipcash/Core/Screens/Main/Profile/EditProfileScreen.swift
+++ b/Flipcash/Core/Screens/Main/Profile/EditProfileScreen.swift
@@ -60,14 +60,18 @@ struct EditProfileScreen: View {
         } label: {
             ProfileCoverBanner(userID: session.userID, coverPicture: profile?.coverPicture, bannerHeight: Self.coverHeight)
                 .clipShape(RoundedRectangle(cornerRadius: Metrics.boxRadius, style: .continuous))
-                .overlay(alignment: .topTrailing) {
-                    Text("Change cover")
-                        .modifier(CoverChip())
-                        .padding(Self.cardSpacing)
-                }
         }
         .buttonStyle(.plain)
         .accessibilityIdentifier("edit-profile-cover")
+        .overlay(alignment: .topTrailing) {
+            Button("Change cover") {
+                router.push(.changeCoverPicture)
+            }
+            .buttonStyle(.plain)
+            .modifier(CoverChip())
+            .padding(Self.cardSpacing)
+            .accessibilityIdentifier("edit-profile-change-cover")
+        }
     }
 
     /// The avatar overlapping the cover's bottom edge, with a camera badge and a caption beside it.
@@ -213,7 +217,7 @@ private struct FieldCard: View {
     }
 }
 
-/// The "Change cover" label over the cover photo: a Liquid Glass capsule on iOS 26, and on iOS 18 an
+/// The "Change cover" button over the cover photo: an interactive Liquid Glass capsule on iOS 26, and on iOS 18 an
 /// opaque chip, since the standard chip's row fill is translucent and vanishes on a photo.
 private struct CoverChip: ViewModifier {
     func body(content: Content) -> some View {
@@ -223,7 +227,7 @@ private struct CoverChip: ViewModifier {
                 .foregroundStyle(Color.textMain)
                 .padding(.horizontal, 10)
                 .padding(.vertical, 6)
-                .glassEffect(.regular, in: .capsule)
+                .glassEffect(.regular.tint(Color.backgroundMain.opacity(0.6)).interactive(), in: .capsule)
         } else {
             content.chip(.tinted(.textMain, on: .backgroundMain))
         }

From 91bd442f36a7a0f14491cb1f52b282d415b4a507 Mon Sep 17 00:00:00 2001
From: Brandon McAnsh <git@bmcreations.dev>
Date: Tue, 6 Oct 2026 11:48:39 -0400
Subject: [PATCH 24/45] feat(profile): move Download to the toolbar and Close
 to the bottom of the profile card

Drop the link row and Share button; the profile's Share menu already offers both.
---
 .../Screens/Main/You/ProfileCardScreen.swift  |  77 ++++--------
 .../Main/You/TipCardActionButton.swift        |  39 ------
 .../Screens/Main/You/TipCardLinkRow.swift     | 112 ------------------
 .../Core/Screens/Main/You/YouScreen.swift     |   2 +-
 FlipcashTests/TipCardLinkRowTests.swift       |  38 ------
 5 files changed, 24 insertions(+), 244 deletions(-)
 delete mode 100644 Flipcash/Core/Screens/Main/You/TipCardActionButton.swift
 delete mode 100644 Flipcash/Core/Screens/Main/You/TipCardLinkRow.swift
 delete mode 100644 FlipcashTests/TipCardLinkRowTests.swift

diff --git a/Flipcash/Core/Screens/Main/You/ProfileCardScreen.swift b/Flipcash/Core/Screens/Main/You/ProfileCardScreen.swift
index 06376bedc..43b06d938 100644
--- a/Flipcash/Core/Screens/Main/You/ProfileCardScreen.swift
+++ b/Flipcash/Core/Screens/Main/You/ProfileCardScreen.swift
@@ -8,15 +8,13 @@ import UIKit
 import FlipcashCore
 import FlipcashUI
 
-/// The user's tip card full screen (Figma node 9277:121410), with the copyable public link and the
-/// Share/Download pair under it. Presented over the You tab from the profile's Share menu.
+/// The user's tip card full screen (Figma node 9277:121410), with Download in the toolbar and Close
+/// pinned to the bottom. Presented over the You tab from the profile's Share menu.
 struct ProfileCardScreen: View {
 
     @Environment(SessionContainer.self) private var sessionContainer
     @Environment(\.dismiss) private var dismiss
 
-    /// Warmed by `YouScreen`, which outlives this screen, so reopening reuses the render.
-    let previewCache: TipCodePreviewCache
     @State private var isShowingDownloadOptions = false
 
     /// The format tapped in the download sheet, held until the sheet is gone so
@@ -35,9 +33,9 @@ struct ProfileCardScreen: View {
     private static let boostedBrightness: CGFloat = 0.6
 
     var body: some View {
-        Background(color: .backgroundMain) {
-            ScrollView(showsIndicators: false) {
-                VStack(spacing: 0) {
+        NavigationStack {
+            Background(color: .backgroundMain) {
+                ScrollView(showsIndicators: false) {
                     if let name = displayName {
                         TipcardView(
                             size: cardSize,
@@ -47,28 +45,27 @@ struct ProfileCardScreen: View {
                             tintOpacity: 0.36,
                             subtitle: username.map(\.handle)
                         )
-                        .padding(.top, 24)
+                        .padding(.horizontal, Self.horizontalInset)
+                        .containerRelativeFrame(.vertical, alignment: .center)
                     }
-
-                    TipCardLinkRow(url: url)
-                        .padding(.top, 32)
-
-                    HStack(spacing: 10) {
-                        TipCardActionButton(asset: .shareOS, title: "Share", action: shareTipCard)
-                            .accessibilityIdentifier("you-share-button")
-
-                        TipCardActionButton(asset: .fileDownload, title: "Download") {
-                            isShowingDownloadOptions = true
-                        }
-                        .accessibilityIdentifier("you-download-button")
+                }
+            }
+            .safeAreaInset(edge: .bottom) {
+                Button("Close") { dismiss() }
+                    .buttonStyle(.subtle)
+                    .accessibilityIdentifier("profile-card-close")
+                    .padding(.horizontal, Self.horizontalInset)
+            }
+            .toolbar {
+                ToolbarItem(placement: .topBarTrailing) {
+                    Button {
+                        isShowingDownloadOptions = true
+                    } label: {
+                        Image.asset(.fileDownload)
                     }
-                    .padding(.top, 11)
-
-                    closeButton
-                        .padding(.top, 24)
+                    .accessibilityLabel("Download")
+                    .accessibilityIdentifier("you-download-button")
                 }
-                .padding(.horizontal, Self.horizontalInset)
-                .containerRelativeFrame(.vertical, alignment: .center)
             }
         }
         .sheet(isPresented: $isShowingDownloadOptions, onDismiss: exportPendingDownload) {
@@ -81,23 +78,6 @@ struct ProfileCardScreen: View {
         .onDisappear(perform: restoreBrightness)
     }
 
-    private var closeButton: some View {
-        Button {
-            dismiss()
-        } label: {
-            Text("Close")
-                .font(.appTextSmall)
-                .foregroundStyle(Color.textMain)
-                .opacity(0.5)
-                .padding(.vertical, 12)
-                .padding(.horizontal, 20)
-                .contentShape(Rectangle())
-        }
-        .buttonStyle(.plain)
-        .accessibilityLabel("Close")
-        .accessibilityIdentifier("profile-card-close")
-    }
-
     // MARK: - Content -
 
     private var profile: Profile? { sessionContainer.session.profile }
@@ -113,8 +93,6 @@ struct ProfileCardScreen: View {
         TipCode.Payload(userID: sessionContainer.session.userID).codeData()
     }
 
-    private var url: URL { .tipcard(for: sessionContainer.session.userID, username: username) }
-
     private var cardSize: CGSize {
         let screenWidth = UIApplication.shared.firstWindowScene?.screen.bounds.width ?? Self.maxCardWidth
         let width = min(Self.maxCardWidth, screenWidth - Self.horizontalInset * 2)
@@ -123,15 +101,6 @@ struct ProfileCardScreen: View {
 
     // MARK: - Actions -
 
-    private func shareTipCard() {
-        let item = TipCodeShareItem.profile(
-            url: url,
-            displayName: displayName,
-            preview: previewCache.preview(for: sessionContainer.session.userID)
-        )
-        ShareSheet.present(activityItem: item) { _ in }
-    }
-
     /// Exports the format the sheet picked and hands the file to the share
     /// sheet, which is where iOS puts "Save to Files" and every other
     /// destination.
diff --git a/Flipcash/Core/Screens/Main/You/TipCardActionButton.swift b/Flipcash/Core/Screens/Main/You/TipCardActionButton.swift
deleted file mode 100644
index 1cfc49612..000000000
--- a/Flipcash/Core/Screens/Main/You/TipCardActionButton.swift
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-//  TipCardActionButton.swift
-//  Flipcash
-//
-
-import SwiftUI
-import FlipcashUI
-
-/// One of the two large tip-card actions under the link row — Share or Download
-/// (Figma node 9276:4756): a 28pt glyph over a dimmed caption, filling half the
-/// row.
-struct TipCardActionButton: View {
-
-    let asset: Asset
-    let title: String
-    let action: VoidAction
-
-    var body: some View {
-        Button(action: action) {
-            VStack(spacing: 6) {
-                Image.asset(asset)
-                    .renderingMode(.template)
-                    .frame(width: 28, height: 28)
-                    .foregroundStyle(Color.textMain)
-
-                Text(title)
-                    .font(.appTextSmall)
-                    .foregroundStyle(Color.textMain)
-                    .opacity(0.5)
-            }
-            .frame(maxWidth: .infinity)
-            .frame(height: 88)
-            .background(Color.backgroundRow, in: RoundedRectangle(cornerRadius: 6, style: .continuous))
-            .contentShape(Rectangle())
-        }
-        .buttonStyle(.plain)
-        .accessibilityLabel(title)
-    }
-}
diff --git a/Flipcash/Core/Screens/Main/You/TipCardLinkRow.swift b/Flipcash/Core/Screens/Main/You/TipCardLinkRow.swift
deleted file mode 100644
index c5b0b7460..000000000
--- a/Flipcash/Core/Screens/Main/You/TipCardLinkRow.swift
+++ /dev/null
@@ -1,112 +0,0 @@
-//
-//  TipCardLinkRow.swift
-//  Flipcash
-//
-
-import SwiftUI
-import UIKit
-import FlipcashCore
-import FlipcashUI
-
-/// The tip-card link row (Figma node 9276:4748): a chain-link glyph, the
-/// shortened public link, and a copy button that flips to a checkmark for a
-/// beat after copying.
-///
-/// Owns the copy itself so the caller only supplies the URL.
-struct TipCardLinkRow: View {
-
-    let url: URL
-
-    /// How long the copy button stays on the checkmark before reverting.
-    private static let confirmationDuration: Duration = .seconds(1.5)
-
-    @State private var didCopy = false
-
-    var body: some View {
-        Button(action: copy) {
-            HStack(spacing: 0) {
-                HStack(spacing: 6) {
-                    Image.asset(.chainLink)
-                        .renderingMode(.template)
-                        .frame(width: 20, height: 20)
-
-                    Text(Self.displayText(for: url))
-                        .font(.appTextMedium)
-                        .lineLimit(1)
-                        // Elides only when the handle genuinely doesn't fit —
-                        // no shrinking to dodge it, which would render the row
-                        // at a smaller size than the ones around it. The forced
-                        // clip in `displayText` is for the uuid form alone; a
-                        // handle keeps every character it has room for and
-                        // loses the tail only past that. On the narrowest
-                        // supported screen (375pt) the budget is 257pt, which
-                        // covered a 15-character handle of average width even
-                        // under the four-character-longer `app.flipcash.com`;
-                        // the apex host only widens that margin.
-                        .truncationMode(.tail)
-                }
-
-                Spacer(minLength: 8)
-
-                Group {
-                    if didCopy {
-                        Image.system(.circleCheck)
-                            .renderingMode(.template)
-                    } else {
-                        Image.asset(.squareBehindSquare)
-                            .renderingMode(.template)
-                    }
-                }
-                .frame(width: 20, height: 20)
-            }
-            .foregroundStyle(Color.textMain)
-            .opacity(0.7)
-            .padding(.horizontal, 12)
-            .frame(height: 40)
-            .frame(maxWidth: .infinity)
-            .background(Color.backgroundRow, in: RoundedRectangle(cornerRadius: 6, style: .continuous))
-            .contentShape(Rectangle())
-        }
-        .buttonStyle(.plain)
-        .accessibilityLabel("Copy tip card link")
-        .accessibilityIdentifier("you-copy-link-button")
-    }
-
-    private func copy() {
-        UIPasteboard.general.string = url.absoluteString
-        withAnimation(.easeInOut(duration: 0.15)) {
-            didCopy = true
-        }
-        Task {
-            try? await Task.sleep(for: Self.confirmationDuration)
-            withAnimation(.easeInOut(duration: 0.15)) {
-                didCopy = false
-            }
-        }
-    }
-
-    /// The link with its scheme dropped, and a uuid identifier clipped to a
-    /// stub so a full-width one doesn't push the row's copy button off the edge.
-    ///
-    /// A claimed handle is never clipped here. It is at most 15 characters —
-    /// well under the uuid that sits in the same place when there's no handle —
-    /// so it is handed to the layout whole and elides only if it truly overruns
-    /// the row.
-    static func displayText(for url: URL) -> String {
-        let stripped = url.absoluteString
-            .replacingOccurrences(of: "https://", with: "")
-            .replacingOccurrences(of: "http://", with: "")
-
-        guard let slash = stripped.lastIndex(of: "/") else { return stripped }
-
-        let identifier = stripped[stripped.index(after: slash)...]
-        guard identifier.count > identifierStubLength, Username(String(identifier)) == nil else {
-            return stripped
-        }
-
-        return String(stripped[...slash]) + String(identifier.prefix(identifierStubLength)) + "…"
-    }
-
-    /// Leading characters of the identifier kept in the shortened link.
-    private static let identifierStubLength = 5
-}
diff --git a/Flipcash/Core/Screens/Main/You/YouScreen.swift b/Flipcash/Core/Screens/Main/You/YouScreen.swift
index 79f00a6fc..10bda3f6e 100644
--- a/Flipcash/Core/Screens/Main/You/YouScreen.swift
+++ b/Flipcash/Core/Screens/Main/You/YouScreen.swift
@@ -86,7 +86,7 @@ struct YouScreen: View {
             }
         }
         .fullScreenCover(isPresented: Bindable(router).isShowingProfileCard) {
-            ProfileCardScreen(previewCache: previewCache)
+            ProfileCardScreen()
         }
         .task(id: profilePicture?.thumbnailBlobID) {
             // There is no card to share, and so no preview worth rendering, until
diff --git a/FlipcashTests/TipCardLinkRowTests.swift b/FlipcashTests/TipCardLinkRowTests.swift
deleted file mode 100644
index 8ddd26df9..000000000
--- a/FlipcashTests/TipCardLinkRowTests.swift
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-//  TipCardLinkRowTests.swift
-//  FlipcashTests
-//
-
-import Foundation
-import Testing
-import FlipcashCore
-@testable import Flipcash
-
-@MainActor
-@Suite("Tip card link row display text")
-struct TipCardLinkRowTests {
-
-    @Test("A uuid is still clipped to a stub")
-    func displayText_uuid_clipped() {
-        let url = URL(string: "https://flipcash.com/b0ced1d2-3f4a-4b5c-8d9e-0f1a2b3c4d5e")!
-        #expect(TipCardLinkRow.displayText(for: url) == "flipcash.com/b0ced…")
-    }
-
-    @Test("The longest handle renders whole")
-    func displayText_maximumLengthHandle_unclipped() {
-        let url = URL(string: "https://flipcash.com/abcdefghijklmno")!
-        #expect(TipCardLinkRow.displayText(for: url) == "flipcash.com/abcdefghijklmno")
-    }
-
-    @Test("A six-character handle renders whole")
-    func displayText_shortHandle_unclipped() {
-        let url = URL(string: "https://flipcash.com/taylor")!
-        #expect(TipCardLinkRow.displayText(for: url) == "flipcash.com/taylor")
-    }
-
-    @Test("A non-handle segment at exactly the stub length is left alone")
-    func displayText_nonHandleAtStubLength_unclipped() {
-        let url = URL(string: "https://flipcash.com/a-bcd")!
-        #expect(TipCardLinkRow.displayText(for: url) == "flipcash.com/a-bcd")
-    }
-}

From feab207770f5e2c9e44b19a1fa3e409a39ee376f Mon Sep 17 00:00:00 2001
From: Brandon McAnsh <git@bmcreations.dev>
Date: Tue, 6 Oct 2026 11:51:55 -0400
Subject: [PATCH 25/45] feat(profile): reveal the profile card with the
 scanned-card spring

The card springs in from 0.55 scale with the bill pop's timing while the backdrop fades in, and Close plays it in reverse. The cover is presented and dismissed without its slide so the reveal is the only motion.
---
 .../Screens/Main/You/ProfileCardScreen.swift  | 49 +++++++++++++++++--
 .../Core/Screens/Main/You/YouScreen.swift     |  9 +++-
 2 files changed, 54 insertions(+), 4 deletions(-)

diff --git a/Flipcash/Core/Screens/Main/You/ProfileCardScreen.swift b/Flipcash/Core/Screens/Main/You/ProfileCardScreen.swift
index 43b06d938..6f8fd8314 100644
--- a/Flipcash/Core/Screens/Main/You/ProfileCardScreen.swift
+++ b/Flipcash/Core/Screens/Main/You/ProfileCardScreen.swift
@@ -24,6 +24,11 @@ struct ProfileCardScreen: View {
     /// The brightness to put back on close — set only when this screen raised it.
     @State private var previousBrightness: CGFloat?
 
+    /// The backdrop and chrome fade on this; the cover itself is presented without animation.
+    @State private var isRevealed = false
+    /// The card springs on this, separately, so it can bounce while the backdrop eases.
+    @State private var isCardShown = false
+
     /// The card's width, from the full-screen frame (302 of the 402pt frame).
     private static let maxCardWidth: CGFloat = 302
     private static let horizontalInset: CGFloat = 20
@@ -32,9 +37,18 @@ struct ProfileCardScreen: View {
     private static let minimumScanBrightness: CGFloat = 0.4
     private static let boostedBrightness: CGFloat = 0.6
 
+    /// The scanned-card pop from `BillCanvas` (0.55 scale, 0.4s at 0.4 damping).
+    private static let revealScale: CGFloat = 0.55
+    private static let revealSpring: Animation = .spring(duration: 0.4, bounce: 0.6)
+    private static let fade: Animation = .easeOut(duration: 0.25)
+
     var body: some View {
         NavigationStack {
-            Background(color: .backgroundMain) {
+            ZStack {
+                Color.backgroundMain
+                    .ignoresSafeArea()
+                    .opacity(isRevealed ? 1 : 0)
+
                 ScrollView(showsIndicators: false) {
                     if let name = displayName {
                         TipcardView(
@@ -45,14 +59,17 @@ struct ProfileCardScreen: View {
                             tintOpacity: 0.36,
                             subtitle: username.map(\.handle)
                         )
+                        .scaleEffect(isCardShown ? 1 : Self.revealScale)
+                        .opacity(isCardShown ? 1 : 0)
                         .padding(.horizontal, Self.horizontalInset)
                         .containerRelativeFrame(.vertical, alignment: .center)
                     }
                 }
             }
             .safeAreaInset(edge: .bottom) {
-                Button("Close") { dismiss() }
+                Button("Close", action: close)
                     .buttonStyle(.subtle)
+                    .opacity(isRevealed ? 1 : 0)
                     .accessibilityIdentifier("profile-card-close")
                     .padding(.horizontal, Self.horizontalInset)
             }
@@ -65,16 +82,22 @@ struct ProfileCardScreen: View {
                     }
                     .accessibilityLabel("Download")
                     .accessibilityIdentifier("you-download-button")
+                    .opacity(isRevealed ? 1 : 0)
                 }
             }
+            .containerBackground(.clear, for: .navigation)
         }
+        .presentationBackground(.clear)
         .sheet(isPresented: $isShowingDownloadOptions, onDismiss: exportPendingDownload) {
             TipCardDownloadSheet(
                 onSelect: { pendingDownload = $0; isShowingDownloadOptions = false },
                 onCancel: { isShowingDownloadOptions = false }
             )
         }
-        .onAppear(perform: boostBrightness)
+        .onAppear {
+            boostBrightness()
+            reveal()
+        }
         .onDisappear(perform: restoreBrightness)
     }
 
@@ -123,6 +146,26 @@ struct ProfileCardScreen: View {
         }
     }
 
+    // MARK: - Reveal -
+
+    private func reveal() {
+        Haptics.vibrate()
+        withAnimation(Self.fade) { isRevealed = true }
+        withAnimation(Self.revealSpring) { isCardShown = true }
+    }
+
+    /// Plays the reveal backwards, then removes the cover without its slide-down.
+    private func close() {
+        withAnimation(Self.fade) {
+            isRevealed = false
+            isCardShown = false
+        } completion: {
+            var transaction = Transaction()
+            transaction.disablesAnimations = true
+            withTransaction(transaction) { dismiss() }
+        }
+    }
+
     // MARK: - Brightness -
 
     /// The card is a code someone is about to scan, so a dim screen is raised for as long as it is up.
diff --git a/Flipcash/Core/Screens/Main/You/YouScreen.swift b/Flipcash/Core/Screens/Main/You/YouScreen.swift
index 10bda3f6e..d0403e4cb 100644
--- a/Flipcash/Core/Screens/Main/You/YouScreen.swift
+++ b/Flipcash/Core/Screens/Main/You/YouScreen.swift
@@ -300,11 +300,18 @@ struct YouScreen: View {
         ShareSheet.present(activityItem: item) { _ in }
     }
 
+    /// Presents the card without the cover's slide-up, so its own scan-style reveal is the only motion.
+    private func showProfileCard() {
+        var transaction = Transaction()
+        transaction.disablesAnimations = true
+        withTransaction(transaction) { router.isShowingProfileCard = true }
+    }
+
     private func handleShareChoice() {
         defer { shareChoice = nil }
         switch shareChoice {
         case .share:    shareTipCard()
-        case .showCard: router.isShowingProfileCard = true
+        case .showCard: showProfileCard()
         case .copyLink: copyLink()
         case nil:       break
         }

From bdaf5bbf06841fc2cedb16a1cb8dba54a65438c8 Mon Sep 17 00:00:00 2001
From: Brandon McAnsh <git@bmcreations.dev>
Date: Tue, 6 Oct 2026 11:54:56 -0400
Subject: [PATCH 26/45] fix(profile): fade the profile card out at full size on
 close

---
 Flipcash/Core/Screens/Main/You/ProfileCardScreen.swift | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Flipcash/Core/Screens/Main/You/ProfileCardScreen.swift b/Flipcash/Core/Screens/Main/You/ProfileCardScreen.swift
index 6f8fd8314..af700a847 100644
--- a/Flipcash/Core/Screens/Main/You/ProfileCardScreen.swift
+++ b/Flipcash/Core/Screens/Main/You/ProfileCardScreen.swift
@@ -26,7 +26,7 @@ struct ProfileCardScreen: View {
 
     /// The backdrop and chrome fade on this; the cover itself is presented without animation.
     @State private var isRevealed = false
-    /// The card springs on this, separately, so it can bounce while the backdrop eases.
+    /// The card's scale springs on this, separately, so it can bounce while its opacity eases with the backdrop.
     @State private var isCardShown = false
 
     /// The card's width, from the full-screen frame (302 of the 402pt frame).
@@ -60,7 +60,7 @@ struct ProfileCardScreen: View {
                             subtitle: username.map(\.handle)
                         )
                         .scaleEffect(isCardShown ? 1 : Self.revealScale)
-                        .opacity(isCardShown ? 1 : 0)
+                        .opacity(isRevealed ? 1 : 0)
                         .padding(.horizontal, Self.horizontalInset)
                         .containerRelativeFrame(.vertical, alignment: .center)
                     }
@@ -154,11 +154,10 @@ struct ProfileCardScreen: View {
         withAnimation(Self.revealSpring) { isCardShown = true }
     }
 
-    /// Plays the reveal backwards, then removes the cover without its slide-down.
+    /// Fades the card and backdrop out at full size, then removes the cover without its slide-down.
     private func close() {
         withAnimation(Self.fade) {
             isRevealed = false
-            isCardShown = false
         } completion: {
             var transaction = Transaction()
             transaction.disablesAnimations = true

From 9c85f75d95a44b7a000d8f279156cf03698124c7 Mon Sep 17 00:00:00 2001
From: Brandon McAnsh <git@bmcreations.dev>
Date: Tue, 6 Oct 2026 12:07:34 -0400
Subject: [PATCH 27/45] fix(profile): draw the profile card inside the You tab
 so the gear's glass swaps to Download in place

The card was a full-screen cover with its own toolbar button laid over the
You tab's gear. The two glass buttons sampled different backdrops, so the
glass shifted and changed colour as the cover settled and cleared. The card
is now an overlay in the You tab, the tab's one toolbar button swaps its
glyph between Settings and Download, and the tab bar hides while it is up.
---
 .../Core/Screens/Main/Home/HomeTabView.swift  |  5 +-
 .../Screens/Main/You/ProfileCardScreen.swift  | 90 ++++++++-----------
 .../Core/Screens/Main/You/YouScreen.swift     | 34 ++++---
 .../HomeTabBarVisibilityTests.swift           | 18 +++-
 4 files changed, 79 insertions(+), 68 deletions(-)

diff --git a/Flipcash/Core/Screens/Main/Home/HomeTabView.swift b/Flipcash/Core/Screens/Main/Home/HomeTabView.swift
index 365378658..8e06856d0 100644
--- a/Flipcash/Core/Screens/Main/Home/HomeTabView.swift
+++ b/Flipcash/Core/Screens/Main/Home/HomeTabView.swift
@@ -74,6 +74,7 @@ struct HomeTabView: View {
         selection.hidesTabBar(
             isWalletCardExpanded: cardExpansion.isExpanded,
             isShowingBill: sessionContainer.session.isShowingBill,
+            isShowingProfileCard: router.isShowingProfileCard,
             hasPushedScreen: selection.pushStack.map { !router[$0].isEmpty } ?? false
         )
     }
@@ -354,12 +355,14 @@ extension HomeTab {
     func hidesTabBar(
         isWalletCardExpanded: Bool,
         isShowingBill: Bool,
+        isShowingProfileCard: Bool,
         hasPushedScreen: Bool
     ) -> Bool {
         if isShowingBill || hasPushedScreen { return true }
         switch self {
         case .wallet:        return isWalletCardExpanded
-        case .tipCard, .scan, .chat: return false
+        case .tipCard:       return isShowingProfileCard
+        case .scan, .chat:   return false
         }
     }
 }
diff --git a/Flipcash/Core/Screens/Main/You/ProfileCardScreen.swift b/Flipcash/Core/Screens/Main/You/ProfileCardScreen.swift
index af700a847..b7a112f83 100644
--- a/Flipcash/Core/Screens/Main/You/ProfileCardScreen.swift
+++ b/Flipcash/Core/Screens/Main/You/ProfileCardScreen.swift
@@ -8,14 +8,16 @@ import UIKit
 import FlipcashCore
 import FlipcashUI
 
-/// The user's tip card full screen (Figma node 9277:121410), with Download in the toolbar and Close
-/// pinned to the bottom. Presented over the You tab from the profile's Share menu.
+/// The user's profile card over the You tab, with Close pinned to the bottom. Drawn
+/// inside the tab rather than as a cover so the tab's own toolbar button, swapped to
+/// Download, stays the only glass in the corner.
 struct ProfileCardScreen: View {
 
     @Environment(SessionContainer.self) private var sessionContainer
-    @Environment(\.dismiss) private var dismiss
+    @Environment(AppRouter.self) private var router
 
-    @State private var isShowingDownloadOptions = false
+    /// Raised by the You tab's toolbar button while the card is up.
+    @Binding var isShowingDownloadOptions: Bool
 
     /// The format tapped in the download sheet, held until the sheet is gone so
     /// the share sheet has a settled controller to present on.
@@ -24,7 +26,7 @@ struct ProfileCardScreen: View {
     /// The brightness to put back on close — set only when this screen raised it.
     @State private var previousBrightness: CGFloat?
 
-    /// The backdrop and chrome fade on this; the cover itself is presented without animation.
+    /// The backdrop and Close fade in on this; removal fades the whole overlay instead.
     @State private var isRevealed = false
     /// The card's scale springs on this, separately, so it can bounce while its opacity eases with the backdrop.
     @State private var isCardShown = false
@@ -40,54 +42,40 @@ struct ProfileCardScreen: View {
     /// The scanned-card pop from `BillCanvas` (0.55 scale, 0.4s at 0.4 damping).
     private static let revealScale: CGFloat = 0.55
     private static let revealSpring: Animation = .spring(duration: 0.4, bounce: 0.6)
-    private static let fade: Animation = .easeOut(duration: 0.25)
 
-    var body: some View {
-        NavigationStack {
-            ZStack {
-                Color.backgroundMain
-                    .ignoresSafeArea()
-                    .opacity(isRevealed ? 1 : 0)
+    /// The open and close fade, shared with the toolbar glyph swap so the two move together.
+    static let fade: Animation = .easeOut(duration: 0.25)
 
-                ScrollView(showsIndicators: false) {
-                    if let name = displayName {
-                        TipcardView(
-                            size: cardSize,
-                            name: name,
-                            avatar: nil,
-                            codeData: codeData,
-                            tintOpacity: 0.36,
-                            subtitle: username.map(\.handle)
-                        )
-                        .scaleEffect(isCardShown ? 1 : Self.revealScale)
-                        .opacity(isRevealed ? 1 : 0)
-                        .padding(.horizontal, Self.horizontalInset)
-                        .containerRelativeFrame(.vertical, alignment: .center)
-                    }
-                }
-            }
-            .safeAreaInset(edge: .bottom) {
-                Button("Close", action: close)
-                    .buttonStyle(.subtle)
+    var body: some View {
+        ZStack {
+            Color.backgroundMain
+                .ignoresSafeArea()
+                .opacity(isRevealed ? 1 : 0)
+
+            ScrollView(showsIndicators: false) {
+                if let name = displayName {
+                    TipcardView(
+                        size: cardSize,
+                        name: name,
+                        avatar: nil,
+                        codeData: codeData,
+                        tintOpacity: 0.36,
+                        subtitle: username.map(\.handle)
+                    )
+                    .scaleEffect(isCardShown ? 1 : Self.revealScale)
                     .opacity(isRevealed ? 1 : 0)
-                    .accessibilityIdentifier("profile-card-close")
                     .padding(.horizontal, Self.horizontalInset)
-            }
-            .toolbar {
-                ToolbarItem(placement: .topBarTrailing) {
-                    Button {
-                        isShowingDownloadOptions = true
-                    } label: {
-                        Image.asset(.fileDownload)
-                    }
-                    .accessibilityLabel("Download")
-                    .accessibilityIdentifier("you-download-button")
-                    .opacity(isRevealed ? 1 : 0)
+                    .containerRelativeFrame(.vertical, alignment: .center)
                 }
             }
-            .containerBackground(.clear, for: .navigation)
         }
-        .presentationBackground(.clear)
+        .safeAreaInset(edge: .bottom) {
+            Button("Close", action: close)
+                .buttonStyle(.subtle)
+                .opacity(isRevealed ? 1 : 0)
+                .accessibilityIdentifier("profile-card-close")
+                .padding(.horizontal, Self.horizontalInset)
+        }
         .sheet(isPresented: $isShowingDownloadOptions, onDismiss: exportPendingDownload) {
             TipCardDownloadSheet(
                 onSelect: { pendingDownload = $0; isShowingDownloadOptions = false },
@@ -154,15 +142,9 @@ struct ProfileCardScreen: View {
         withAnimation(Self.revealSpring) { isCardShown = true }
     }
 
-    /// Fades the card and backdrop out at full size, then removes the cover without its slide-down.
+    /// Fades the card out at full size; the overlay's removal transition carries the fade.
     private func close() {
-        withAnimation(Self.fade) {
-            isRevealed = false
-        } completion: {
-            var transaction = Transaction()
-            transaction.disablesAnimations = true
-            withTransaction(transaction) { dismiss() }
-        }
+        withAnimation(Self.fade) { router.isShowingProfileCard = false }
     }
 
     // MARK: - Brightness -
diff --git a/Flipcash/Core/Screens/Main/You/YouScreen.swift b/Flipcash/Core/Screens/Main/You/YouScreen.swift
index d0403e4cb..bd7bff652 100644
--- a/Flipcash/Core/Screens/Main/You/YouScreen.swift
+++ b/Flipcash/Core/Screens/Main/You/YouScreen.swift
@@ -35,6 +35,7 @@ struct YouScreen: View {
 
     @State private var isShowingShare = false
     @State private var shareChoice: ProfileShareChoice?
+    @State private var isShowingCardDownload = false
 
     /// The gap the page keeps between its last row and the tab bar.
     private static let tabBarGap: CGFloat = 24
@@ -85,8 +86,11 @@ struct YouScreen: View {
                 settingsGear
             }
         }
-        .fullScreenCover(isPresented: Bindable(router).isShowingProfileCard) {
-            ProfileCardScreen()
+        .overlay {
+            if router.isShowingProfileCard {
+                ProfileCardScreen(isShowingDownloadOptions: $isShowingCardDownload)
+                    .transition(.asymmetric(insertion: .identity, removal: .opacity))
+            }
         }
         .task(id: profilePicture?.thumbnailBlobID) {
             // There is no card to share, and so no preview worth rendering, until
@@ -152,14 +156,26 @@ struct YouScreen: View {
         .accessibilityIdentifier("you-share")
     }
 
+    /// Settings, or Download while the profile card is up. One button so the glass
+    /// stays put and only the glyph changes.
     private var settingsGear: some View {
-        Button {
-            router.push(.settings)
+        let showsDownload = router.isShowingProfileCard
+        return Button {
+            if showsDownload {
+                isShowingCardDownload = true
+            } else {
+                router.push(.settings)
+            }
         } label: {
             Image(systemName: "gearshape")
+                .opacity(showsDownload ? 0 : 1)
+                .overlay {
+                    Image.asset(.fileDownload)
+                        .opacity(showsDownload ? 1 : 0)
+                }
         }
-        .accessibilityLabel("Settings")
-        .accessibilityIdentifier("you-settings")
+        .accessibilityLabel(showsDownload ? "Download" : "Settings")
+        .accessibilityIdentifier(showsDownload ? "you-download-button" : "you-settings")
     }
 
     // MARK: - No name -
@@ -300,11 +316,9 @@ struct YouScreen: View {
         ShareSheet.present(activityItem: item) { _ in }
     }
 
-    /// Presents the card without the cover's slide-up, so its own scan-style reveal is the only motion.
+    /// Shows the card; it runs its own scan-style reveal, and the toolbar glyph fades to Download alongside.
     private func showProfileCard() {
-        var transaction = Transaction()
-        transaction.disablesAnimations = true
-        withTransaction(transaction) { router.isShowingProfileCard = true }
+        withAnimation(ProfileCardScreen.fade) { router.isShowingProfileCard = true }
     }
 
     private func handleShareChoice() {
diff --git a/FlipcashTests/Navigation/HomeTabBarVisibilityTests.swift b/FlipcashTests/Navigation/HomeTabBarVisibilityTests.swift
index 476298cbe..a204a2620 100644
--- a/FlipcashTests/Navigation/HomeTabBarVisibilityTests.swift
+++ b/FlipcashTests/Navigation/HomeTabBarVisibilityTests.swift
@@ -15,6 +15,7 @@ struct HomeTabBarVisibilityTests {
         let hidden = tab.hidesTabBar(
             isWalletCardExpanded: true,
             isShowingBill: false,
+            isShowingProfileCard: false,
             hasPushedScreen: false
         )
         #expect(hidden == (tab == .wallet))
@@ -22,12 +23,23 @@ struct HomeTabBarVisibilityTests {
 
     @Test("a bill or a pushed screen hides the bar on every tab", arguments: HomeTab.allCases)
     func billOrPush_hidesEverywhere(tab: HomeTab) {
-        #expect(tab.hidesTabBar(isWalletCardExpanded: false, isShowingBill: true, hasPushedScreen: false))
-        #expect(tab.hidesTabBar(isWalletCardExpanded: false, isShowingBill: false, hasPushedScreen: true))
+        #expect(tab.hidesTabBar(isWalletCardExpanded: false, isShowingBill: true, isShowingProfileCard: false, hasPushedScreen: false))
+        #expect(tab.hidesTabBar(isWalletCardExpanded: false, isShowingBill: false, isShowingProfileCard: false, hasPushedScreen: true))
+    }
+
+    @Test("the profile card hides the bar only on the You tab", arguments: HomeTab.allCases)
+    func profileCard_hidesOnlyOnYou(tab: HomeTab) {
+        let hidden = tab.hidesTabBar(
+            isWalletCardExpanded: false,
+            isShowingBill: false,
+            isShowingProfileCard: true,
+            hasPushedScreen: false
+        )
+        #expect(hidden == (tab == .tipCard))
     }
 
     @Test("nothing open shows the bar", arguments: HomeTab.allCases)
     func idle_shows(tab: HomeTab) {
-        #expect(!tab.hidesTabBar(isWalletCardExpanded: false, isShowingBill: false, hasPushedScreen: false))
+        #expect(!tab.hidesTabBar(isWalletCardExpanded: false, isShowingBill: false, isShowingProfileCard: false, hasPushedScreen: false))
     }
 }

From 88caa60ae9e007d7fb96da4752217a5fe43bd5da Mon Sep 17 00:00:00 2001
From: Brandon McAnsh <git@bmcreations.dev>
Date: Tue, 6 Oct 2026 12:33:17 -0400
Subject: [PATCH 28/45] test(profile): wait for the gear to return after
 closing the profile card

---
 FlipcashUITests/Smoke/ProfileCardSmokeTests.swift | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/FlipcashUITests/Smoke/ProfileCardSmokeTests.swift b/FlipcashUITests/Smoke/ProfileCardSmokeTests.swift
index 052fbf14f..ba9375611 100644
--- a/FlipcashUITests/Smoke/ProfileCardSmokeTests.swift
+++ b/FlipcashUITests/Smoke/ProfileCardSmokeTests.swift
@@ -5,7 +5,7 @@
 
 import XCTest
 
-/// Covers the profile card the You tab's Share menu presents full screen, and its Close button.
+/// Covers the profile card the You tab's Share menu shows over the tab, and its Close button.
 ///
 /// **Prerequisites:** the `FLIPCASH_UI_TEST_ACCESS_KEY` account needs a display
 /// name — without one the tab has no Share menu and no card to show.
@@ -28,9 +28,11 @@ final class ProfileCardSmokeTests: BaseUITestCase {
 
         waitAndTap(app.buttons["profile-card-close"])
 
+        // The card draws over the tab, so the tab's own buttons stay in the tree while it is up. The
+        // toolbar button reads Settings again only once the card is gone.
         XCTAssertTrue(
-            app.buttons["you-share"].waitForExistence(timeout: 10),
-            "Expected Close to return to the You tab"
+            app.buttons["you-settings"].waitForExistence(timeout: 10),
+            "Expected Close to return to the You tab, with the gear back in place of Download"
         )
     }
 }

From e885f16f006a92a02fe92dada3be5585156a83d7 Mon Sep 17 00:00:00 2001
From: Brandon McAnsh <git@bmcreations.dev>
Date: Tue, 6 Oct 2026 12:36:01 -0400
Subject: [PATCH 29/45] test(profile): back out of Edit Profile in one step now
 that it opens from the You tab

---
 FlipcashUITests/Smoke/DisplayNameSmokeTests.swift | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/FlipcashUITests/Smoke/DisplayNameSmokeTests.swift b/FlipcashUITests/Smoke/DisplayNameSmokeTests.swift
index 6e8b622ad..c3d6a53cf 100644
--- a/FlipcashUITests/Smoke/DisplayNameSmokeTests.swift
+++ b/FlipcashUITests/Smoke/DisplayNameSmokeTests.swift
@@ -7,7 +7,7 @@ import XCTest
 
 /// Covers the display name and the tip card it earns: a freshly registered
 /// account lands on the You tab with a card it can share, and the name behind
-/// that card can be changed from Settings.
+/// that card can be changed from Edit Profile.
 ///
 /// This replaces the old profile-creation walkthrough (Tips intro → name →
 /// photo → tipcard), which has no subject left. The name step is mandatory
@@ -101,10 +101,9 @@ final class DisplayNameSmokeTests: BaseUITestCase {
         )
 
         // `ProfileNameScreen(completion: .back)` pops itself only once
-        // `SetDisplayName` returns, so landing back on Settings is proof the
+        // `SetDisplayName` returns, so landing back on Edit Profile is proof the
         // new name was accepted and moderated — a rejection keeps the editor up
-        // behind a dialog. It pops just the one screen, so this is Edit Profile
-        // rather than the You tab root.
+        // behind a dialog.
         XCTAssertTrue(
             settings.displayNameRow.waitForExistence(timeout: 60),
             "Expected the name editor to pop back to Edit Profile once the name saved. On screen: [\(visibleText())]"
@@ -113,9 +112,9 @@ final class DisplayNameSmokeTests: BaseUITestCase {
         // MARK: The profile survives the rename.
         // Unwind the last screen by hand: the tab bar stays hidden while the
         // You tab has a stack, so there is no You button to tap back to.
+        // Edit Profile is one push from the root; a second tap would land on the gear.
         waitAndTap(app.navigationBars.buttons.firstMatch)
-        waitAndTap(app.navigationBars.buttons.firstMatch)
-        assertMainScreenReached(timeout: 30, "Expected the You tab root after backing out of Settings")
+        assertMainScreenReached(timeout: 30, "Expected the You tab root after backing out of Edit Profile")
         XCTAssertTrue(
             app.buttons["you-share"].waitForExistence(timeout: 30),
             "Expected the profile still on the You tab after renaming"

From 28e684b35ed508afc712de69ed7aaa8655006bf9 Mon Sep 17 00:00:00 2001
From: Brandon McAnsh <git@bmcreations.dev>
Date: Tue, 6 Oct 2026 13:05:48 -0400
Subject: [PATCH 30/45] fix(profile): focus editor fields once the push settles

The keyboard and Save button rose while the screen was still sliding in, so Save animated in from off screen. Name, Username, Bio, username lookup and group name now focus after the push finishes.
---
 .../Screens/Main/Profile/EditBioScreen.swift  |  2 +-
 .../Main/Profile/ProfileNameScreen.swift      |  2 +-
 .../Main/Username/UsernameEntryScreen.swift   |  6 ++----
 .../Main/Username/UsernameLookupScreen.swift  |  2 +-
 .../Edit Group/EditGroupNameScreen.swift      |  2 +-
 .../FlipcashUI/Modifiers/FocusAfterPush.swift | 21 +++++++++++++++++++
 6 files changed, 27 insertions(+), 8 deletions(-)
 create mode 100644 FlipcashUI/Sources/FlipcashUI/Modifiers/FocusAfterPush.swift

diff --git a/Flipcash/Core/Screens/Main/Profile/EditBioScreen.swift b/Flipcash/Core/Screens/Main/Profile/EditBioScreen.swift
index 71c5a4463..ab16141a1 100644
--- a/Flipcash/Core/Screens/Main/Profile/EditBioScreen.swift
+++ b/Flipcash/Core/Screens/Main/Profile/EditBioScreen.swift
@@ -77,7 +77,7 @@ struct EditBioScreen: View {
         .navigationTitle("Bio")
         .navigationBarTitleDisplayMode(.inline)
         .dialog(item: $dialog)
-        .onAppear { isFocused = true }
+        .focusAfterPush($isFocused)
         .onChange(of: model.failure == nil) { _, isNil in
             guard !isNil else { return }
             model.failure = nil
diff --git a/Flipcash/Core/Screens/Main/Profile/ProfileNameScreen.swift b/Flipcash/Core/Screens/Main/Profile/ProfileNameScreen.swift
index 7bd08ba00..65363c06e 100644
--- a/Flipcash/Core/Screens/Main/Profile/ProfileNameScreen.swift
+++ b/Flipcash/Core/Screens/Main/Profile/ProfileNameScreen.swift
@@ -89,7 +89,7 @@ struct ProfileNameScreen: View {
         }
         .navigationBarTitleDisplayMode(.inline)
         .dialog(item: $dialog)
-        .onAppear { isNameFocused = true }
+        .focusAfterPush($isNameFocused)
         // Leaving the screen abandons the submission: its only continuation is a
         // push onto a stack this screen no longer sits on.
         .onDisappear { submitTask?.cancel() }
diff --git a/Flipcash/Core/Screens/Main/Username/UsernameEntryScreen.swift b/Flipcash/Core/Screens/Main/Username/UsernameEntryScreen.swift
index 716e9547c..3274a2951 100644
--- a/Flipcash/Core/Screens/Main/Username/UsernameEntryScreen.swift
+++ b/Flipcash/Core/Screens/Main/Username/UsernameEntryScreen.swift
@@ -90,10 +90,8 @@ struct UsernameEntryScreen: View {
         }
         .navigationBarTitleDisplayMode(.inline)
         .dialog(item: $dialog)
-        .onAppear {
-            input = currentUsername?.value ?? ""
-            isFocused = true
-        }
+        .onAppear { input = currentUsername?.value ?? "" }
+        .focusAfterPush($isFocused)
         // Leaving abandons the submission: its only continuation pops a stack
         // this screen no longer sits on.
         .onDisappear { submitTask?.cancel() }
diff --git a/Flipcash/Core/Screens/Main/Username/UsernameLookupScreen.swift b/Flipcash/Core/Screens/Main/Username/UsernameLookupScreen.swift
index b4eada42f..033a5cb91 100644
--- a/Flipcash/Core/Screens/Main/Username/UsernameLookupScreen.swift
+++ b/Flipcash/Core/Screens/Main/Username/UsernameLookupScreen.swift
@@ -94,7 +94,7 @@ struct UsernameLookupScreen: View {
         }
         .navigationBarTitleDisplayMode(.inline)
         .dialog(item: $errorDialog)
-        .onAppear { isFocused = true }
+        .focusAfterPush($isFocused)
         // Backing out abandons the lookup rather than pushing a chat onto a
         // stack the user has left. Fires on the hand-off too, once the chat
         // covers this screen, which is why the hand-off detaches itself first.
diff --git a/Flipcash/Core/Screens/Profile/Edit Group/EditGroupNameScreen.swift b/Flipcash/Core/Screens/Profile/Edit Group/EditGroupNameScreen.swift
index 7e5cfa0a5..0da271350 100644
--- a/Flipcash/Core/Screens/Profile/Edit Group/EditGroupNameScreen.swift	
+++ b/Flipcash/Core/Screens/Profile/Edit Group/EditGroupNameScreen.swift	
@@ -94,7 +94,7 @@ struct EditGroupNameScreen: View {
         // a display name; a bar title on top of it would ask twice.
         .navigationBarTitleDisplayMode(.inline)
         .dialog(item: $dialog)
-        .onAppear { isNameFocused = true }
+        .focusAfterPush($isNameFocused)
         // Leaving the screen abandons the submission: its only continuation is a pop off a stack
         // this screen no longer sits on.
         .onDisappear { submitTask?.cancel() }
diff --git a/FlipcashUI/Sources/FlipcashUI/Modifiers/FocusAfterPush.swift b/FlipcashUI/Sources/FlipcashUI/Modifiers/FocusAfterPush.swift
new file mode 100644
index 000000000..13ff936dd
--- /dev/null
+++ b/FlipcashUI/Sources/FlipcashUI/Modifiers/FocusAfterPush.swift
@@ -0,0 +1,21 @@
+//
+//  FocusAfterPush.swift
+//  FlipcashUI
+//
+
+import SwiftUI
+
+extension View {
+
+    /// Focuses `focus` once the push that brought this screen in has finished, so the keyboard and
+    /// anything pinned above it rise on a screen that is already in place.
+    public func focusAfterPush(_ focus: FocusState<Bool>.Binding) -> some View {
+        task {
+            // A navigation push runs about 0.5s; focusing during it slides the keyboard's
+            // accessories in from off screen alongside the incoming view.
+            try? await Task.sleep(for: .milliseconds(500))
+            guard !Task.isCancelled else { return }
+            focus.wrappedValue = true
+        }
+    }
+}

From 8cd5ce8a7cdda77e33faeaa76fa06a8d3e26b5e9 Mon Sep 17 00:00:00 2001
From: Brandon McAnsh <git@bmcreations.dev>
Date: Tue, 6 Oct 2026 13:05:48 -0400
Subject: [PATCH 31/45] fix(settings): uppercase section headings and gate
 Account Info behind beta

---
 Flipcash/Core/Controllers/BetaFlags.swift                 | 3 +++
 Flipcash/Core/Screens/Settings/SettingsScreen.swift       | 8 +++++---
 .../Core/Screens/Settings/SettingsSectionHeader.swift     | 1 +
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Flipcash/Core/Controllers/BetaFlags.swift b/Flipcash/Core/Controllers/BetaFlags.swift
index f8db65fef..425256fc2 100644
--- a/Flipcash/Core/Controllers/BetaFlags.swift
+++ b/Flipcash/Core/Controllers/BetaFlags.swift
@@ -67,6 +67,9 @@ class BetaFlags {
     /// You-tab long press share this gate, so the two never disagree.
     var canSwitchAccounts: Bool { accessGranted }
 
+    /// Whether Settings shows the Account Info row.
+    var canViewAccountInfo: Bool { accessGranted }
+
     /// Enables or disables a beta flag and persists the change to disk.
     func set(_ option: Option, enabled: Bool) {
         if enabled {
diff --git a/Flipcash/Core/Screens/Settings/SettingsScreen.swift b/Flipcash/Core/Screens/Settings/SettingsScreen.swift
index 9d22abcf7..3f3e78f26 100644
--- a/Flipcash/Core/Screens/Settings/SettingsScreen.swift
+++ b/Flipcash/Core/Screens/Settings/SettingsScreen.swift
@@ -108,10 +108,12 @@ struct SettingsScreen: View {
         VStack(alignment: .leading, spacing: 0) {
             SettingsSectionHeader("Account")
 
-            SettingsRow(systemImage: "person.crop.circle", title: "Account Info", insets: insets) {
-                router.push(.accountInfo)
+            if betaFlags.canViewAccountInfo {
+                SettingsRow(systemImage: "person.crop.circle", title: "Account Info", badge: .beta, insets: insets) {
+                    router.push(.accountInfo)
+                }
+                .accessibilityIdentifier("settings-account-info-row")
             }
-            .accessibilityIdentifier("settings-account-info-row")
 
             SettingsRow(asset: .logout, title: "Log Out", insets: insets) {
                 dialogItem = .alert(
diff --git a/Flipcash/Core/Screens/Settings/SettingsSectionHeader.swift b/Flipcash/Core/Screens/Settings/SettingsSectionHeader.swift
index 61cc0d50a..3cd8ecce2 100644
--- a/Flipcash/Core/Screens/Settings/SettingsSectionHeader.swift
+++ b/Flipcash/Core/Screens/Settings/SettingsSectionHeader.swift
@@ -18,6 +18,7 @@ struct SettingsSectionHeader: View {
     var body: some View {
         HStack {
             Text(title)
+                .textCase(.uppercase)
                 .font(.appTextHeading)
                 .foregroundStyle(.textSecondary)
             Spacer()

From 780c4d02ee6ab09d2f5f530d6f4190e06e114c53 Mon Sep 17 00:00:00 2001
From: Brandon McAnsh <git@bmcreations.dev>
Date: Tue, 6 Oct 2026 13:19:39 -0400
Subject: [PATCH 32/45] fix(profile): show the effective minimum to chat in
 Edit Profile

Edit Profile read only the account's own fee and showed "Not set" when there was none, while the You tab showed the regional minimum others actually pay. Both now use StartChattingFee.
---
 Flipcash/Core/Screens/Main/Profile/EditProfileScreen.swift | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Flipcash/Core/Screens/Main/Profile/EditProfileScreen.swift b/Flipcash/Core/Screens/Main/Profile/EditProfileScreen.swift
index 4c5ecbf82..e6706b043 100644
--- a/Flipcash/Core/Screens/Main/Profile/EditProfileScreen.swift
+++ b/Flipcash/Core/Screens/Main/Profile/EditProfileScreen.swift
@@ -13,6 +13,7 @@ struct EditProfileScreen: View {
 
     @Environment(AppRouter.self) private var router
     @Environment(SessionContainer.self) private var sessionContainer
+    @Environment(RatesController.self) private var ratesController
 
     @State private var dialog: DialogItem?
 
@@ -153,8 +154,9 @@ struct EditProfileScreen: View {
         }
     }
 
+    /// What others pay to start a chat, matching the You tab's stats card.
     private var minimumToChat: String? {
-        profile?.minDmChatInitFee?.formatted()
+        StartChattingFee.amount(for: profile, session: session, ratesController: ratesController)?.formatted()
     }
 
     private func nonEmpty(_ string: String?) -> String? {

From a3ad16226816e9068617309fd45f4efa514589e2 Mon Sep 17 00:00:00 2001
From: Brandon McAnsh <git@bmcreations.dev>
Date: Tue, 6 Oct 2026 12:39:38 -0400
Subject: [PATCH 33/45] feat(routing): open the profile until the DM exists

A scan always opens the person's profile after the card's 750ms hold. A
username search and a transaction's details open the DM when it exists
and the profile until then, through DMRoute. The profile is where the
paid chat starts, so nothing routes into a conversation by user ID any
more, and tipConversationForUser and tipConversationForUserSendingCash
are removed.
---
 .../Navigation/AppRouter+Destination.swift    | 17 +------
 .../AppRouter+DestinationView.swift           | 11 ----
 Flipcash/Core/Navigation/DMRoute.swift        | 22 ++++++++
 .../Main/Home/TransactionDetailsScreen.swift  | 11 ++--
 Flipcash/Core/Screens/Main/Tips/TipFlow.swift | 46 ++++++++---------
 .../Main/Username/UsernameLookupScreen.swift  | 31 +++++++-----
 .../Screens/Profile/UserProfileScreen.swift   | 31 +++++++++---
 .../Models/TransactionDetails.swift           |  9 ++--
 .../UserProfileChatActionsTests.swift         | 31 ++++++------
 .../UsernameLookupRoutingTests.swift          | 50 +++++++++----------
 10 files changed, 135 insertions(+), 124 deletions(-)
 create mode 100644 Flipcash/Core/Navigation/DMRoute.swift

diff --git a/Flipcash/Core/Navigation/AppRouter+Destination.swift b/Flipcash/Core/Navigation/AppRouter+Destination.swift
index ca52e943d..13a85d080 100644
--- a/Flipcash/Core/Navigation/AppRouter+Destination.swift
+++ b/Flipcash/Core/Navigation/AppRouter+Destination.swift
@@ -111,14 +111,6 @@ extension AppRouter {
         /// trace shows "post-tip, keyboard up" distinctly, and so the ordinary
         /// tip-list / push-notification opens stay keyboard-closed untouched.
         case tipConversationWithKeyboard(ConversationID)
-        /// A tip DM named by its counterpart rather than its chat id — the
-        /// username lookup's destination. The chat is created by the first tip,
-        /// so before then there is no id to push; the screen derives one.
-        case tipConversationForUser(UserID)
-        /// Same chat as `tipConversationForUser`, opened with Send Cash already started — the
-        /// profile's Send Cash button. A sibling case for the same reason as
-        /// `tipConversationWithKeyboard`: the trace shows the send-first open distinctly.
-        case tipConversationForUserSendingCash(UserID)
         /// A person's Flipcash profile, pushed from a tip DM's title/card or a group member's face;
         /// hosts the Block action. `origin` decides whether it offers a way into the DM.
         case userProfile(UserID, origin: UserProfileOrigin)
@@ -156,8 +148,7 @@ extension AppRouter {
                  .settingsApplicationLogs, .blockedUsers, .accessKey, .withdraw:
                 return .you
             case .profileName, .profilePhoto, .tipcard, .usernameLookup, .newChat, .newPublicGroup,
-                 .tipConversation, .tipConversationWithKeyboard, .tipConversationForUser,
-                 .tipConversationForUserSendingCash, .userProfile, .chatProfile,
+                 .tipConversation, .tipConversationWithKeyboard, .userProfile, .chatProfile,
                  .editGroup, .editGroupName, .editGroupPicture, .archivedChats:
                 return .tips
             }
@@ -209,8 +200,6 @@ extension AppRouter {
             case .newPublicGroup:               "newPublicGroup"
             case .tipConversation:              "tipConversation"
             case .tipConversationWithKeyboard:  "tipConversationWithKeyboard"
-            case .tipConversationForUser:       "tipConversationForUser"
-            case .tipConversationForUserSendingCash: "tipConversationForUserSendingCash"
             case .userProfile:                  "userProfile"
             case .chatProfile:                  "chatProfile"
             case .editGroup:                    "editGroup"
@@ -244,9 +233,7 @@ extension AppRouter {
                  .editGroupName(let conversationID),
                  .editGroupPicture(let conversationID):
                 return conversationID.description
-            case .userProfile(let userID, _),
-                 .tipConversationForUser(let userID),
-                 .tipConversationForUserSendingCash(let userID):
+            case .userProfile(let userID, _):
                 return userID.uuidString
             case .username(let username):
                 return username?.value
diff --git a/Flipcash/Core/Navigation/AppRouter+DestinationView.swift b/Flipcash/Core/Navigation/AppRouter+DestinationView.swift
index 69d74a4f1..f35f2359c 100644
--- a/Flipcash/Core/Navigation/AppRouter+DestinationView.swift
+++ b/Flipcash/Core/Navigation/AppRouter+DestinationView.swift
@@ -210,17 +210,6 @@ struct DestinationView: View {
             ConversationScreen(context: .existing(conversationID), openKeyboard: true)
                 .id(conversationID)
 
-        case .tipConversationForUser(let userID):
-            // Opened before the chat exists, so the screen is given the person
-            // and derives the chat id itself. `.id` forces fresh view identity.
-            ConversationScreen(context: .tipDM(counterpart: userID))
-                .id(userID)
-
-        case .tipConversationForUserSendingCash(let userID):
-            // The profile's Send Cash: the same chat, with the send started on open.
-            ConversationScreen(context: .tipDM(counterpart: userID), startSendCash: true)
-                .id(userID)
-
         case .userProfile(let userID, let origin):
             UserProfileScreen(userID: userID, origin: origin)
                 .id(userID)
diff --git a/Flipcash/Core/Navigation/DMRoute.swift b/Flipcash/Core/Navigation/DMRoute.swift
new file mode 100644
index 000000000..7b8d8bd81
--- /dev/null
+++ b/Flipcash/Core/Navigation/DMRoute.swift
@@ -0,0 +1,22 @@
+//
+//  DMRoute.swift
+//  Flipcash
+//
+
+import FlipcashCore
+
+/// Where opening a person lands: their DM once it exists, their profile until then.
+nonisolated enum DMRoute {
+
+    /// The destination for opening `userID`, given the DM with them if there is one.
+    static func destination(
+        for userID: UserID,
+        dmID: ConversationID?,
+        origin: UserProfileOrigin
+    ) -> AppRouter.Destination {
+        if let dmID {
+            return .tipConversation(dmID)
+        }
+        return .userProfile(userID, origin: origin)
+    }
+}
diff --git a/Flipcash/Core/Screens/Main/Home/TransactionDetailsScreen.swift b/Flipcash/Core/Screens/Main/Home/TransactionDetailsScreen.swift
index cfaad557d..67c70bb6e 100644
--- a/Flipcash/Core/Screens/Main/Home/TransactionDetailsScreen.swift
+++ b/Flipcash/Core/Screens/Main/Home/TransactionDetailsScreen.swift
@@ -71,15 +71,16 @@ struct TransactionDetailsScreen: View {
                         idCard
 
                         if let userID = activity.counterparty?.userID, details.canViewInChat {
-                            Button("View in Chat") {
+                            let dmID = sessionContainer.conversationController.tipDMID(withUserID: userID)
+                            Button(dmID == nil ? "View Profile" : "View in Chat") {
                                 // Pushed onto the stack this screen is already
                                 // on, not routed to the Chat tab: a cross-stack
                                 // jump swaps the tab out from under the
                                 // transition, so the bar and the conversation
-                                // list both show before the chat lands. Pushed,
-                                // the chat arrives from the entry it belongs to
-                                // and back returns here.
-                                router.push(.tipConversationForUser(userID))
+                                // list both show before the screen lands.
+                                // Pushed, it arrives from the entry it belongs
+                                // to and back returns here.
+                                router.push(DMRoute.destination(for: userID, dmID: dmID, origin: .transaction))
                             }
                             .buttonStyle(.filled05)
                         }
diff --git a/Flipcash/Core/Screens/Main/Tips/TipFlow.swift b/Flipcash/Core/Screens/Main/Tips/TipFlow.swift
index 6f7790feb..9c0f01e48 100644
--- a/Flipcash/Core/Screens/Main/Tips/TipFlow.swift
+++ b/Flipcash/Core/Screens/Main/Tips/TipFlow.swift
@@ -11,8 +11,7 @@ private let logger = Logger(label: "flipcash.tip-flow")
 
 /// Session-scoped orchestrator for opening someone's tipcard. Entered from a
 /// scanned tipcode or a legacy `/tip/<userId>` link, it gates the entry (profile), resolves
-/// the recipient, shows the card, and hands over to their chat — where the
-/// amount is chosen and sent (node 10074:18893).
+/// the recipient, shows the card, and hands over to their profile.
 @Observable
 final class TipFlow {
 
@@ -22,7 +21,7 @@ final class TipFlow {
 
     @ObservationIgnored private var prepTask: Task<Void, Never>?
 
-    /// The hold between the card landing and the chat opening. Held so a
+    /// The hold between the card landing and the profile opening. Held so a
     /// dismissed card cancels the hand-off, and so a second entry can't start
     /// while one is mid-flight.
     @ObservationIgnored private var routeTask: Task<Void, Never>?
@@ -53,11 +52,9 @@ final class TipFlow {
     /// (routed to the user's own profile), then a tippable profile (held +
     /// profile creation presented).
     ///
-    /// No balance gate: this flow no longer moves money, it opens a chat. The
-    /// giveable-balance check belongs to the send the chat makes, and
-    /// `ConversationScreen.sendCash()` already applies it there — gating the
-    /// card as well would stop an empty-balance user from reaching a
-    /// conversation they can read and reply in.
+    /// No balance gate: this flow no longer moves money, it opens a profile.
+    /// The giveable-balance check belongs to the payment that starts the chat,
+    /// which the profile applies.
     func begin(userID: UserID) {
         // Tipping yourself is a payment no-op, so there's no flow to start from
         // your own code — show the user their own profile rather than swallow
@@ -154,9 +151,8 @@ final class TipFlow {
                 }
 
                 guard !Task.isCancelled else { return }
-                // The chat is created by the first tip, so until then the
-                // conversation's only source for the counterpart's name,
-                // picture, and handle is the profile this resolve fetched.
+                // The profile screen reads this instead of fetching again; see
+                // `UserProfileOrigin.arrivesFetched`.
                 session.cacheUserProfile(profile, for: userID)
                 present(userID: userID, profile: profile)
                 await loadAvatar(userID: userID, picture: profile.profilePicture)
@@ -182,12 +178,11 @@ final class TipFlow {
     }
 
     /// Shows the resolved card, holds it long enough to read whose it is, then
-    /// pops it away as the chat with them pushes in underneath.
+    /// pops it away as their profile pushes in underneath.
     ///
     /// The card is the confirmation that the right code was scanned, not a
-    /// place to compose from: the amount is chosen in the chat, behind the
-    /// "Start Chatting" CTA, which is where the username lookup already lands
-    /// (node 10074:18893).
+    /// place to compose from. The profile is where the chat starts, and it is
+    /// where a scan lands even once the DM exists, offering Open Chat there.
     private func present(userID: UserID, profile: Profile) {
         // The card is resolved and about to show, whether reached from a scan or
         // a deep link — the second step of the Scanned → Presented → Sent Tip funnel.
@@ -199,9 +194,9 @@ final class TipFlow {
         keyboard.suppress()
 
         // A tip deep link can beat the app's foreground stream refresh, so kick the
-        // rate stream to reconnect now, while the card animates in. The chat's CTA
-        // names the fee in the display currency and its amount screen priced in it,
-        // so both want a rate the moment they appear.
+        // rate stream to reconnect now, while the card animates in. The profile's
+        // pinned button names the fee in the display currency, so it wants a rate
+        // the moment it appears.
         ratesController.ensureStreamConnected()
 
         session.billState = BillState(bill: .tipcard(
@@ -213,11 +208,11 @@ final class TipFlow {
         session.presentationState = .visible(.pop)
 
         // The card's pop is given 750ms to settle and be read, then it leaves
-        // and the chat arrives together: the dismissal and the route happen in
-        // the same tick, so the card's 100ms exit plays over the chat pushing
+        // and the profile arrives together: the dismissal and the route happen in
+        // the same tick, so the card's 100ms exit plays over the profile pushing
         // in rather than handing back to the camera in between. Cancelled by
         // `cancel()`, so a card the user drags away during the hold never drops
-        // them into a chat they backed out of.
+        // them onto a profile they backed out of.
         routeTask = Task { [weak self] in
             defer { self?.routeTask = nil }
             try? await Task.delay(milliseconds: 750)
@@ -228,10 +223,11 @@ final class TipFlow {
             }
 
             // `navigate` rather than `push`: the card is an app-root overlay
-            // raised over whichever tab the scan or link arrived on, and a tip
-            // DM belongs on the Tips stack. This brings that tab forward with
-            // the chat as its only entry, so Back lands on the chat list.
-            router.navigate(to: .tipConversationForUser(userID))
+            // raised over whichever tab the scan or link arrived on, and the DM
+            // the profile leads to belongs on the Tips stack. This brings that
+            // tab forward with the profile as its only entry, so Back lands on
+            // the chat list.
+            router.navigate(to: .userProfile(userID, origin: .scan))
         }
     }
 
diff --git a/Flipcash/Core/Screens/Main/Username/UsernameLookupScreen.swift b/Flipcash/Core/Screens/Main/Username/UsernameLookupScreen.swift
index 033a5cb91..cf7df413a 100644
--- a/Flipcash/Core/Screens/Main/Username/UsernameLookupScreen.swift
+++ b/Flipcash/Core/Screens/Main/Username/UsernameLookupScreen.swift
@@ -141,16 +141,15 @@ struct UsernameLookupScreen: View {
                 buttonState = .success
                 try await Task.delay(milliseconds: 500)
 
-                // Your own handle has no chat to open — one tipcard is what
-                // scanning your own code already shows.
+                // Your own handle has no chat to open — scanning your own code
+                // already shows your own profile.
                 guard userID != session.userID else {
                     sessionContainer.tipFlow.begin(userID: userID)
                     return
                 }
 
-                // The chat is created by the first tip, so until then the
-                // screen's only source for the counterpart's name, picture, and
-                // handle is the profile this lookup just fetched.
+                // The profile screen reads this instead of fetching again, and a
+                // chat with no record yet reads its counterpart from it.
                 session.cacheUserProfile(profile, for: userID)
 
                 // Detached before the push: covering this screen fires the
@@ -158,16 +157,22 @@ struct UsernameLookupScreen: View {
                 // that has to run anyway.
                 lookupTask = nil
 
-                let chat = AppRouter.Destination.tipConversationForUser(userID)
+                // The DM once it exists, the profile until then: the profile is
+                // where the chat starts.
+                let destination = DMRoute.destination(
+                    for: userID,
+                    dmID: sessionContainer.conversationController.tipDMID(withUserID: userID),
+                    origin: .usernameLookup
+                )
 
                 // Measured rather than assumed: this screen is reached through
                 // the New Chat picker today and was reached straight off the
                 // chat list before it, so a fixed depth silently stops matching
                 // the moment a screen is added to or removed from the route.
-                let depthWithChat = router[.tips].count + 1
-                router.push(chat)
+                let depthWithDestination = router[.tips].count + 1
+                router.push(destination)
 
-                // Well inside the push transition, so the remounted chat settles
+                // Well inside the push transition, so the remounted screen settles
                 // behind the animation rather than in front of the user. Late
                 // enough that SwiftUI has committed the push as its own update:
                 // rewriting in the same tick coalesces the two into a leaf swap,
@@ -175,17 +180,17 @@ struct UsernameLookupScreen: View {
                 try await Task.delay(milliseconds: 150)
 
                 // Unless they went back while it landed: the lookup left with
-                // them, and rewriting the path would drag the chat back.
-                guard router[.tips].count == depthWithChat else { return }
+                // them, and rewriting the path would drag the screen back.
+                guard router[.tips].count == depthWithDestination else { return }
 
                 // Unanimated, because nothing is arriving — only the entry
                 // underneath is leaving. Animated, SwiftUI stages the remount as
-                // a second push: the same chat sliding in over the one already
+                // a second push: the same screen sliding in over the one already
                 // on screen.
                 var transaction = Transaction()
                 transaction.disablesAnimations = true
                 withTransaction(transaction) {
-                    router.setPath([chat], on: .tips)
+                    router.setPath([destination], on: .tips)
                 }
 
             } catch {
diff --git a/Flipcash/Core/Screens/Profile/UserProfileScreen.swift b/Flipcash/Core/Screens/Profile/UserProfileScreen.swift
index e337c7390..6d06b8a82 100644
--- a/Flipcash/Core/Screens/Profile/UserProfileScreen.swift
+++ b/Flipcash/Core/Screens/Profile/UserProfileScreen.swift
@@ -361,32 +361,47 @@ nonisolated enum UserProfileOrigin: Hashable {
     case mention
     /// A `flipcash.com/<handle>` or `flipcash.com/<userId>` link opened into the app.
     case deeplink
+    /// Their code scanned with the camera, or their profile QR link opened, after the card shows.
+    case scan
+    /// A username search from New Chat, with no DM yet.
+    case usernameLookup
+    /// A transaction's details, with no DM yet.
+    case transaction
 
     /// Whether Open Chat returns to the DM the profile was opened from rather than pushing a
     /// second copy of it.
     var returnsToExistingDM: Bool {
         switch self {
-        case .directMessage:                          return true
-        case .groupMember, .mention, .deeplink:       return false
+        case .directMessage:
+            return true
+        case .groupMember, .mention, .deeplink, .scan, .usernameLookup, .transaction:
+            return false
         }
     }
 
     /// Whether the profile was fetched and cached just before the screen opened, so the screen
-    /// reads the cache instead of fetching again. A link is looked up before it navigates.
+    /// reads the cache instead of fetching again. A link, a scan, and a username search all look the
+    /// person up before they navigate.
     var arrivesFetched: Bool {
         switch self {
-        case .deeplink:                               return true
-        case .directMessage, .groupMember, .mention:  return false
+        case .deeplink, .scan, .usernameLookup:
+            return true
+        case .directMessage, .groupMember, .mention, .transaction:
+            return false
         }
     }
 
     /// Whether blocking closes just the profile rather than resetting its stack. From a chat the
     /// stack beneath can hold the blocked person's DM, so it resets; a link opened the profile over
-    /// whatever the user was on, and that is where blocking returns them.
+    /// whatever the user was on, and that is where blocking returns them, as does a transaction's
+    /// details. A scan or a username search opens the profile as the Chats tab's only entry, so a
+    /// reset lands on the chat list either way.
     var blockReturnsToOpener: Bool {
         switch self {
-        case .deeplink:                               return true
-        case .directMessage, .groupMember, .mention:  return false
+        case .deeplink, .transaction:
+            return true
+        case .directMessage, .groupMember, .mention, .scan, .usernameLookup:
+            return false
         }
     }
 }
diff --git a/FlipcashCore/Sources/FlipcashCore/Models/TransactionDetails.swift b/FlipcashCore/Sources/FlipcashCore/Models/TransactionDetails.swift
index 4533ee991..53fd0ea5b 100644
--- a/FlipcashCore/Sources/FlipcashCore/Models/TransactionDetails.swift
+++ b/FlipcashCore/Sources/FlipcashCore/Models/TransactionDetails.swift
@@ -129,7 +129,7 @@ public struct TransactionDetails: Sendable, Equatable, Hashable {
     /// nothing else.
     public let canCancel: Bool
 
-    /// Whether the counterparty's conversation can be opened from here.
+    /// Whether the counterparty can be opened from here: their DM, or their profile until it exists.
     public let canViewInChat: Bool
 
     /// The line the header actually renders.
@@ -177,10 +177,9 @@ extension TransactionDetails {
         self.fee = swap?.fee
         self.received = swap?.toFiat
         self.canCancel = activity.cancellableCashLinkMetadata != nil
-        // Opening the conversation needs somebody to open it with, and only a
-        // user id identifies one — a phone-number counterparty has no chat. The
-        // display name is not required: the chat screen derives its own header
-        // from the id (see `AppRouter.Destination.tipConversationForUser`).
+        // Opening the person needs somebody to open, and only a user id
+        // identifies one — a phone-number counterparty has no chat or profile.
+        // The display name is not required: the profile fetches its own.
         self.canViewInChat = activity.counterparty?.userID != nil
     }
 
diff --git a/FlipcashTests/UserProfileChatActionsTests.swift b/FlipcashTests/UserProfileChatActionsTests.swift
index b0c52c384..bd847359b 100644
--- a/FlipcashTests/UserProfileChatActionsTests.swift
+++ b/FlipcashTests/UserProfileChatActionsTests.swift
@@ -13,25 +13,31 @@ import FlipcashCore
 @Suite("User profile chat actions")
 struct UserProfileChatActionsTests {
 
-    @Test("Blocking from a link-opened profile returns to where the link was followed")
-    func deeplink_blockReturnsToOpener() {
-        #expect(UserProfileOrigin.deeplink.blockReturnsToOpener)
+    @Test(
+        "Blocking from a link or a transaction returns to the screen the profile opened over",
+        arguments: [UserProfileOrigin.deeplink, .transaction]
+    )
+    func openerOrigins_blockReturnsToOpener(_ origin: UserProfileOrigin) {
+        #expect(origin.blockReturnsToOpener)
     }
 
     @Test(
         "Blocking from a chat-opened profile resets the stack, which can hold the blocked DM",
-        arguments: [UserProfileOrigin.directMessage, .groupMember, .mention]
+        arguments: [UserProfileOrigin.directMessage, .groupMember, .mention, .scan, .usernameLookup]
     )
     func chatOrigins_blockResetsStack(_ origin: UserProfileOrigin) {
         #expect(!origin.blockReturnsToOpener)
     }
 
-    @Test("Only a link-opened profile arrives already fetched")
-    func arrivesFetched_onlyFromDeeplink() {
+    @Test("A link, a scan, and a username search arrive already fetched; the rest fetch")
+    func arrivesFetched_onlyAfterALookup() {
         #expect(UserProfileOrigin.deeplink.arrivesFetched)
+        #expect(UserProfileOrigin.scan.arrivesFetched)
+        #expect(UserProfileOrigin.usernameLookup.arrivesFetched)
         #expect(!UserProfileOrigin.directMessage.arrivesFetched)
         #expect(!UserProfileOrigin.groupMember.arrivesFetched)
         #expect(!UserProfileOrigin.mention.arrivesFetched)
+        #expect(!UserProfileOrigin.transaction.arrivesFetched)
     }
 
     @Test("Open Chat returns to the DM only when the profile was opened from that DM")
@@ -40,6 +46,9 @@ struct UserProfileChatActionsTests {
         #expect(!UserProfileOrigin.groupMember.returnsToExistingDM)
         #expect(!UserProfileOrigin.mention.returnsToExistingDM)
         #expect(!UserProfileOrigin.deeplink.returnsToExistingDM)
+        #expect(!UserProfileOrigin.scan.returnsToExistingDM)
+        #expect(!UserProfileOrigin.usernameLookup.returnsToExistingDM)
+        #expect(!UserProfileOrigin.transaction.returnsToExistingDM)
     }
 
     // MARK: - Destinations -
@@ -55,14 +64,4 @@ struct UserProfileChatActionsTests {
         #expect(fromDM.payload == userID.uuidString)
         #expect(fromDM.owningStack == .tips)
     }
-
-    @Test("Send Cash's chat destination logs apart from the plain chat, keyed by the counterpart")
-    func sendingCash_destination() {
-        let userID = UUID()
-        let destination = AppRouter.Destination.tipConversationForUserSendingCash(userID)
-        #expect(destination.description == "tipConversationForUserSendingCash")
-        #expect(destination.payload == userID.uuidString)
-        #expect(destination.owningStack == .tips)
-        #expect(destination != .tipConversationForUser(userID))
-    }
 }
diff --git a/FlipcashTests/UsernameLookupRoutingTests.swift b/FlipcashTests/UsernameLookupRoutingTests.swift
index 8397dddee..4456bbad1 100644
--- a/FlipcashTests/UsernameLookupRoutingTests.swift
+++ b/FlipcashTests/UsernameLookupRoutingTests.swift
@@ -8,9 +8,8 @@ import Testing
 import FlipcashCore
 @testable import Flipcash
 
-/// The username lookup opens the counterpart's chat (node 9443:8928), which
-/// does not exist server-side until the first tip. These cover what the screen
-/// has to resolve from the fetched profile alone in the meantime.
+/// The username lookup opens the counterpart's profile until a DM with them
+/// exists, and the DM after that.
 @MainActor
 @Suite("Username lookup routing")
 struct UsernameLookupRoutingTests {
@@ -26,26 +25,20 @@ struct UsernameLookupRoutingTests {
 
     // MARK: - Destination -
 
-    @Test("The chat destination belongs to the tips stack")
-    func destination_ownedByTipsStack() {
-        #expect(AppRouter.Destination.tipConversationForUser(UUID()).owningStack == .tips)
-    }
-
-    @Test("The chat destination logs the counterpart as its payload")
-    func destination_payloadIsCounterpart() {
+    @Test("Without a DM, the lookup lands on the profile, owned by the tips stack, keyed by the user")
+    func destination_withoutDMIsTheProfile() {
         let userID = UUID()
-        let destination = AppRouter.Destination.tipConversationForUser(userID)
-        #expect(destination.description == "tipConversationForUser")
+        let destination = DMRoute.destination(for: userID, dmID: nil, origin: .usernameLookup)
+        #expect(destination == .userProfile(userID, origin: .usernameLookup))
+        #expect(destination.owningStack == .tips)
         #expect(destination.payload == userID.uuidString)
     }
 
-    @Test("Two lookups of the same person are the same destination")
-    func destination_isStablePerCounterpart() {
-        let userID = UUID()
-        #expect(
-            AppRouter.Destination.tipConversationForUser(userID)
-                == AppRouter.Destination.tipConversationForUser(userID)
-        )
+    @Test("With a DM, the lookup lands on the chat")
+    func destination_withDMIsTheChat() {
+        let (me, them) = (UUID(), UUID())
+        let dmID = ConversationID.tipDm(between: me, and: them)
+        #expect(DMRoute.destination(for: them, dmID: dmID, origin: .usernameLookup) == .tipConversation(dmID))
     }
 
     // MARK: - Context -
@@ -95,21 +88,26 @@ struct UsernameLookupRoutingTests {
         #expect(router[.tips].count == 2)
     }
 
-    @Test("Back from a chat opened by handle lands on the chat list")
-    func backStack_rewriteLeavesOnlyTheChat() {
+    @Test(
+        "Back from a profile or chat opened by handle lands on the chat list",
+        arguments: [false, true]
+    )
+    func backStack_rewriteLeavesOnlyTheDestination(hasDM: Bool) {
         let router = AppRouter()
         router.activeTabStack = .tips
         router.push(.newChat)
         router.push(.usernameLookup)
 
-        let chat = AppRouter.Destination.tipConversationForUser(UUID())
-        let depthWithChat = router[.tips].count + 1
-        router.push(chat)
-        #expect(router[.tips].count == depthWithChat)
+        let them = UUID()
+        let dmID = hasDM ? ConversationID.tipDm(between: UUID(), and: them) : nil
+        let destination = DMRoute.destination(for: them, dmID: dmID, origin: .usernameLookup)
+        let depthWithDestination = router[.tips].count + 1
+        router.push(destination)
+        #expect(router[.tips].count == depthWithDestination)
 
         // What the screen does once the push has started: neither the picker
         // nor the lookup is somewhere Back belongs, and the list is the root.
-        router.setPath([chat], on: .tips)
+        router.setPath([destination], on: .tips)
         #expect(router[.tips].count == 1)
     }
 

From 50abae4ec55a3b04e17c99200b37d612542cef25 Mon Sep 17 00:00:00 2001
From: Brandon McAnsh <git@bmcreations.dev>
Date: Tue, 6 Oct 2026 13:04:58 -0400
Subject: [PATCH 34/45] refactor(chat): remove the paid-DM gate from the
 conversation

Every route to a person now lands on their profile until a DM exists, and
the profile owns the paid start-chatting flow. ConversationScreen only opens
an existing chat, so the tipDM context, the chatExists/startChattingFee
plumbing, the full-width Start Chatting bar, and the open-time Send Cash are
unreachable.
---
 .../ChatScreenRepresentable.swift             |  12 +-
 .../Conversation/ConversationBottomBar.swift  | 210 +++---------------
 .../Conversation/ConversationScreen.swift     | 186 ++--------------
 .../Screens/Send/SendAmountViewModel.swift    |   3 +-
 .../Chat/AttachPanelPlacementTests.swift      |   1 -
 .../Chat/ChatAttributionNameTests.swift       |  13 --
 .../ConversationBarLeadingControlTests.swift  |  32 +--
 .../UsernameLookupRoutingTests.swift          |  73 ------
 8 files changed, 55 insertions(+), 475 deletions(-)

diff --git a/Flipcash/Core/Screens/Conversation/ChatScreenRepresentable.swift b/Flipcash/Core/Screens/Conversation/ChatScreenRepresentable.swift
index d040c30c8..87158330f 100644
--- a/Flipcash/Core/Screens/Conversation/ChatScreenRepresentable.swift
+++ b/Flipcash/Core/Screens/Conversation/ChatScreenRepresentable.swift
@@ -80,7 +80,6 @@ struct ChatScreenRepresentable: UIViewControllerRepresentable {
     /// Fired when the long-press strip's "+" is tapped, with the row's stable id.
     let onReactionStripAdd: (String) -> Void
     let showsSendCash: Bool
-    let chatExists: Bool
     let conversationID: ConversationID?
     let symbol: String
     let onSendCash: () -> Void
@@ -95,10 +94,6 @@ struct ChatScreenRepresentable: UIViewControllerRepresentable {
     /// the composer field in `viewDidAppear` — a hosted SwiftUI `@FocusState` never presents the
     /// keyboard across the hosting boundary.
     let focusOnAppear: Bool
-    /// Whether this is a tip DM, whose Send Cash reads Start Chatting until the chat exists.
-    let isTipDm: Bool
-    /// The floor the first tip has to clear to open this chat, named on the CTA.
-    let startChattingFee: FiatAmount?
     /// Whether the chat's participation rules leave this user anything to type, and whether they
     /// may read at all. Drives the gate panel in place of the bar and the blur over the transcript.
     let gate: ConversationGatePresentation
@@ -150,7 +145,7 @@ struct ChatScreenRepresentable: UIViewControllerRepresentable {
         screen.focusesComposerOnAppear = focusOnAppear
         screen.isTranscriptObscured = gate.obscuresTranscript
         screen.showsGatePlaceholder = showsGatePlaceholder
-        screen.barRestingDrop = chatExists ? BarMetrics.compactDrop : 0
+        screen.barRestingDrop = BarMetrics.compactDrop
         screen.authorAvatars = authorAvatars
         screen.onReachTop = onReachTop
         screen.onRetry = onRetry
@@ -206,7 +201,7 @@ struct ChatScreenRepresentable: UIViewControllerRepresentable {
         context.coordinator.barHost?.rootView = bar(coordinator: context.coordinator)
         screen.isTranscriptObscured = gate.obscuresTranscript
         screen.showsGatePlaceholder = showsGatePlaceholder
-        screen.barRestingDrop = chatExists ? BarMetrics.compactDrop : 0
+        screen.barRestingDrop = BarMetrics.compactDrop
         screen.authorAvatars = authorAvatars
         screen.onReachTop = onReachTop
         screen.onRetry = onRetry
@@ -313,14 +308,11 @@ struct ChatScreenRepresentable: UIViewControllerRepresentable {
         return AnyView(
             ConversationBottomBar(
                 showsSendCash: showsSendCash,
-                chatExists: chatExists,
                 conversationID: conversationID,
                 symbol: symbol,
                 onSendCash: onSendCash,
                 model: barModel,
                 composer: composer,
-                isTipDm: isTipDm,
-                startChattingFee: startChattingFee,
                 gate: gate,
                 gateMintName: gateMintName,
                 onGateAddFunds: onGateAddFunds,
diff --git a/Flipcash/Core/Screens/Conversation/ConversationBottomBar.swift b/Flipcash/Core/Screens/Conversation/ConversationBottomBar.swift
index 88e09ed97..2799f600b 100644
--- a/Flipcash/Core/Screens/Conversation/ConversationBottomBar.swift
+++ b/Flipcash/Core/Screens/Conversation/ConversationBottomBar.swift
@@ -140,8 +140,7 @@ struct BarOverflowReporting: ViewModifier {
     }
 }
 
-/// Single spring driving the whole bar: the button morph, the composer's
-/// appearance when the chat materializes, and the send-arrow pop.
+/// Single spring driving the bar's morphs: the focus-driven resize and the send-arrow pop.
 private let barMorphSpring = ChatMotion.swap.animation
 
 /// The curve the bar grows and shrinks on around the reply strip.
@@ -182,22 +181,20 @@ enum BarMetrics {
 enum ConversationBarLeadingControl: Equatable {
     /// The way out of an edit.
     case cancelEdit
-    /// The full-width Send Cash call to action, alone in the bar before the chat exists.
-    case sendCash
-    /// The round `$` beside the field once the chat exists, shown while the draft is empty.
+    /// The round `$` beside the field, shown while the draft is empty.
     case cash
     /// Nothing beside the field.
     case none
 
-    /// Returns the control for the bar's state. An edit wins; otherwise Send Cash, as the call to
-    /// action before the chat exists and as the round `$` after.
-    init(isEditing: Bool, chatExists: Bool, showsSendCash: Bool) {
+    /// Returns the control for the bar's state. An edit wins; otherwise the round `$` when Send Cash
+    /// is offered.
+    init(isEditing: Bool, showsSendCash: Bool) {
         if isEditing {
             self = .cancelEdit
         } else if !showsSendCash {
             self = .none
         } else {
-            self = chatExists ? .cash : .sendCash
+            self = .cash
         }
     }
 }
@@ -214,10 +211,10 @@ struct ConversationBarBottomRow: Equatable {
     /// Whether there is nothing for `+` to open.
     var isEmpty: Bool { plusItems.isEmpty }
 
-    /// Returns the row for the bar's state: empty during an edit and before the chat exists;
-    /// otherwise `+` while it has a row to open.
-    init(isEditing: Bool, chatExists: Bool, acceptsMedia: Bool, attachedCount: Int) {
-        guard !isEditing, chatExists else {
+    /// Returns the row for the bar's state: empty during an edit; otherwise `+` while it has a row
+    /// to open.
+    init(isEditing: Bool, acceptsMedia: Bool, attachedCount: Int) {
+        guard !isEditing else {
             self.init(plusItems: [])
             return
         }
@@ -230,21 +227,14 @@ struct ConversationBarBottomRow: Equatable {
 }
 
 /// The unified bottom bar: the attach menu beside the message field.
-/// A standard-size filled Send Cash alone until the chat exists server-side.
 struct ConversationBottomBar: View {
 
     let showsSendCash: Bool
-    let chatExists: Bool
     let conversationID: ConversationID?
     let symbol: String
     let onSendCash: () -> Void
     let model: ConversationBarModel
     let composer: ComposerModel
-    /// Whether this is a tip DM, whose Send Cash reads Start Chatting until the chat exists.
-    var isTipDm: Bool = false
-    /// What the first tip has to clear to open this chat, named on the CTA.
-    /// Nil once the chat exists, and when no floor has resolved yet.
-    var startChattingFee: FiatAmount? = nil
     /// Whether the chat's participation rules leave this user anything to type. Anything but
     /// ``ConversationGatePresentation/open`` replaces the whole composer with the gate panel.
     var gate: ConversationGatePresentation = .open
@@ -279,7 +269,7 @@ struct ConversationBottomBar: View {
         switch leadingControl {
         case .cash:
             cashIsShown ? BarMetrics.contentHeight + Self.leadingSpacing : 0
-        case .cancelEdit, .sendCash, .none:
+        case .cancelEdit, .none:
             0
         }
     }
@@ -314,9 +304,8 @@ struct ConversationBottomBar: View {
     static let leadingSpacing: CGFloat = 10
 
     /// Whether the bar sits inset from the screen's sides: at rest with the keyboard down. It widens
-    /// to the full edge inset as the keyboard comes up. Only once there is a composer; the pre-chat
-    /// CTA keeps its full-width button.
-    private var isCompact: Bool { chatExists && !model.isComposing }
+    /// to the full edge inset as the keyboard comes up.
+    private var isCompact: Bool { !model.isComposing }
 
     /// How much further in than ``BarMetrics/edgeInset`` the controls and the reply quote sit.
     private var compactExtraInset: CGFloat { isCompact ? BarMetrics.compactInset - BarMetrics.edgeInset : 0 }
@@ -364,7 +353,7 @@ struct ConversationBottomBar: View {
                         .frame(width: BarMetrics.contentHeight, height: BarMetrics.contentHeight)
                         .composerGlass(in: Circle(), id: "cash", namespace: composerGlassNamespace)
                 }
-            case .sendCash, .none:
+            case .none:
                 EmptyView()
             }
             Color.clear
@@ -381,8 +370,8 @@ struct ConversationBottomBar: View {
     private var composerBar: some View {
         // Bottom-aligned, against the bar's own pinned bottom: the field is the side that grows, and
         // top-aligning the control beside it made the control travel with every line the draft
-        // gained or lost. Nothing animates that travel — the bar's springs key on `chatExists` and
-        // `isEditing`, neither of which moves during a send — so it snapped while the bar's height
+        // gained or lost. Nothing animates that travel — the bar's springs key on `isEditing`,
+        // which doesn't move during a send — so it snapped while the bar's height
         // sprang underneath it.
         let motion = AttachMotion(reduceMotion: reduceMotion)
         let content = VStack(alignment: .leading, spacing: Self.rowSpacing) {
@@ -392,22 +381,6 @@ struct ConversationBottomBar: View {
                 switch leadingControl {
                 case .cancelEdit:
                     CancelEditButton { composer.endEditing() }
-                case .sendCash:
-                    SendCashMorphButton(
-                        symbol: symbol,
-                        // Minimized by a reply as well as by focus. Starting a reply from the context
-                        // menu raises the keyboard, and focus — and so `isComposing` — arrives a
-                        // transaction later than the reply target, on its own bouncy spring: the button
-                        // collapsed after the bar had already grown, jolting the field beside it.
-                        // Reading the target directly puts the morph in the reply's own transaction, so
-                        // the two move together and the later focus change finds nothing left to do.
-                        composing: model.isComposing || composer.replyTarget != nil,
-                        // Before the first tip there is no composer to sit beside: the design draws
-                        // the full-width "Start Chatting" CTA (node 10074:18891).
-                        standalone: true,
-                        expandedTitle: isTipDm ? startChattingTitle : nil,
-                        action: onSendCash
-                    )
                 case .cash:
                     if cashIsShown {
                         ComposerCashButton(symbol: symbol, action: onSendCash)
@@ -416,26 +389,21 @@ struct ConversationBottomBar: View {
                 case .none:
                     EmptyView()
                 }
-                if chatExists {
-                    ConversationComposer(
-                        conversationID: conversationID,
-                        model: model,
-                        composer: composer,
-                        bottomRow: bottomRow,
-                        hidesPlus: showsCard,
-                        // Swapped out in one frame for the surface, which is drawn as `+` where it stands.
-                        plusIsStoodInFor: model.surfaceStandsInForPlus && motion.animatesGeometry,
-                        onAttachOpen: onAttachOpen
-                    )
-                    // Over the row's other controls, which the attach panel floats across.
-                    .zIndex(1)
-                    .transition(.opacity)
-                }
+                ConversationComposer(
+                    conversationID: conversationID,
+                    model: model,
+                    composer: composer,
+                    bottomRow: bottomRow,
+                    hidesPlus: showsCard,
+                    // Swapped out in one frame for the surface, which is drawn as `+` where it stands.
+                    plusIsStoodInFor: model.surfaceStandsInForPlus && motion.animatesGeometry,
+                    onAttachOpen: onAttachOpen
+                )
+                // Over the row's other controls, which the attach panel floats across.
+                .zIndex(1)
             }
             .background {
-                if chatExists {
-                    composerGlass
-                }
+                composerGlass
             }
             // A draft already there when the chat opens hides `$` without animating it out.
             .onAppear { cashIsShown = composer.draft.isEmpty }
@@ -468,7 +436,6 @@ struct ConversationBottomBar: View {
         .animation(Self.widthSpring, value: isCompact)
         .padding(.top, BarMetrics.contentPadding)
         .padding(.bottom, BarMetrics.contentPadding)
-        .animation(barMorphSpring, value: chatExists)
         .animation(barMorphSpring, value: composer.isEditing)
         // The strip arriving with its first chip and leaving with its last, on the chip spring unless
         // a capture's animation is already carrying it.
@@ -652,7 +619,6 @@ struct ConversationBottomBar: View {
     private var leadingControl: ConversationBarLeadingControl {
         ConversationBarLeadingControl(
             isEditing: composer.isEditing,
-            chatExists: chatExists,
             showsSendCash: showsSendCash
         )
     }
@@ -660,19 +626,10 @@ struct ConversationBottomBar: View {
     private var bottomRow: ConversationBarBottomRow {
         ConversationBarBottomRow(
             isEditing: composer.isEditing,
-            chatExists: chatExists,
             acceptsMedia: acceptsMedia,
             attachedCount: composer.chips.count
         )
     }
-
-    /// The tip CTA's title. Names the amount that opens the chat when a floor
-    /// has resolved; the fee is what the recipient charges for the
-    /// conversation, so stating it is the whole point of the button.
-    private var startChattingTitle: String {
-        guard let startChattingFee else { return "Start Chatting" }
-        return "Send \(startChattingFee.formatted()) to Start Chatting"
-    }
 }
 
 /// A card's arrival and departure above the composer row — the reply strip or the mention list:
@@ -1394,112 +1351,3 @@ private struct CancelEditButton: View {
         .accessibilityIdentifier("cancel-edit-button")
     }
 }
-
-/// The Send Cash button, rendered as a white "Send €" pill at rest and a
-/// compact glass "€" square while composing (or always, in a tip chat). Alone
-/// in the bar it takes the standard filled-button size; beside the composer
-/// it's field-sized.
-// One persistent view: the morph animates its properties (prefix text, fill,
-// width, color) in lockstep — splitting the two states into separate views
-// would crossfade instead of morphing.
-struct SendCashMorphButton: View {
-
-    let symbol: String
-    let composing: Bool
-    /// Whether the button is the bar's only control (no chat yet): it spans
-    /// the bar at the standard filled-button size instead of field-sized.
-    let standalone: Bool
-    /// Forces the compact symbol-only presentation regardless of composing.
-    var alwaysMinimized: Bool = false
-    /// Replaces "Send <symbol>" while expanded. A tip chat names the tip
-    /// instead of the currency, because the amount is chosen on the next screen.
-    var expandedTitle: String?
-    let action: () -> Void
-
-    /// The compact glass "€" presentation: while composing, or always once a
-    /// chat exists. The whole morph (label, fill, width, color) keys off this.
-    private var minimized: Bool { composing || alwaysMinimized }
-
-    private var height: CGFloat {
-        standalone ? Metrics.buttonHeight : BarMetrics.contentHeight
-    }
-
-    private var cornerRadius: CGFloat {
-        standalone ? Metrics.buttonRadius : BarMetrics.cornerRadius
-    }
-
-    var body: some View {
-        Button(action: action) {
-            HStack(spacing: 4) {
-                if !minimized {
-                    Text(expandedTitle ?? "Send")
-                        .font(.appTextMedium)
-                        .transition(.opacity)
-                }
-                // Suppressed while a custom title is showing: "Send a Tip $"
-                // isn't a label. It returns when the button minimizes.
-                if minimized || expandedTitle == nil {
-                    Text(symbol)
-                        // Same persistent Text — .interpolate animates the glyph
-                        // between sizes; swapping views would crossfade.
-                        .font(minimized ? .appTextXL : .appTextMedium)
-                        .contentTransition(.interpolate)
-                }
-            }
-            .foregroundStyle(minimized ? Color.textMain : Color.textAction)
-            // The label must never reflow to "Se…" mid-morph; overflow is
-            // clipped by the shape instead.
-            .fixedSize()
-            .padding(.horizontal, minimized ? 0 : 20)
-            .frame(minWidth: BarMetrics.contentHeight)
-            .frame(maxWidth: standalone && !minimized ? .infinity : nil)
-            .frame(height: height)
-            // The label is the only drawn content and the fill is a background on the button, not
-            // on the label, so with `.plain` only the text was the target: alone in the bar the
-            // pill spans the width but "Send a Tip" answered a tap on its centre and nothing else.
-            .contentShape(RoundedRectangle(cornerRadius: cornerRadius))
-        }
-        .buttonStyle(.plain)
-        // White fill above the glass base: fading it out is the white → glass
-        // change, without ever swapping views.
-        .background {
-            RoundedRectangle(cornerRadius: cornerRadius)
-                .fill(Color.action)
-                .opacity(minimized ? 0 : 1)
-        }
-        .glassBackground(cornerRadius: cornerRadius)
-        .clipShape(RoundedRectangle(cornerRadius: cornerRadius))
-        .accessibilityLabel(expandedTitle ?? "Send Cash")
-        .accessibilityIdentifier("send-cash-button")
-    }
-}
-
-#Preview("Morph") {
-    @Previewable @State var composing = false
-    ZStack {
-        Color.backgroundMain.ignoresSafeArea()
-        VStack {
-            Spacer()
-            HStack(spacing: 10) {
-                SendCashMorphButton(symbol: "€", composing: composing, standalone: false) {
-                    withAnimation(barMorphSpring) { composing.toggle() }
-                }
-                RoundedRectangle(cornerRadius: BarMetrics.cornerRadius)
-                    .fill(.white.opacity(0.1))
-                    .frame(height: BarMetrics.contentHeight)
-            }
-            .padding(12)
-        }
-    }
-}
-
-#Preview("Standalone") {
-    ZStack {
-        Color.backgroundMain.ignoresSafeArea()
-        VStack {
-            Spacer()
-            SendCashMorphButton(symbol: "€", composing: false, standalone: true) {}
-                .padding(12)
-        }
-    }
-}
diff --git a/Flipcash/Core/Screens/Conversation/ConversationScreen.swift b/Flipcash/Core/Screens/Conversation/ConversationScreen.swift
index 2ba694e49..f9967f06d 100644
--- a/Flipcash/Core/Screens/Conversation/ConversationScreen.swift
+++ b/Flipcash/Core/Screens/Conversation/ConversationScreen.swift
@@ -16,15 +16,10 @@ import FlipcashUI
 // foreground-banner suppression gate on — so a missed buzz or an unsuppressed banner is traceable.
 private let logger = Logger(label: "flipcash.conversation")
 
-/// How a conversation is reached: an existing DM chat (only tip DMs are
-/// surfaced now — contact/phone DMs were retired with the Send tab), or a tip
-/// DM named by its counterpart before the chat exists server-side.
+/// How a conversation is reached: an existing chat, by its id. A tip DM that doesn't exist yet
+/// is reached through the counterpart's profile, not here.
 nonisolated enum ConversationContext: Hashable {
     case existing(ConversationID)
-    /// A tip DM opened from the username lookup. The chat is created by the
-    /// first tip, so until then there is no record to reach it by — only the
-    /// counterpart, whose id derives the chat's own id locally.
-    case tipDM(counterpart: UserID)
 
     /// Resolves the counterpart's synced contact from the directory — the one
     /// rule the nav title, transcript profile card, and profile page share.
@@ -32,19 +27,13 @@ nonisolated enum ConversationContext: Hashable {
         switch self {
         case .existing(let conversationID):
             directory.first { $0.dmChatID == conversationID.data }
-        case .tipDM:
-            // A tip DM's counterpart is known by profile, never by address book.
-            nil
         }
     }
 }
 
 /// A DM conversation: an iMessage-style transcript over a unified bottom bar
 /// (Send Cash beside the composer). Reads live messages from
-/// `ConversationController`, which owns the single event stream. For a
-/// contact without a chat the transcript stays empty and only Send Cash
-/// shows; once the first payment creates the chat, the chat ID resolves live
-/// from the synced directory and the composer appears.
+/// `ConversationController`, which owns the single event stream.
 struct ConversationScreen: View {
 
     let context: ConversationContext
@@ -53,10 +42,6 @@ struct ConversationScreen: View {
     /// post-tip navigation; every other entry point opens keyboard-closed.
     var openKeyboard: Bool = false
 
-    /// Start Send Cash once on open, as though its button had been tapped. Set only by the
-    /// profile's Send Cash; every other entry point waits for the tap.
-    var startSendCash: Bool = false
-
     @Environment(ConversationController.self) private var conversationController
     @Environment(ContactSyncController.self) private var contactSyncController
     @Environment(AppRouter.self) private var router
@@ -79,7 +64,6 @@ struct ConversationScreen: View {
     /// below only corrects it.
     @State private var navBarWidth: CGFloat = UIApplication.shared.firstWindowScene?.coordinateSpace.bounds.width ?? 0
     @State private var presentedCard: ContactCard?
-    @State private var startChattingRequest: StartChattingRequest?
     @State private var coordinator: ConversationLoadCoordinator?
     /// Tickers for the mints the gate's copy names, resolved from mint metadata. Empty until they
     /// land, and for every ungated chat.
@@ -95,9 +79,6 @@ struct ConversationScreen: View {
     /// Whether the encryption explainer opened from the transcript's marker is showing.
     @State private var isShowingEncryptionInfo = false
     @State private var messageReport: MessageReportRequest?
-    /// Whether `startSendCash` has been acted on, so a re-render or a return from the sheet it
-    /// opened doesn't start it again.
-    @State private var didStartSendCash = false
     /// Whether `Group: Gate Shown` has gone out for this visit. The destination is keyed by
     /// conversation ID, so a new push is a new visit; a return from a pushed screen is not.
     @State private var didReportGate = false
@@ -131,31 +112,17 @@ struct ConversationScreen: View {
         switch context {
         case .existing(let conversationID):
             return conversationID
-        case .tipDM(let counterpart):
-            // The same derivation the server uses, so the id is known before
-            // the chat is — and matches the one the first tip creates.
-            return .tipDm(between: conversationController.selfUserID, and: counterpart)
-        }
-    }
-
-    /// The counterpart this screen was opened for, when it was opened by
-    /// person rather than by chat.
-    private var counterpartUserID: UserID? {
-        switch context {
-        case .existing: nil
-        case .tipDM(let counterpart): counterpart
         }
     }
 
-    /// The tip DM counterpart, when this conversation is a tip DM. Falls back
-    /// to the cached profile before the first tip creates the chat.
+    /// The tip DM counterpart, when this conversation is a tip DM.
     private var tipCounterpart: ConversationMember? {
         if let conversationID,
            let conversation = conversationController.conversation(withID: conversationID),
            conversation.type == .tipDm {
             return conversation.counterpart(excluding: conversationController.selfUserID)
         }
-        return Self.cachedCounterpart(counterpartUserID, session: session)
+        return nil
     }
 
     /// Who Send Cash pays: the tip counterpart in a tip DM, the chat itself in
@@ -167,53 +134,13 @@ struct ConversationScreen: View {
             return .contact(contact)
         }
         guard let conversationID else { return nil }
-        if let target = SendTarget(
+        return SendTarget(
             conversation: conversationController.conversation(withID: conversationID),
             dmChatID: conversationID.data,
             selfUserID: conversationController.selfUserID
-        ) {
-            return target
-        }
-        // No conversation record to read the counterpart from yet, so the
-        // cached profile is what the tip is addressed to.
-        guard let member = tipCounterpart, let userID = member.userID else { return nil }
-        return .tip(TipRecipient(
-            userID: userID,
-            displayName: member.displayName,
-            username: member.username,
-            origin: .chat
-        ))
-    }
-
-    /// What the first tip has to clear to open this chat — the fee the
-    /// counterpart charges for the conversation, falling back to the regional
-    /// tip minimum when they charge nothing. Nil once the chat exists, since a
-    /// send into an open thread carries no floor.
-    ///
-    /// Derived from the same inputs as `SendAmountViewModel.tipFloor(in:)` so
-    /// the amount the CTA names is the one the amount screen enforces.
-    private var startChattingFee: FiatAmount? {
-        guard !chatExists, let userID = tipCounterpart?.userID else { return nil }
-        return StartChattingFee.amount(
-            for: session.cachedUserProfile(for: userID),
-            session: session,
-            ratesController: ratesController
         )
     }
 
-    /// Whether a chat exists to hold a transcript. An `existing` conversation
-    /// was reached by its chat id, so it does by construction; a tip DM opened
-    /// by counterpart does not until the first tip creates it server-side.
-    private var chatExists: Bool {
-        guard let conversationID else { return false }
-        switch context {
-        case .existing:
-            return true
-        case .tipDM:
-            return conversationController.conversation(withID: conversationID) != nil
-        }
-    }
-
     /// For a tip DM, all counterpart taps open the profile screen — even when
     /// the counterpart is also an address-book contact. A group has no counterpart, so the same
     /// taps open the chat's own profile instead.
@@ -256,11 +183,6 @@ struct ConversationScreen: View {
     }
 
     private var title: String {
-        // Without a chat there is no conversation record to name, so the
-        // counterpart's cached profile is the only source for the title.
-        if !chatExists, let name = tipCounterpart?.displayName {
-            return name
-        }
         if let conversationID {
             return conversationController.displayName(forConversationID: conversationID)
         }
@@ -295,12 +217,7 @@ struct ConversationScreen: View {
     /// is what creates it.
     private var awaitingMetadata: Bool {
         guard let conversationID else { return false }
-        switch context {
-        case .tipDM:
-            return false
-        case .existing:
-            return conversationController.conversation(withID: conversationID) == nil
-        }
+        return conversationController.conversation(withID: conversationID) == nil
     }
 
     /// The rule verdicts behind ``gate``, kept separately because the head card states the chat's
@@ -510,7 +427,6 @@ struct ConversationScreen: View {
             onReactionStripSelect: toggleReaction,
             onReactionStripAdd: openReactionPicker,
             showsSendCash: sendTarget != nil,
-            chatExists: chatExists,
             conversationID: conversationID,
             symbol: ratesController.balanceCurrency.compactSymbol,
             onSendCash: sendCash,
@@ -519,8 +435,6 @@ struct ConversationScreen: View {
             composer: composer,
             editingStableID: composer.editingStableID,
             focusOnAppear: openKeyboard,
-            isTipDm: tipCounterpart != nil,
-            startChattingFee: startChattingFee,
             gate: gate,
             // A viewer the gate refuses is refused the read too, so a blocked chat they have no
             // history of has nothing under its blur. The shapes stand in for what they are not
@@ -529,7 +443,7 @@ struct ConversationScreen: View {
             // whose rules haven't landed yet is blurred without yet refusing anything.
             // Also stands in while an empty transcript's first load is out, so a chat with nothing
             // cached opens on the placeholder and paints once with its history.
-            showsGatePlaceholder: (gate.withholdsTranscript || (chatExists && !didInitialRead)) && (coordinator?.items.isEmpty ?? true),
+            showsGatePlaceholder: (gate.withholdsTranscript || !didInitialRead) && (coordinator?.items.isEmpty ?? true),
             gateMintName: gateMintName,
             onGateAddFunds: addFunds,
             onGateJoin: joinChat,
@@ -621,7 +535,7 @@ struct ConversationScreen: View {
         // `onReachTop` on every scroll frame it spends near the top, and reading `gate` re-evaluates
         // the chat's rules against the balance and the rate table each time.
         let gate = self.gate
-        let pagesHistory = chatExists && !gate.obscuresTranscript
+        let pagesHistory = !gate.obscuresTranscript
         // Stages, rather than one chain. A getter is a single type-check budget however many
         // statements it holds, and this chain is more than the compiler will finish inside one —
         // it gives up on CI, where the budget is tighter than on a dev machine. A function each
@@ -816,9 +730,6 @@ struct ConversationScreen: View {
             ContactCardView(card: card)
                 .ignoresSafeArea()
         }
-        .sheet(item: $startChattingRequest) { request in
-            StartChattingSheet(target: request.target, fee: request.fee)
-        }
         .sheet(isPresented: $isShowingEncryptionInfo) {
             E2eeLearnMoreSheet(kind: .dm, isPresented: $isShowingEncryptionInfo)
         }
@@ -865,8 +776,8 @@ struct ConversationScreen: View {
     /// Takes `gate` rather than reading it, so these closures capture the value `body` resolved.
     private func lifecycle(_ content: some View, gate: ConversationGatePresentation) -> some View {
         content
-        .task(id: chatExists ? conversationID : nil) {
-            guard chatExists, let conversationID else { return }
+        .task(id: conversationID) {
+            guard let conversationID else { return }
             // Ensure the conversation metadata is in the store before the title, tip styling, and Send
             // Cash target rely on it. The post-tip open (and any push/link that lands here before the
             // feed or stream has the freshly-created chat) would otherwise render the unresolved
@@ -886,7 +797,7 @@ struct ConversationScreen: View {
             // The opening task read the gate it started with, which for a chat reached by link or
             // push is `.undetermined`: a non-member the rules admit, or a balance that crosses the
             // requirement mid-screen, lifts the blur without re-running it. A join loads for itself.
-            guard !obscures, !didInitialRead, !isJoiningChat, chatExists, let conversationID else { return }
+            guard !obscures, !didInitialRead, !isJoiningChat, let conversationID else { return }
             Task { await loadTranscript(for: conversationID) }
         }
         // Buzz on a live message from the other side while this conversation is on screen. `old != nil`
@@ -912,11 +823,6 @@ struct ConversationScreen: View {
             syncCoordinator(id)
             restoreDraft(id)
         }
-        .onChange(of: isReadyToStartSendCash, initial: true) { _, ready in
-            guard ready else { return }
-            didStartSendCash = true
-            sendCash()
-        }
         .onChange(of: composer.draft) { _, _ in saveDraft() }
         // Mode rather than `replyTarget` alone: it also covers the edit transitions, where what is
         // worth saving swaps between the field and the draft the edit displaced.
@@ -953,7 +859,7 @@ struct ConversationScreen: View {
         // Donate the open chat for Siri prediction, Handoff, and Spotlight.
         // Only an existing chat carries an id worth resuming; a contact without
         // a chat yet has nothing to hand off to.
-        .userActivity(AppUserActivity.openChat, isActive: chatExists && conversationID != nil) { activity in
+        .userActivity(AppUserActivity.openChat, isActive: conversationID != nil) { activity in
             guard let conversationID else { return }
             activity.title = title
             activity.userInfo = [AppUserActivity.chatIDKey: conversationID.base64URLEncoded]
@@ -1210,13 +1116,6 @@ struct ConversationScreen: View {
         }
     }
 
-    /// Whether the open-time Send Cash can run and take the branch a tap would. Before the chat
-    /// exists that waits on the fee: `sendCash()` falls through to the amount screen without it.
-    private var isReadyToStartSendCash: Bool {
-        startSendCash && !didStartSendCash && sendTarget != nil
-            && (chatExists || startChattingFee != nil)
-    }
-
     private func sendCash() {
         guard let sendTarget else { return }
         let context: AddMoneyContext = switch sendTarget {
@@ -1228,26 +1127,9 @@ struct ConversationScreen: View {
             session.dialogItem = dialog
             return
         }
-        // The payment that opens a tip DM can only be the fee, and the bar has
-        // already named it — so it's confirmed rather than entered. Everything
-        // else, this one included when the fee hasn't resolved yet, opens the
-        // amount screen.
-        if case .tip = sendTarget, let fee = startChattingFee {
-            startChattingRequest = StartChattingRequest(target: sendTarget, fee: fee)
-            return
-        }
         router.presentSendAmount(sendTarget)
     }
 
-    /// What the start-chatting sheet is opened for, snapshotted at the tap: once
-    /// the send lands the chat exists and `startChattingFee` goes nil.
-    private struct StartChattingRequest: Identifiable {
-        let target: SendTarget
-        let fee: FiatAmount
-
-        var id: SendTarget { target }
-    }
-
     /// Re-send a failed message tapped in the transcript. The id is the row's stable id, which for a
     /// failed message is its client message id.
     private func retry(messageID: String) {
@@ -1494,7 +1376,7 @@ struct ConversationScreen: View {
                 knownAuthors: sessionContainer.knownAuthors,
                 // `profileAvatars` is captured directly so the coordinator retains
                 // one small store, not the whole session container.
-                profileCard: { [context, contactSyncController, conversationController, session, counterpartUserID, profileAvatars = sessionContainer.profileAvatars] in
+                profileCard: { [context, contactSyncController, conversationController, session, profileAvatars = sessionContainer.profileAvatars] in
                     // A group cards itself — the address book has nothing to say about a chat, and
                     // the unknown-contact fallback below would flag one as an unknown person.
                     guard conversationController.conversation(withID: id)?.type != .group else {
@@ -1505,10 +1387,7 @@ struct ConversationScreen: View {
                         conversationID: id,
                         directory: contactSyncController.resolvedContacts.onFlipcash,
                         controller: conversationController,
-                        profileAvatars: profileAvatars,
-                        // Resolved inside the closure, not captured: the card
-                        // must pick up the conversation the first tip creates.
-                        fallbackCounterpart: Self.cachedCounterpart(counterpartUserID, session: session)
+                        profileAvatars: profileAvatars
                     )
                 }
             )
@@ -1523,28 +1402,6 @@ struct ConversationScreen: View {
         return .handle(username)
     }
 
-    /// The counterpart of a tip DM that has no chat yet, built from a fetched
-    /// profile. Gives the title, card, and Send Cash target the same member
-    /// shape a synced conversation would supply.
-    static func counterpart(userID: UserID, profile: Profile) -> ConversationMember {
-        // A name-less account can still be tipped, and the chat has to be
-        // titled either way. The server sends such a name as "", not nil.
-        let name = profile.displayName.flatMap { $0.isEmpty ? nil : $0 }
-        return ConversationMember(
-            userID: userID,
-            displayName: name ?? profile.username?.handle ?? ConversationController.fallbackCounterpartName,
-            profilePicture: profile.profilePicture,
-            username: profile.username
-        )
-    }
-
-    /// ``counterpart(userID:profile:)`` against the profile cache the username
-    /// lookup writes on its way here.
-    private static func cachedCounterpart(_ userID: UserID?, session: Session) -> ConversationMember? {
-        guard let userID, let profile = session.cachedUserProfile(for: userID) else { return nil }
-        return counterpart(userID: userID, profile: profile)
-    }
-
     /// The transcript's profile card for the counterpart, resolved live from the directory the
     /// same way the nav title is: the synced contact when there is one, the profile-only tip
     /// counterpart for a tip DM, otherwise the counterpart's formatted number flagged as an
@@ -1554,8 +1411,7 @@ struct ConversationScreen: View {
         conversationID: ConversationID,
         directory: [ResolvedContact],
         controller: ConversationController,
-        profileAvatars: ProfileAvatarStore,
-        fallbackCounterpart: ConversationMember? = nil
+        profileAvatars: ProfileAvatarStore
     ) -> ChatProfileCard {
         if let conversation = controller.conversation(withID: conversationID),
            conversation.type == .tipDm {
@@ -1568,16 +1424,6 @@ struct ConversationScreen: View {
                 counterpart: Self.tipDMCounterpart(counterpart)
             )
         }
-        // No conversation record yet — the same card, from the cached profile.
-        if let counterpart = fallbackCounterpart {
-            return ChatProfileCard(
-                name: counterpart.displayName,
-                avatarID: counterpart.userID?.uuidString ?? conversationID.description,
-                imageData: profileAvatars.data(for: counterpart.userID),
-                blurhash: counterpart.profilePicture?.thumbnailBlurhash,
-                counterpart: Self.tipDMCounterpart(counterpart)
-            )
-        }
         if let contact = context.resolvedContact(in: directory) {
             return ChatProfileCard(
                 name: contact.displayName,
diff --git a/Flipcash/Core/Screens/Send/SendAmountViewModel.swift b/Flipcash/Core/Screens/Send/SendAmountViewModel.swift
index ee0350e51..6bfef51b7 100644
--- a/Flipcash/Core/Screens/Send/SendAmountViewModel.swift
+++ b/Flipcash/Core/Screens/Send/SendAmountViewModel.swift
@@ -75,8 +75,7 @@ final class SendAmountViewModel {
     /// False for a contact send and for a thread that already exists.
     var opensTipDM: Bool {
         guard case .tip(let recipient) = target else { return false }
-        // The same rule `ConversationScreen.chatExists` draws: a tip DM's id is
-        // derived locally, so the feed holding it is what says the chat is real.
+        // A tip DM's id is derived locally, so the feed holding it is what says the chat is real.
         return conversationController.conversation(
             withID: .tipDm(between: session.userID, and: recipient.userID)
         ) == nil
diff --git a/FlipcashTests/Chat/AttachPanelPlacementTests.swift b/FlipcashTests/Chat/AttachPanelPlacementTests.swift
index 9a54eb6f4..7498e77c4 100644
--- a/FlipcashTests/Chat/AttachPanelPlacementTests.swift
+++ b/FlipcashTests/Chat/AttachPanelPlacementTests.swift
@@ -124,7 +124,6 @@ private struct HostedBar: View {
     var body: some View {
         ConversationBottomBar(
             showsSendCash: true,
-            chatExists: true,
             conversationID: .test(1),
             symbol: "$",
             onSendCash: {},
diff --git a/FlipcashTests/Chat/ChatAttributionNameTests.swift b/FlipcashTests/Chat/ChatAttributionNameTests.swift
index b43d66079..c907080a2 100644
--- a/FlipcashTests/Chat/ChatAttributionNameTests.swift
+++ b/FlipcashTests/Chat/ChatAttributionNameTests.swift
@@ -29,17 +29,4 @@ struct ChatAttributionNameTests {
         let member = ConversationMember(userID: UserID(), displayName: "")
         #expect(ConversationLoadCoordinator.attributionName(for: member) == ConversationController.fallbackCounterpartName)
     }
-
-    @Test("A tip DM with no chat yet titles a nameless profile by its handle, not a blank")
-    @MainActor func dmCounterpart_emptyName_usesHandle() throws {
-        let username = try #require(Username("grace"))
-        let profile = Profile(displayName: "", phone: Phone?.none, email: nil, username: username)
-        #expect(ConversationScreen.counterpart(userID: UserID(), profile: profile).displayName == username.handle)
-    }
-
-    @Test("A tip DM with no chat yet titles a nameless profile without a handle as Flipcash User")
-    @MainActor func dmCounterpart_emptyNameNoHandle_usesFallback() {
-        let profile = Profile(displayName: "", phone: Phone?.none, email: nil)
-        #expect(ConversationScreen.counterpart(userID: UserID(), profile: profile).displayName == ConversationController.fallbackCounterpartName)
-    }
 }
diff --git a/FlipcashTests/Chat/ConversationBarLeadingControlTests.swift b/FlipcashTests/Chat/ConversationBarLeadingControlTests.swift
index c166c3969..e8bfda284 100644
--- a/FlipcashTests/Chat/ConversationBarLeadingControlTests.swift
+++ b/FlipcashTests/Chat/ConversationBarLeadingControlTests.swift
@@ -14,35 +14,24 @@ struct ConversationBarLeadingControlTests {
 
     private func control(
         isEditing: Bool = false,
-        chatExists: Bool = true,
         showsSendCash: Bool = true
     ) -> ConversationBarLeadingControl {
-        ConversationBarLeadingControl(isEditing: isEditing, chatExists: chatExists, showsSendCash: showsSendCash)
+        ConversationBarLeadingControl(isEditing: isEditing, showsSendCash: showsSendCash)
     }
 
-    @Test("Before the chat exists, Send Cash stays the full-width call to action")
-    func callToActionBeforeChatExists() {
-        #expect(control(chatExists: false) == .sendCash)
-    }
-
-    @Test("Before the chat exists with nothing to send, nothing stands outside the field")
-    func emptyBeforeChatExistsWithoutCash() {
-        #expect(control(chatExists: false, showsSendCash: false) == .none)
-    }
-
-    @Test("Once the chat exists, Send Cash is the round `$` beside the field")
-    func cashOnceChatExists() {
+    @Test("Send Cash is the round `$` beside the field")
+    func cash() {
         #expect(control() == .cash)
     }
 
-    @Test("Once the chat exists with nothing to send, nothing stands beside the field")
-    func noneOnceChatExistsWithoutCash() {
+    @Test("With nothing to send, nothing stands beside the field")
+    func noneWithoutCash() {
         #expect(control(showsSendCash: false) == .none)
     }
 
     @Test("An edit takes the slot whatever else is true", arguments: [true, false])
-    func cancelWhileEditing(chatExists: Bool) {
-        #expect(control(isEditing: true, chatExists: chatExists) == .cancelEdit)
+    func cancelWhileEditing(showsSendCash: Bool) {
+        #expect(control(isEditing: true, showsSendCash: showsSendCash) == .cancelEdit)
     }
 }
 
@@ -52,13 +41,11 @@ struct ConversationBarBottomRowTests {
 
     private func row(
         isEditing: Bool = false,
-        chatExists: Bool = true,
         acceptsMedia: Bool = true,
         attachedCount: Int = 0
     ) -> ConversationBarBottomRow {
         ConversationBarBottomRow(
             isEditing: isEditing,
-            chatExists: chatExists,
             acceptsMedia: acceptsMedia,
             attachedCount: attachedCount
         )
@@ -88,9 +75,4 @@ struct ConversationBarBottomRowTests {
     func hiddenWhileEditing() {
         #expect(row(isEditing: true).isEmpty)
     }
-
-    @Test("Before the chat exists there is no bottom row")
-    func hiddenBeforeChatExists() {
-        #expect(row(chatExists: false).isEmpty)
-    }
 }
diff --git a/FlipcashTests/UsernameLookupRoutingTests.swift b/FlipcashTests/UsernameLookupRoutingTests.swift
index 4456bbad1..01dc4dba6 100644
--- a/FlipcashTests/UsernameLookupRoutingTests.swift
+++ b/FlipcashTests/UsernameLookupRoutingTests.swift
@@ -14,15 +14,6 @@ import FlipcashCore
 @Suite("Username lookup routing")
 struct UsernameLookupRoutingTests {
 
-    private static func profile(displayName: String?, username: String? = nil) -> Profile {
-        Profile(
-            displayName: displayName,
-            phone: Optional<Phone>.none,
-            email: nil,
-            username: username.flatMap { Username($0) }
-        )
-    }
-
     // MARK: - Destination -
 
     @Test("Without a DM, the lookup lands on the profile, owned by the tips stack, keyed by the user")
@@ -51,27 +42,6 @@ struct UsernameLookupRoutingTests {
         #expect(ConversationID.tipDm(between: me, and: them) == .tipDm(between: them, and: me))
     }
 
-    @Test("A tip DM counterpart is never matched to an address-book contact")
-    func context_neverResolvesAContact() {
-        // Tip DMs identify people by profile. A directory entry that happens to
-        // carry the derived chat id must not retitle the screen or redirect the
-        // send to a phone number.
-        let (me, them) = (UUID(), UUID())
-        let chatID = ConversationID.tipDm(between: me, and: them)
-        let contact = ResolvedContact(
-            contactId: "abc",
-            displayName: "Fred From My Phone",
-            phoneE164: "+15551234567",
-            nationalPhone: "(555) 123-4567",
-            imageData: nil,
-            dmChatID: chatID.data
-        )
-        let context = ConversationContext.tipDM(counterpart: them)
-        #expect(context.resolvedContact(in: [contact]) == nil)
-        // The same directory does resolve for a chat reached by its id.
-        #expect(ConversationContext.existing(chatID).resolvedContact(in: [contact]) != nil)
-    }
-
     // MARK: - Back stack -
 
     @Test("The chat list is not a fixed number of screens below the lookup")
@@ -110,47 +80,4 @@ struct UsernameLookupRoutingTests {
         router.setPath([destination], on: .tips)
         #expect(router[.tips].count == 1)
     }
-
-    // MARK: - Counterpart -
-
-    @Test("The fetched profile supplies the name and handle the chat shows")
-    func counterpart_carriesNameAndHandle() {
-        let userID = UUID()
-        let member = ConversationScreen.counterpart(
-            userID: userID,
-            profile: Self.profile(displayName: "Fred Wilson", username: "fred_wilson")
-        )
-        #expect(member.userID == userID)
-        #expect(member.displayName == "Fred Wilson")
-        #expect(member.username == Username("fred_wilson"))
-    }
-
-    @Test("A name-less account is titled by its handle")
-    func counterpart_fallsBackToTheHandleForANamelessAccount() {
-        // Claiming a handle doesn't require a display name, so this is a real
-        // account, not a malformed response — the chat needs a title regardless.
-        let member = ConversationScreen.counterpart(
-            userID: UUID(),
-            profile: Self.profile(displayName: nil, username: "fred_wilson")
-        )
-        #expect(member.displayName == "@fred_wilson")
-    }
-
-    @Test("An account with neither a name nor a handle gets the fallback title")
-    func counterpart_fallsBackForAnAccountWithNoNameOrHandle() {
-        let member = ConversationScreen.counterpart(
-            userID: UUID(),
-            profile: Self.profile(displayName: nil)
-        )
-        #expect(member.displayName == ConversationController.fallbackCounterpartName)
-    }
-
-    @Test("A counterpart with no handle renders the name-only card")
-    func counterpart_withoutAHandleShowsNoHandleLine() {
-        let member = ConversationScreen.counterpart(
-            userID: UUID(),
-            profile: Self.profile(displayName: "Fred Wilson")
-        )
-        #expect(ConversationScreen.tipDMCounterpart(member) == ChatProfileCard.Counterpart.none)
-    }
 }

From 9d6275e707321a9bedf8b52043ed0898a0158af2 Mon Sep 17 00:00:00 2001
From: Brandon McAnsh <git@bmcreations.dev>
Date: Tue, 6 Oct 2026 13:44:17 -0400
Subject: [PATCH 35/45] test(tips): expect the tip link to land on the
 recipient's profile

Scanning opens the profile now, so the old wait for the empty chat's
send-cash button timed out with the profile on screen.
---
 FlipcashUITests/Smoke/TipsSmokeTests.swift | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/FlipcashUITests/Smoke/TipsSmokeTests.swift b/FlipcashUITests/Smoke/TipsSmokeTests.swift
index c13007867..bd1f0e95d 100644
--- a/FlipcashUITests/Smoke/TipsSmokeTests.swift
+++ b/FlipcashUITests/Smoke/TipsSmokeTests.swift
@@ -5,7 +5,7 @@
 
 import XCTest
 
-/// Rides a tipcard link from the link to the chat it opens, without committing
+/// Rides a tipcard link from the link to the profile it opens, without committing
 /// a transfer. The tipcard deeplink stands in for scanning, which a simulator
 /// camera can't do.
 ///
@@ -33,19 +33,18 @@ final class TipsSmokeTests: BaseUITestCase {
         executionTimeAllowance = 600
     }
 
-    /// A tipcard link shows the recipient's card and then lands the sender in
-    /// the chat with them, where the amount is chosen. The chat doesn't exist
-    /// until the first tip, so what proves the landing is the send control the
-    /// empty thread offers — no message list, no transfer.
-    func testTipDeeplink_opensTheChat() throws {
+    /// A tipcard link shows the recipient's card and then opens their
+    /// profile, whose pinned button starts or opens the chat. The profile
+    /// proves the landing; no transfer is made.
+    func testTipDeeplink_opensTheProfile() throws {
         assertMainScreenReached()
 
         app.open(URL(string: "flipcash://tip/\(Self.recipientID)")!)
 
-        let sendButton = app.buttons["send-cash-button"]
+        let pinnedAction = app.buttons["profile-pinned-action"]
         XCTAssertTrue(
-            sendButton.waitForExistence(timeout: 180),
-            "The tip chat never appeared. On screen: [\(visibleText())]"
+            pinnedAction.waitForExistence(timeout: 180),
+            "The recipient's profile never appeared. On screen: [\(visibleText())]"
         )
     }
 }

From c71ca01e5326ee9e71ea93d7816f10548bff318f Mon Sep 17 00:00:00 2001
From: Brandon McAnsh <git@bmcreations.dev>
Date: Tue, 6 Oct 2026 13:25:42 -0400
Subject: [PATCH 36/45] feat(profile): call it a profile card in user-facing
 copy

Scan prompts, the tutorial step, the scan error alert, the setup card screen and the unnamed export file now say "Profile Card". Identifiers and analytics event names keep tip card; the code rename is a later chore.

Delete UsernameProgressCard: Edit Profile's Username card replaced it and nothing references it.
---
 .../Deep Links/DeepLinkController.swift       |   2 +-
 .../Core/Screens/Main/CameraPromptView.swift  |   6 +-
 .../Screens/Main/Home/NewUserTutorial.swift   |   2 +-
 .../Core/Screens/Main/Home/WalletScreen.swift |   2 +-
 Flipcash/Core/Screens/Main/Tips/TipFlow.swift |   2 +-
 .../Screens/Main/Tips/TipcardScreen.swift     |   4 +-
 .../Main/Username/UsernameProgressCard.swift  | 112 ------------------
 .../Core/Screens/Main/You/TipCardExport.swift |   2 +-
 FlipcashTests/TipCardExportTests.swift        |   2 +-
 FlipcashTests/TipFlowFailureDialogTests.swift |   2 +-
 10 files changed, 12 insertions(+), 124 deletions(-)
 delete mode 100644 Flipcash/Core/Screens/Main/Username/UsernameProgressCard.swift

diff --git a/Flipcash/Core/Controllers/Deep Links/DeepLinkController.swift b/Flipcash/Core/Controllers/Deep Links/DeepLinkController.swift
index 9d58e58f5..089cee138 100644
--- a/Flipcash/Core/Controllers/Deep Links/DeepLinkController.swift	
+++ b/Flipcash/Core/Controllers/Deep Links/DeepLinkController.swift	
@@ -326,7 +326,7 @@ struct DeepLinkAction {
 
     private static func showLookupFailed(isScan: Bool, on session: Session) {
         session.dialogItem = .error(
-            title: isScan ? "Couldn't Open Tip Card" : "Couldn't Open Profile",
+            title: isScan ? "Couldn't Open Profile Card" : "Couldn't Open Profile",
             subtitle: "Please check your connection and try again"
         )
     }
diff --git a/Flipcash/Core/Screens/Main/CameraPromptView.swift b/Flipcash/Core/Screens/Main/CameraPromptView.swift
index 0a013823a..01f951b58 100644
--- a/Flipcash/Core/Screens/Main/CameraPromptView.swift
+++ b/Flipcash/Core/Screens/Main/CameraPromptView.swift
@@ -49,13 +49,13 @@ nonisolated enum CameraPrompt: Equatable {
     func message(embedded: Bool) -> String {
         switch self {
         case .requestPermission:
-            embedded ? "Start your camera to scan a Tip Card"
+            embedded ? "Start your camera to scan a Profile Card"
                      : "Flipcash uses your camera to scan and grab cash"
         case .openSettings:
-            embedded ? "Turn on Camera in Settings to scan a Tip Card"
+            embedded ? "Turn on Camera in Settings to scan a Profile Card"
                      : "You need to turn on Camera in Settings to scan Codes"
         case .startCamera:
-            embedded ? "Start your camera to scan a Tip Card"
+            embedded ? "Start your camera to scan a Profile Card"
                      : "You need to start your camera to grab cash"
         }
     }
diff --git a/Flipcash/Core/Screens/Main/Home/NewUserTutorial.swift b/Flipcash/Core/Screens/Main/Home/NewUserTutorial.swift
index 7f216b0a2..36fbf15c8 100644
--- a/Flipcash/Core/Screens/Main/Home/NewUserTutorial.swift
+++ b/Flipcash/Core/Screens/Main/Home/NewUserTutorial.swift
@@ -23,7 +23,7 @@ nonisolated enum TutorialItem: TutorialItemPresentable {
     var title: String {
         switch self {
         case .addMoney:    return "Add Money"
-        case .scanTipCard: return "Scan a Tip Card"
+        case .scanTipCard: return "Scan a Profile Card"
         }
     }
 
diff --git a/Flipcash/Core/Screens/Main/Home/WalletScreen.swift b/Flipcash/Core/Screens/Main/Home/WalletScreen.swift
index 773d11c02..412f070da 100644
--- a/Flipcash/Core/Screens/Main/Home/WalletScreen.swift
+++ b/Flipcash/Core/Screens/Main/Home/WalletScreen.swift
@@ -15,7 +15,7 @@ struct WalletScreen: View {
 
     @Environment(SessionContainer.self) private var sessionContainer
 
-    /// Invoked by the tutorial's "Scan a Tip Card" step to switch to the Scan tab.
+    /// Invoked by the tutorial's "Scan a Profile Card" step to switch to the Scan tab.
     let onScanTipCard: () -> Void
 
     var body: some View {
diff --git a/Flipcash/Core/Screens/Main/Tips/TipFlow.swift b/Flipcash/Core/Screens/Main/Tips/TipFlow.swift
index 9c0f01e48..be912356b 100644
--- a/Flipcash/Core/Screens/Main/Tips/TipFlow.swift
+++ b/Flipcash/Core/Screens/Main/Tips/TipFlow.swift
@@ -172,7 +172,7 @@ final class TipFlow {
     /// read, so a miss is a fetch that didn't land rather than a wrong address.
     static var failureDialog: DialogItem {
         .error(
-            title: "Couldn't Open Tip Card",
+            title: "Couldn't Open Profile Card",
             subtitle: "Please check your connection and try again"
         )
     }
diff --git a/Flipcash/Core/Screens/Main/Tips/TipcardScreen.swift b/Flipcash/Core/Screens/Main/Tips/TipcardScreen.swift
index 86583f51c..50dee51ff 100644
--- a/Flipcash/Core/Screens/Main/Tips/TipcardScreen.swift
+++ b/Flipcash/Core/Screens/Main/Tips/TipcardScreen.swift
@@ -28,7 +28,7 @@ struct TipcardScreen: View {
         Background(color: .backgroundMain) {
             legacyContent
         }
-        .navigationTitle("My Tip Card")
+        .navigationTitle("My Profile Card")
         .toolbarTitleDisplayMode(.inline)
         .task(id: profilePicture?.thumbnailBlobID) {
             previewCache.warm(TipCode.Payload(userID: sessionContainer.session.userID))
@@ -39,7 +39,7 @@ struct TipcardScreen: View {
 
     private var legacyContent: some View {
         VStack(spacing: 0) {
-            Text("Share Your Tip Card to Get Tipped")
+            Text("Share Your Profile Card to Get Tipped")
                 .font(.appTextLarge)
                 .foregroundStyle(Color.textMain)
                 .multilineTextAlignment(.center)
diff --git a/Flipcash/Core/Screens/Main/Username/UsernameProgressCard.swift b/Flipcash/Core/Screens/Main/Username/UsernameProgressCard.swift
deleted file mode 100644
index 97a494ed4..000000000
--- a/Flipcash/Core/Screens/Main/Username/UsernameProgressCard.swift
+++ /dev/null
@@ -1,112 +0,0 @@
-//
-//  UsernameProgressCard.swift
-//  Flipcash
-//
-
-import SwiftUI
-import FlipcashUI
-
-/// The You-tab card offering a username, in the tip-card action group below
-/// Share/Download (Figma nodes 9536:4336 / 9537:1845). Superseded the
-/// settings-row entry point: `YouScreen` shows it only while
-/// `shouldPromptForUsername` holds, in place of the row it used to draw.
-///
-/// Takes plain values rather than reading `Session`/`UsernameGate` itself, so
-/// it can be previewed and tested without a signed-in account — the caller
-/// (`YouScreen`) is the one place that has both.
-struct UsernameProgressCard: View {
-
-    /// Which of the two states the card draws. The title never changes; the
-    /// state governs the bar's colour, the chevron, and where the tap lands.
-    enum State: Equatable {
-        /// Below the server's minimum (node 9536:4336): white bar, the
-        /// shortfall in place of a chevron. Tapping raises the balance gate.
-        case incomplete
-        /// At or above it (node 9537:1845): green bar, chevron. Tapping opens
-        /// the claim screen.
-        case complete
-    }
-
-    private static let title = "Get a custom @username"
-
-    let state: State
-    let subtitle: String
-    /// The shortfall, shown only in `.incomplete`. `nil` in `.complete`.
-    let trailing: String?
-    /// The balance's progress toward the minimum, `0...1`.
-    let fraction: Double
-    /// Runs on tap. Both states are tappable: the card is the entry point to
-    /// the flow either way, and below the minimum that means being told the
-    /// rule rather than being left with an inert bar.
-    let action: VoidAction
-
-    var body: some View {
-        Button(action: action) {
-            chrome
-        }
-        .buttonStyle(.plain)
-        .accessibilityLabel(Self.title)
-        // The shortfall reads as part of the hint rather than as a value: it
-        // is the same sentence the subtitle starts, not a separate reading.
-        .accessibilityHint(trailing.map { "\(subtitle). \($0)" } ?? subtitle)
-    }
-
-    private var chrome: some View {
-        VStack(alignment: .leading, spacing: 6) {
-            HStack(alignment: .firstTextBaseline, spacing: 8) {
-                Text(Self.title)
-                    .font(.default(size: 14, weight: .semibold))
-                    .foregroundStyle(Color.textMain)
-
-                if let trailing {
-                    Spacer(minLength: 8)
-                    Text(trailing)
-                        .font(.default(size: 14, weight: .semibold))
-                        .foregroundStyle(Color.textMain.opacity(0.5))
-                }
-
-                if state == .complete {
-                    Spacer(minLength: 8)
-                    Image.system(.chevronRight)
-                        .renderingMode(.template)
-                        .frame(width: 20, height: 20)
-                        .foregroundStyle(Color.textMain)
-                }
-            }
-
-            Text(subtitle)
-                .font(.default(size: 12, weight: .medium))
-                .foregroundStyle(Color.textMain.opacity(0.5))
-
-            Spacer(minLength: 0)
-
-            ProgressTrack(fraction: fraction, fill: state == .complete ? .success : Color.white)
-        }
-        .padding(.top, 12)
-        .padding(.bottom, 15)
-        .padding(.horizontal, 15)
-        .frame(height: 88)
-        .background(Color.backgroundRow, in: RoundedRectangle(cornerRadius: 6, style: .continuous))
-    }
-}
-
-/// The card's progress bar: a 10%-white track with a fill sized to `fraction`.
-private struct ProgressTrack: View {
-
-    let fraction: Double
-    let fill: Color
-
-    var body: some View {
-        GeometryReader { proxy in
-            ZStack(alignment: .leading) {
-                RoundedRectangle(cornerRadius: 2, style: .continuous)
-                    .fill(Color.white.opacity(0.1))
-
-                RoundedRectangle(cornerRadius: 2, style: .continuous)
-                    .fill(fill)
-                    .frame(width: proxy.size.width * CGFloat(max(0, min(1, fraction))))
-            }
-        }
-        .frame(height: 6)
-    }
-}
diff --git a/Flipcash/Core/Screens/Main/You/TipCardExport.swift b/Flipcash/Core/Screens/Main/You/TipCardExport.swift
index 6d74d8db0..63ea018c2 100644
--- a/Flipcash/Core/Screens/Main/You/TipCardExport.swift
+++ b/Flipcash/Core/Screens/Main/You/TipCardExport.swift
@@ -101,7 +101,7 @@ enum TipCardExport {
             .replacingOccurrences(of: ":", with: " ")
             .trimmingCharacters(in: .whitespacesAndNewlines)
 
-        let stem = if let subject, !subject.isEmpty { "Chat with \(subject)" } else { "Tip Card" }
+        let stem = if let subject, !subject.isEmpty { "Chat with \(subject)" } else { "Profile Card" }
         return "\(stem).\(format.rawValue)"
     }
 
diff --git a/FlipcashTests/TipCardExportTests.swift b/FlipcashTests/TipCardExportTests.swift
index fa419c618..448a6d735 100644
--- a/FlipcashTests/TipCardExportTests.swift
+++ b/FlipcashTests/TipCardExportTests.swift
@@ -45,7 +45,7 @@ struct TipCardExportTests {
         let url = try #require(TipCardExport.file(for: .svg, codeData: .placeholder35, name: nil))
         defer { TipCardExport.discard(url) }
 
-        #expect(url.lastPathComponent == "Tip Card.svg")
+        #expect(url.lastPathComponent == "Profile Card.svg")
     }
 
     /// A display name is server-supplied text landing in a path component.
diff --git a/FlipcashTests/TipFlowFailureDialogTests.swift b/FlipcashTests/TipFlowFailureDialogTests.swift
index df3db0651..5a7fc05a2 100644
--- a/FlipcashTests/TipFlowFailureDialogTests.swift
+++ b/FlipcashTests/TipFlowFailureDialogTests.swift
@@ -17,7 +17,7 @@ struct TipFlowFailureDialogTests {
     func failedResolve_genericError() {
         let item = TipFlow.failureDialog
         #expect(item.style == .destructive)
-        #expect(item.title == "Couldn't Open Tip Card")
+        #expect(item.title == "Couldn't Open Profile Card")
         #expect(item.subtitle == "Please check your connection and try again")
     }
 }

From 16899b9e33716f47249011daefbe3dc06f7ee7a1 Mon Sep 17 00:00:00 2001
From: Brandon McAnsh <git@bmcreations.dev>
Date: Tue, 6 Oct 2026 13:28:20 -0400
Subject: [PATCH 37/45] feat(wallet): say "Send your first message" on the scan
 tutorial step

---
 Flipcash/Core/Screens/Main/Home/NewUserTutorial.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Flipcash/Core/Screens/Main/Home/NewUserTutorial.swift b/Flipcash/Core/Screens/Main/Home/NewUserTutorial.swift
index 36fbf15c8..b867fae2d 100644
--- a/Flipcash/Core/Screens/Main/Home/NewUserTutorial.swift
+++ b/Flipcash/Core/Screens/Main/Home/NewUserTutorial.swift
@@ -30,7 +30,7 @@ nonisolated enum TutorialItem: TutorialItemPresentable {
     var subtitle: String {
         switch self {
         case .addMoney:    return "Add money to your account"
-        case .scanTipCard: return "Give your first tip"
+        case .scanTipCard: return "Send your first message"
         }
     }
 

From b662c90e9e37b0217c7a82d91fa57a61c41f0eb3 Mon Sep 17 00:00:00 2001
From: Brandon McAnsh <git@bmcreations.dev>
Date: Tue, 6 Oct 2026 14:12:57 -0400
Subject: [PATCH 38/45] revert(username): keep UsernameProgressCard for
 possible reuse

It has no callers after the You tab redesign, but it may come back.
---
 .../Main/Username/UsernameProgressCard.swift  | 112 ++++++++++++++++++
 1 file changed, 112 insertions(+)
 create mode 100644 Flipcash/Core/Screens/Main/Username/UsernameProgressCard.swift

diff --git a/Flipcash/Core/Screens/Main/Username/UsernameProgressCard.swift b/Flipcash/Core/Screens/Main/Username/UsernameProgressCard.swift
new file mode 100644
index 000000000..97a494ed4
--- /dev/null
+++ b/Flipcash/Core/Screens/Main/Username/UsernameProgressCard.swift
@@ -0,0 +1,112 @@
+//
+//  UsernameProgressCard.swift
+//  Flipcash
+//
+
+import SwiftUI
+import FlipcashUI
+
+/// The You-tab card offering a username, in the tip-card action group below
+/// Share/Download (Figma nodes 9536:4336 / 9537:1845). Superseded the
+/// settings-row entry point: `YouScreen` shows it only while
+/// `shouldPromptForUsername` holds, in place of the row it used to draw.
+///
+/// Takes plain values rather than reading `Session`/`UsernameGate` itself, so
+/// it can be previewed and tested without a signed-in account — the caller
+/// (`YouScreen`) is the one place that has both.
+struct UsernameProgressCard: View {
+
+    /// Which of the two states the card draws. The title never changes; the
+    /// state governs the bar's colour, the chevron, and where the tap lands.
+    enum State: Equatable {
+        /// Below the server's minimum (node 9536:4336): white bar, the
+        /// shortfall in place of a chevron. Tapping raises the balance gate.
+        case incomplete
+        /// At or above it (node 9537:1845): green bar, chevron. Tapping opens
+        /// the claim screen.
+        case complete
+    }
+
+    private static let title = "Get a custom @username"
+
+    let state: State
+    let subtitle: String
+    /// The shortfall, shown only in `.incomplete`. `nil` in `.complete`.
+    let trailing: String?
+    /// The balance's progress toward the minimum, `0...1`.
+    let fraction: Double
+    /// Runs on tap. Both states are tappable: the card is the entry point to
+    /// the flow either way, and below the minimum that means being told the
+    /// rule rather than being left with an inert bar.
+    let action: VoidAction
+
+    var body: some View {
+        Button(action: action) {
+            chrome
+        }
+        .buttonStyle(.plain)
+        .accessibilityLabel(Self.title)
+        // The shortfall reads as part of the hint rather than as a value: it
+        // is the same sentence the subtitle starts, not a separate reading.
+        .accessibilityHint(trailing.map { "\(subtitle). \($0)" } ?? subtitle)
+    }
+
+    private var chrome: some View {
+        VStack(alignment: .leading, spacing: 6) {
+            HStack(alignment: .firstTextBaseline, spacing: 8) {
+                Text(Self.title)
+                    .font(.default(size: 14, weight: .semibold))
+                    .foregroundStyle(Color.textMain)
+
+                if let trailing {
+                    Spacer(minLength: 8)
+                    Text(trailing)
+                        .font(.default(size: 14, weight: .semibold))
+                        .foregroundStyle(Color.textMain.opacity(0.5))
+                }
+
+                if state == .complete {
+                    Spacer(minLength: 8)
+                    Image.system(.chevronRight)
+                        .renderingMode(.template)
+                        .frame(width: 20, height: 20)
+                        .foregroundStyle(Color.textMain)
+                }
+            }
+
+            Text(subtitle)
+                .font(.default(size: 12, weight: .medium))
+                .foregroundStyle(Color.textMain.opacity(0.5))
+
+            Spacer(minLength: 0)
+
+            ProgressTrack(fraction: fraction, fill: state == .complete ? .success : Color.white)
+        }
+        .padding(.top, 12)
+        .padding(.bottom, 15)
+        .padding(.horizontal, 15)
+        .frame(height: 88)
+        .background(Color.backgroundRow, in: RoundedRectangle(cornerRadius: 6, style: .continuous))
+    }
+}
+
+/// The card's progress bar: a 10%-white track with a fill sized to `fraction`.
+private struct ProgressTrack: View {
+
+    let fraction: Double
+    let fill: Color
+
+    var body: some View {
+        GeometryReader { proxy in
+            ZStack(alignment: .leading) {
+                RoundedRectangle(cornerRadius: 2, style: .continuous)
+                    .fill(Color.white.opacity(0.1))
+
+                RoundedRectangle(cornerRadius: 2, style: .continuous)
+                    .fill(fill)
+                    .frame(width: proxy.size.width * CGFloat(max(0, min(1, fraction))))
+            }
+        }
+        .frame(height: 6)
+    }
+}

From 4ab56d57e0cf31b2a1b182e71342edf809994d46 Mon Sep 17 00:00:00 2001
From: Brandon McAnsh <git@bmcreations.dev>
Date: Tue, 6 Oct 2026 14:37:17 -0400
Subject: [PATCH 39/45] feat(profile): favorite public groups on profiles

Edit Profile gets a "Favorite Public Groups" card that opens a picker of
the user's public groups, saved with SetFeaturedGroups. The You tab and
other users' profiles list those groups under the stats card and open the
chat on tap; the section hides when there are none.

The picker's candidates are the currently featured groups plus joined
public groups, so a group the user has since left can still be removed.
Selection keeps the server's order, appends new picks, and caps at 10,
which the contract enforces as a validation error rather than a result
code. A denied save (a group went private) gets its own dialog.

Own-profile state lives in a FeaturedGroups unit on SessionContainer,
shared by the You tab, the Edit Profile card and the picker. Featured
groups stay out of ConversationStore: they are list-shaped and may belong
to chats the viewer is not in.
---
 .claude/plans/2026-10-06-featured-groups.md   |  26 +++
 .../Navigation/AppRouter+Destination.swift    |   7 +-
 .../AppRouter+DestinationView.swift           |  17 ++
 .../Profile/EditFeaturedGroupsModel.swift     | 167 ++++++++++++++
 .../Profile/EditFeaturedGroupsScreen.swift    | 128 ++++++++++
 .../Main/Profile/EditProfileScreen.swift      |  12 +
 .../Core/Screens/Main/You/YouScreen.swift     |   9 +
 .../Core/Screens/Profile/FeaturedGroups.swift |  50 ++++
 .../Profile/FeaturedGroupsSection.swift       |  99 ++++++++
 .../Screens/Profile/UserProfileScreen.swift   |  21 +-
 .../Core/Session/SessionAuthenticator.swift   |   7 +
 .../EditFeaturedGroupsModelTests.swift        | 218 ++++++++++++++++++
 .../Navigation/SettingsRoutingTests.swift     |   1 +
 13 files changed, 759 insertions(+), 3 deletions(-)
 create mode 100644 .claude/plans/2026-10-06-featured-groups.md
 create mode 100644 Flipcash/Core/Screens/Main/Profile/EditFeaturedGroupsModel.swift
 create mode 100644 Flipcash/Core/Screens/Main/Profile/EditFeaturedGroupsScreen.swift
 create mode 100644 Flipcash/Core/Screens/Profile/FeaturedGroups.swift
 create mode 100644 Flipcash/Core/Screens/Profile/FeaturedGroupsSection.swift
 create mode 100644 FlipcashTests/EditFeaturedGroupsModelTests.swift

diff --git a/.claude/plans/2026-10-06-featured-groups.md b/.claude/plans/2026-10-06-featured-groups.md
new file mode 100644
index 000000000..18ac8b14f
--- /dev/null
+++ b/.claude/plans/2026-10-06-featured-groups.md
@@ -0,0 +1,26 @@
+# Favorite public groups on profiles (flipcash2 0.18.0)
+
+Contract + wrappers already on main (257a089d, 721fb442): `FlipClient.getFeaturedGroups(owner:username:)`,
+`setFeaturedGroups(owner:conversationIDs:)`. This plan is the app layer and UI only.
+
+Branch `feat/profile-featured-groups`, cut from `feat/profile-refresh-copy` (#990) with `origin/main` merged in
+(the stack predates the 0.18.0 wrappers).
+
+## Proto facts that shape the design
+- Ordered list, max 10 (PGV `max_items`, so exceeding it is a transport invalid-argument — cap client-side).
+- Written whole; empty clears. Only public groups (`.denied` otherwise, names no group).
+- Featuring is independent of membership: leaving a group does not unfeature it.
+- `GetFeaturedGroups` returns list-view `Metadata` (no members, viewer state, last message, cover).
+
+## Shape
+- `FeaturedGroups` (`@MainActor @Observable`, `let` on `SessionContainer`): the signed-in user's list,
+  shared by the You tab section, the Edit Profile row ("N selected") and the picker. Closures injected
+  (fetch/save) like `EditBioModel`. Never seated into `ConversationStore`.
+- `UserProfileViewModel.featuredGroups`: fetched after the profile (needs `username`).
+- `FeaturedGroupsSection` view: "Favorite Public Groups" header + rows (group avatar, title,
+  description ?? people count); tap → `router.push(.tipConversation(id))`. Hidden when empty.
+- Edit Profile: `FieldCard` "Favorite Public Groups" → new `.editFeaturedGroups` destination.
+- Picker `EditFeaturedGroupsScreen` + `EditFeaturedGroupsModel`: candidates = current featured (server
+  order) ∪ joined public groups from `loadGroupFeed()`'s result (`isPrivate` isn't persisted, so the
+  store's copy can't be trusted offline; fallback = store joined groups with `!isPrivate && !useE2Ee`).
+  Search by title, ordered selection, cap 10, bottom filled Save like `EditBioScreen`.
diff --git a/Flipcash/Core/Navigation/AppRouter+Destination.swift b/Flipcash/Core/Navigation/AppRouter+Destination.swift
index 13a85d080..fc67e67c0 100644
--- a/Flipcash/Core/Navigation/AppRouter+Destination.swift
+++ b/Flipcash/Core/Navigation/AppRouter+Destination.swift
@@ -64,6 +64,8 @@ extension AppRouter {
         case editProfile
         /// The bio on its own, pushed from Edit Profile.
         case editBio
+        /// The public groups shown on the signed-in user's profile, chosen from Edit Profile.
+        case editFeaturedGroups
         /// The cover banner on its own, pushed from Edit Profile.
         case changeCoverPicture
         /// The display name on its own, edited from Settings. The full
@@ -141,7 +143,7 @@ extension AppRouter {
                  .buyCurrency, .convertCurrency,
                  .withdrawCurrency, .usdcDepositEducation, .usdcDepositAddress:
                 return .balance
-            case .settings, .accountInfo, .editProfile, .editBio, .changeCoverPicture,
+            case .settings, .accountInfo, .editProfile, .editBio, .editFeaturedGroups, .changeCoverPicture,
                  .changeDisplayName, .changeProfilePicture, .username,
                  .setMinimumTip,
                  .settingsAdvancedBetaFeatures, .settingsAppSettings, .settingsAccountSelection,
@@ -180,6 +182,7 @@ extension AppRouter {
             case .accountInfo:                  "accountInfo"
             case .editProfile:                  "editProfile"
             case .editBio:                      "editBio"
+            case .editFeaturedGroups:           "editFeaturedGroups"
             case .changeCoverPicture:           "changeCoverPicture"
             case .changeDisplayName:            "changeDisplayName"
             case .changeProfilePicture:         "changeProfilePicture"
@@ -242,7 +245,7 @@ extension AppRouter {
             case .activity,
                  .discoverCurrencies, .currencyCreationSummary, .currencyCreationWizard,
                  .usdcDepositEducation, .usdcDepositAddress,
-                 .settings, .accountInfo, .editProfile, .editBio, .changeCoverPicture,
+                 .settings, .accountInfo, .editProfile, .editBio, .editFeaturedGroups, .changeCoverPicture,
                  .changeDisplayName, .changeProfilePicture,
                  .settingsAdvancedBetaFeatures, .settingsAppSettings, .settingsAccountSelection,
                  .settingsApplicationLogs, .blockedUsers, .accessKey, .withdraw,
diff --git a/Flipcash/Core/Navigation/AppRouter+DestinationView.swift b/Flipcash/Core/Navigation/AppRouter+DestinationView.swift
index f35f2359c..b7328c9b7 100644
--- a/Flipcash/Core/Navigation/AppRouter+DestinationView.swift
+++ b/Flipcash/Core/Navigation/AppRouter+DestinationView.swift
@@ -100,6 +100,23 @@ struct DestinationView: View {
                 refresh: { try await session.updateProfile() }
             ))
 
+        case .editFeaturedGroups:
+            let session = sessionContainer.session
+            let flipClient = container.flipClient
+            let featuredGroups = sessionContainer.featuredGroups
+            let conversationController = sessionContainer.conversationController
+            EditFeaturedGroupsScreen(model: EditFeaturedGroupsModel(
+                featured: featuredGroups.groups,
+                loadingFeatured: {
+                    // The list is read by handle; with none there is nothing to read back.
+                    guard let username = session.profile?.username else { return [] }
+                    return await featuredGroups.load(username: username) ? featuredGroups.groups : nil
+                },
+                joinedGroups: { await conversationController.loadGroupFeed() },
+                saving: { try await flipClient.setFeaturedGroups(owner: session.ownerKeyPair, conversationIDs: $0) },
+                saved: { featuredGroups.replace(with: $0) }
+            ))
+
         case .changeCoverPicture:
             ChangeCoverPictureScreen()
 
diff --git a/Flipcash/Core/Screens/Main/Profile/EditFeaturedGroupsModel.swift b/Flipcash/Core/Screens/Main/Profile/EditFeaturedGroupsModel.swift
new file mode 100644
index 000000000..bddbd464f
--- /dev/null
+++ b/Flipcash/Core/Screens/Main/Profile/EditFeaturedGroupsModel.swift
@@ -0,0 +1,167 @@
+//
+//  EditFeaturedGroupsModel.swift
+//  Flipcash
+//
+
+import SwiftUI
+import FlipcashCore
+import FlipcashUI
+
+private let logger = Logger(label: "flipcash.edit-featured-groups")
+
+/// The favorite-groups picker's choices, ordered selection and its one save.
+///
+/// The calls are injected: `FlipClient` is a concrete class with a live gRPC channel, so a test
+/// has nothing to fake.
+@MainActor
+@Observable
+final class EditFeaturedGroupsModel {
+
+    /// Where the save is. `.saved` is held by the screen for its checkmark before it pops.
+    enum SaveState: Equatable {
+        case normal
+        case saving
+        case saved
+    }
+
+    /// Where the candidate list is.
+    enum LoadState: Equatable {
+        case loading
+        case loaded
+        /// The featured list could not be read, so a save could drop groups the screen never saw.
+        case failed
+    }
+
+    /// Why a save failed, for the dialog.
+    enum Failure: Equatable {
+        /// The server refused a group as private. It does not say which.
+        case privateGroup
+        case other
+    }
+
+    /// The groups on offer: the ones featured now, in their order, then the public groups the user
+    /// has joined.
+    private(set) var candidates: [Conversation]
+
+    /// The chosen groups, in the order they will show on the profile.
+    private(set) var selection: [ConversationID]
+
+    private(set) var state: SaveState = .normal
+    private(set) var loadState: LoadState = .loading
+
+    /// Filters ``visibleCandidates`` by title.
+    var query = ""
+
+    /// A failed save, shown as a dialog. Set to nil once shown.
+    var failure: Failure?
+
+    @ObservationIgnored private var initialSelection: [ConversationID]
+    @ObservationIgnored private let loadingFeatured: () async -> [Conversation]?
+    @ObservationIgnored private let joinedGroups: () async -> [Conversation]
+    @ObservationIgnored private let saving: ([ConversationID]) async throws -> [Conversation]
+    @ObservationIgnored private let saved: ([Conversation]) -> Void
+
+    /// - Parameters:
+    ///   - featured: the groups the profile featured when last read, shown while they are re-read.
+    ///   - loadingFeatured: re-reads the featured groups, in order; nil when that fails.
+    ///   - joinedGroups: the groups the user is in, as the server says now.
+    ///   - saving: submits the ordered selection and returns what is now featured.
+    ///   - saved: hands that list to the rest of the app.
+    init(
+        featured: [Conversation],
+        loadingFeatured: @escaping () async -> [Conversation]?,
+        joinedGroups: @escaping () async -> [Conversation],
+        saving: @escaping ([ConversationID]) async throws -> [Conversation],
+        saved: @escaping ([Conversation]) -> Void
+    ) {
+        self.candidates = featured
+        self.selection = featured.map(\.id)
+        self.initialSelection = featured.map(\.id)
+        self.loadingFeatured = loadingFeatured
+        self.joinedGroups = joinedGroups
+        self.saving = saving
+        self.saved = saved
+    }
+
+    /// The candidates whose title matches ``query``.
+    var visibleCandidates: [Conversation] {
+        let query = query.trimmingCharacters(in: .whitespacesAndNewlines)
+        guard !query.isEmpty else { return candidates }
+        return candidates.filter { $0.groupLinkTitle.localizedCaseInsensitiveContains(query) }
+    }
+
+    /// Whether Save is enabled: only once the featured list has been read, so a save never drops
+    /// groups the screen did not know about. Clearing every group is a change like any other.
+    var canSave: Bool {
+        state == .normal && loadState == .loaded && selection != initialSelection
+    }
+
+    /// Whether the group is chosen.
+    func isSelected(_ id: ConversationID) -> Bool {
+        selection.contains(id)
+    }
+
+    /// Whether tapping the group would change anything: always for a chosen one, and for the rest
+    /// only while there is room under ``FeaturedGroups/limit``.
+    func canToggle(_ id: ConversationID) -> Bool {
+        state == .normal && (isSelected(id) || selection.count < FeaturedGroups.limit)
+    }
+
+    /// Chooses the group at the end of the order, or drops it.
+    func toggle(_ id: ConversationID) {
+        guard canToggle(id) else { return }
+        if let index = selection.firstIndex(of: id) {
+            selection.remove(at: index)
+        } else {
+            selection.append(id)
+        }
+    }
+
+    /// Re-reads the featured groups, then offers the user's joined public groups after them.
+    ///
+    /// Featured groups stay on offer even when the user has left them: leaving does not unfeature
+    /// a group, so dropping it from the list would leave no way to remove it.
+    func loadCandidates() async {
+        guard let featured = await loadingFeatured() else {
+            loadState = .failed
+            return
+        }
+        let featuredIDs = featured.map(\.id)
+        // A choice made while the list was loading stands; an untouched one follows the server.
+        if selection == initialSelection {
+            selection = featuredIDs
+        }
+        initialSelection = featuredIDs
+
+        let joined = await joinedGroups()
+        let known = Set(featuredIDs)
+        candidates = featured + joined.filter { $0.type == .group && !$0.isPrivate && !known.contains($0.id) }
+        loadState = .loaded
+    }
+
+    /// Submits the selection. Failures land in ``failure``.
+    func save() async {
+        guard canSave else { return }
+
+        state = .saving
+
+        do {
+            let result = try await saving(selection)
+            saved(result)
+            state = .saved
+
+        } catch let error as ErrorSetFeaturedGroups where error == .denied {
+            state = .normal
+            logger.info("Featured groups denied")
+            ErrorReporting.captureError(error, reason: "Featured groups denied")
+            failure = .privateGroup
+
+        } catch {
+            state = .normal
+            guard !Task.isCancelled else { return }
+            logger.error("Failed to set featured groups", metadata: ["error": "\(error)"])
+            ErrorReporting.captureError(error, reason: "Failed to set featured groups")
+            failure = .other
+        }
+    }
+}
diff --git a/Flipcash/Core/Screens/Main/Profile/EditFeaturedGroupsScreen.swift b/Flipcash/Core/Screens/Main/Profile/EditFeaturedGroupsScreen.swift
new file mode 100644
index 000000000..21155a8f2
--- /dev/null
+++ b/Flipcash/Core/Screens/Main/Profile/EditFeaturedGroupsScreen.swift
@@ -0,0 +1,128 @@
+//
+//  EditFeaturedGroupsScreen.swift
+//  Flipcash
+//
+
+import SwiftUI
+import FlipcashCore
+import FlipcashUI
+
+/// Choosing the public groups the profile features, pushed from Edit Profile.
+struct EditFeaturedGroupsScreen: View {
+
+    @Environment(AppRouter.self) private var router
+
+    @State private var model: EditFeaturedGroupsModel
+    @State private var dialog: DialogItem?
+    @State private var saveTask: Task<Void, Never>?
+
+    /// Takes the model rather than building it, so the list opens on the groups featured now.
+    init(model: EditFeaturedGroupsModel) {
+        _model = State(initialValue: model)
+    }
+
+    private var buttonState: ButtonState {
+        switch model.state {
+        case .normal: .normal
+        case .saving: .loading
+        case .saved:  .success
+        }
+    }
+
+    var body: some View {
+        @Bindable var model = model
+
+        Background(color: .backgroundMain) {
+            List {
+                Section(header: ListHeader("\(model.selection.count) of \(FeaturedGroups.limit) selected")) {
+                    ForEach(model.visibleCandidates) { group in
+                        row(group)
+                    }
+                }
+                .listRowSeparatorTint(Color.rowSeparator)
+            }
+            .listStyle(.grouped)
+            .scrollContentBackground(.hidden)
+            .overlay { emptyState }
+        }
+        .navigationTitle("Favorite Public Groups")
+        .navigationBarTitleDisplayMode(.inline)
+        .searchable(text: $model.query, prompt: "Search Groups")
+        .scrollEdgeBar(.bottom) {
+            Button(action: save) {
+                ButtonStateLabel("Save", state: buttonState)
+            }
+            .buttonStyle(.filled)
+            .disabled(!model.canSave)
+            .accessibilityIdentifier("edit-featured-groups-save")
+            .padding(.horizontal, 20)
+            .padding(.top, 12)
+            .padding(.bottom, 8)
+        }
+        .dialog(item: $dialog)
+        .task { await model.loadCandidates() }
+        .onChange(of: model.failure) { _, failure in
+            guard let failure else { return }
+            model.failure = nil
+            switch failure {
+            case .privateGroup:
+                dialog = .error(title: "Only Public Groups Can Be Featured", subtitle: "One of these groups is private. Remove it and try again")
+            case .other:
+                dialog = .error(title: "Couldn't Save Your Groups", subtitle: "Try again")
+            }
+        }
+        // Leaving the screen abandons the submission: its only continuation is a pop.
+        .onDisappear { saveTask?.cancel() }
+    }
+
+    private func row(_ group: Conversation) -> some View {
+        Button {
+            model.toggle(group.id)
+        } label: {
+            FeaturedGroupRow(group: group) {
+                CheckView(active: model.isSelected(group.id))
+            }
+            .padding(.vertical, 6)
+            .contentShape(Rectangle())
+        }
+        .buttonStyle(.plain)
+        .opacity(model.canToggle(group.id) ? 1 : 0.4)
+        .disabled(!model.canToggle(group.id))
+        .listRowBackground(Color.backgroundMain)
+        .accessibilityElement(children: .ignore)
+        .accessibilityLabel(Text(group.featuredRowAccessibilityLabel))
+        .accessibilityAddTraits(model.isSelected(group.id) ? [.isButton, .isSelected] : .isButton)
+        .accessibilityIdentifier("edit-featured-groups-row")
+    }
+
+    @ViewBuilder
+    private var emptyState: some View {
+        if !model.query.isEmpty, model.visibleCandidates.isEmpty {
+            SearchResultsUnavailableView(searchText: model.query)
+        } else if model.loadState == .failed {
+            Text("Couldn't load your groups")
+                .font(.appTextMedium)
+                .foregroundStyle(Color.textSecondary)
+        } else if model.loadState == .loaded, model.candidates.isEmpty {
+            Text("Join a public group to feature it on your profile")
+                .font(.appTextMedium)
+                .foregroundStyle(Color.textSecondary)
+                .multilineTextAlignment(.center)
+                .padding(.horizontal, 40)
+        }
+    }
+
+    private func save() {
+        guard saveTask == nil else { return }
+        saveTask = Task {
+            await model.save()
+            if model.state == .saved {
+                // Same beat the other editors hold their checkmark for.
+                try? await Task.delay(milliseconds: 500)
+                guard !Task.isCancelled else { return }
+                router.popTopmost()
+            }
+            saveTask = nil
+        }
+    }
+}
diff --git a/Flipcash/Core/Screens/Main/Profile/EditProfileScreen.swift b/Flipcash/Core/Screens/Main/Profile/EditProfileScreen.swift
index e6706b043..49a134465 100644
--- a/Flipcash/Core/Screens/Main/Profile/EditProfileScreen.swift
+++ b/Flipcash/Core/Screens/Main/Profile/EditProfileScreen.swift
@@ -136,6 +136,11 @@ struct EditProfileScreen: View {
                 router.push(.setMinimumTip(isSetupStep: false))
             }
             .accessibilityIdentifier("edit-profile-minimum")
+
+            FieldCard(title: "Favorite Public Groups", value: featuredGroupsSummary, placeholder: "Add groups") {
+                router.push(.editFeaturedGroups)
+            }
+            .accessibilityIdentifier("edit-profile-featured-groups")
         }
     }
 
@@ -154,6 +159,13 @@ struct EditProfileScreen: View {
         }
     }
 
+    /// How many groups the profile features, or nil for none.
+    private var featuredGroupsSummary: String? {
+        let count = sessionContainer.featuredGroups.groups.count
+        guard count > 0 else { return nil }
+        return count == 1 ? "1 group" : "\(count) groups"
+    }
+
     /// What others pay to start a chat, matching the You tab's stats card.
     private var minimumToChat: String? {
         StartChattingFee.amount(for: profile, session: session, ratesController: ratesController)?.formatted()
diff --git a/Flipcash/Core/Screens/Main/You/YouScreen.swift b/Flipcash/Core/Screens/Main/You/YouScreen.swift
index bd7bff652..bb0651491 100644
--- a/Flipcash/Core/Screens/Main/You/YouScreen.swift
+++ b/Flipcash/Core/Screens/Main/You/YouScreen.swift
@@ -71,6 +71,11 @@ struct YouScreen: View {
                             joinedAt: profile?.joinedAt
                         )
                         .padding(.top, 19)
+
+                        FeaturedGroupsSection(groups: sessionContainer.featuredGroups.groups) {
+                            router.push(.tipConversation($0))
+                        }
+                        .padding(.top, 20)
                     }
                 }
                 .padding(.bottom, bottomContentInset)
@@ -101,6 +106,10 @@ struct YouScreen: View {
             }
             await sessionContainer.profileAvatars.load(userID: sessionContainer.session.userID, picture: profilePicture)
         }
+        .task(id: username) {
+            guard let username else { return }
+            await sessionContainer.featuredGroups.load(username: username)
+        }
         // A cash link raises the bill without touching the router, and it would draw under the card.
         .onChange(of: sessionContainer.session.isShowingBill) { _, isShowing in
             if isShowing { router.isShowingProfileCard = false }
diff --git a/Flipcash/Core/Screens/Profile/FeaturedGroups.swift b/Flipcash/Core/Screens/Profile/FeaturedGroups.swift
new file mode 100644
index 000000000..503ab84d7
--- /dev/null
+++ b/Flipcash/Core/Screens/Profile/FeaturedGroups.swift
@@ -0,0 +1,50 @@
+//
+//  FeaturedGroups.swift
+//  Flipcash
+//
+
+import SwiftUI
+import FlipcashCore
+
+private let logger = Logger(label: "flipcash.featured-groups")
+
+/// The public groups the signed-in user features on their profile, in the order they chose.
+///
+/// One list read by the You tab, Edit Profile and the picker, so a save shows everywhere at once.
+/// Kept apart from `ConversationStore`: the server answers list-view metadata with no members or
+/// viewer state, and featuring a group does not require being in it.
+@MainActor
+@Observable
+final class FeaturedGroups {
+
+    /// The most featured groups a profile can carry; the server rejects more.
+    static let limit = 10
+
+    private(set) var groups: [Conversation] = []
+
+    @ObservationIgnored private let fetching: (Username) async throws -> [Conversation]
+
+    /// - Parameter fetching: reads the groups a username features.
+    init(fetching: @escaping (Username) async throws -> [Conversation]) {
+        self.fetching = fetching
+    }
+
+    /// Re-reads the list for `username`, returning whether it did. A failure keeps the list already shown.
+    @discardableResult
+    func load(username: Username) async -> Bool {
+        do {
+            groups = try await fetching(username)
+            return true
+        } catch {
+            guard !Task.isCancelled else { return false }
+            logger.error("Failed to load featured groups", metadata: ["error": "\(error)"])
+            ErrorReporting.captureError(error, reason: "Failed to load featured groups")
+            return false
+        }
+    }
+
+    /// Takes the list a save returned, which is the server's word on what is now featured.
+    func replace(with groups: [Conversation]) {
+        self.groups = groups
+    }
+}
diff --git a/Flipcash/Core/Screens/Profile/FeaturedGroupsSection.swift b/Flipcash/Core/Screens/Profile/FeaturedGroupsSection.swift
new file mode 100644
index 000000000..89f2f4546
--- /dev/null
+++ b/Flipcash/Core/Screens/Profile/FeaturedGroupsSection.swift
@@ -0,0 +1,99 @@
+//
+//  FeaturedGroupsSection.swift
+//  Flipcash
+//
+
+import SwiftUI
+import FlipcashCore
+import FlipcashUI
+
+/// The "Favorite Public Groups" card on a profile, one row per group in the owner's order. Draws
+/// nothing when the list is empty.
+struct FeaturedGroupsSection: View {
+
+    let groups: [Conversation]
+    let onTap: (ConversationID) -> Void
+
+    var body: some View {
+        if !groups.isEmpty {
+            VStack(alignment: .leading, spacing: 0) {
+                Color.rowSeparator
+                    .frame(height: 1)
+
+                Text("Favorite Public Groups")
+                    .font(.appTextLarge)
+                    .foregroundStyle(Color.textMain)
+                    .padding(.top, 24)
+                    .padding(.bottom, 12)
+                    .accessibilityAddTraits(.isHeader)
+
+                VStack(spacing: 0) {
+                    ForEach(groups) { group in
+                        Button { onTap(group.id) } label: {
+                            FeaturedGroupRow(group: group) { EmptyView() }
+                                .padding(.horizontal, 16)
+                                .padding(.vertical, 12)
+                                .contentShape(Rectangle())
+                        }
+                        .buttonStyle(.plain)
+                        .accessibilityElement(children: .ignore)
+                        .accessibilityLabel(Text(group.featuredRowAccessibilityLabel))
+                        .accessibilityAddTraits(.isButton)
+                        .accessibilityIdentifier("profile-featured-group")
+
+                        if group.id != groups.last?.id {
+                            Color.rowSeparator
+                                .frame(height: 1)
+                                .padding(.leading, 72)
+                        }
+                    }
+                }
+                .background(Color.backgroundRow, in: RoundedRectangle(cornerRadius: Metrics.boxRadius, style: .continuous))
+            }
+            .padding(.horizontal, ProfileHeaderView<EmptyView, EmptyView, EmptyView>.inset)
+            .accessibilityIdentifier("profile-featured-groups")
+        }
+    }
+}
+
+/// A public group as profiles and the picker show it: its picture, title, and its description or
+/// head count. Never names members, which a viewer outside the group must not see.
+struct FeaturedGroupRow<Trailing: View>: View {
+
+    let group: Conversation
+    @ViewBuilder let trailing: Trailing
+
+    @Environment(SessionContainer.self) private var sessionContainer
+
+    private var subtitle: String { group.featuredRowSubtitle }
+
+    var body: some View {
+        RecipientRowBody(
+            avatarID: group.id.description,
+            title: group.groupLinkTitle,
+            subtitle: AttributedString(subtitle),
+            imageData: sessionContainer.profileAvatars.data(for: .chat(group.id)),
+            blurhash: group.picture?.thumbnailBlurhash
+        ) {
+            trailing
+        }
+        .task(id: group.picture?.thumbnailBlobID) {
+            await sessionContainer.profileAvatars.load(.chat(group.id), picture: group.picture)
+        }
+    }
+}
+
+extension Conversation {
+    /// The secondary line of a featured-group row: the group's description, or its member count when it has none.
+    var featuredRowSubtitle: String {
+        if let description = description?.trimmingCharacters(in: .whitespacesAndNewlines), !description.isEmpty {
+            return description
+        }
+        return rosterSummary.peopleCount
+    }
+
+    /// The single VoiceOver label for a featured-group row: title, then subtitle.
+    var featuredRowAccessibilityLabel: String {
+        "\(groupLinkTitle), \(featuredRowSubtitle)"
+    }
+}
diff --git a/Flipcash/Core/Screens/Profile/UserProfileScreen.swift b/Flipcash/Core/Screens/Profile/UserProfileScreen.swift
index 6d06b8a82..f5a08bdde 100644
--- a/Flipcash/Core/Screens/Profile/UserProfileScreen.swift
+++ b/Flipcash/Core/Screens/Profile/UserProfileScreen.swift
@@ -141,6 +141,11 @@ private struct UserProfileContent: View {
 
                     ProfileStatsCard(minimumToChat: fee, joinedAt: model.joinedAt)
                         .padding(.top, 20)
+
+                    FeaturedGroupsSection(groups: model.featuredGroups) {
+                        router.push(.tipConversation($0))
+                    }
+                    .padding(.top, 20)
                 }
                 .padding(.bottom, 24)
             }
@@ -202,7 +207,10 @@ private struct UserProfileContent: View {
         .onAppear {
             if position == nil { position = router.positionOfTopmost() }
         }
-        .task { await model.loadProfile() }
+        .task {
+            await model.loadProfile()
+            await model.loadFeaturedGroups()
+        }
     }
 
     // MARK: - Status badges -
@@ -421,6 +429,8 @@ final class UserProfileViewModel {
     private(set) var customization: TipCardCustomization?
     private(set) var joinedAt: Date?
     private(set) var minDmChatInitFee: FiatAmount?
+    /// The public groups this person features, in their order.
+    private(set) var featuredGroups: [Conversation] = []
 
     /// What to call this person: their name when they have one, their handle
     /// when they don't. A handle is public and stable, so it beats the generic
@@ -485,6 +495,15 @@ final class UserProfileViewModel {
         await profileAvatars.load(userID: userID, picture: profile.profilePicture)
     }
 
+    /// Reads the groups this person features, once their handle is known. Best effort: a profile
+    /// without the section is still the profile.
+    func loadFeaturedGroups() async {
+        guard let username,
+              let groups = try? await flipClient.getFeaturedGroups(owner: owner, username: username)
+        else { return }
+        featuredGroups = groups
+    }
+
     private func apply(_ profile: Profile) {
         if let name = profile.displayName, !name.isEmpty { self.name = name }
         if let username = profile.username { self.username = username }
diff --git a/Flipcash/Core/Session/SessionAuthenticator.swift b/Flipcash/Core/Session/SessionAuthenticator.swift
index 1d39d6a57..9a80b3a61 100644
--- a/Flipcash/Core/Session/SessionAuthenticator.swift
+++ b/Flipcash/Core/Session/SessionAuthenticator.swift
@@ -578,6 +578,9 @@ final class SessionContainer {
     /// The emoji the signed-in user reacts with most, for the reaction strip and picker.
     let recentReactions: RecentReactionsStore
 
+    /// The public groups the signed-in user features on their profile.
+    let featuredGroups: FeaturedGroups
+
     init(
         session: Session,
         database: Database,
@@ -714,6 +717,10 @@ final class SessionContainer {
         }
         let recentReactions = RecentReactionsStore(owner: owner.publicKey)
         self.recentReactions = recentReactions
+        self.featuredGroups = FeaturedGroups(fetching: { [weak flipClient] username in
+            guard let flipClient else { return [] }
+            return try await flipClient.getFeaturedGroups(owner: owner, username: username)
+        })
         conversationController.reactions.recents = recentReactions
         conversationController.start()
         self.conversationController = conversationController
diff --git a/FlipcashTests/EditFeaturedGroupsModelTests.swift b/FlipcashTests/EditFeaturedGroupsModelTests.swift
new file mode 100644
index 000000000..e3d12532d
--- /dev/null
+++ b/FlipcashTests/EditFeaturedGroupsModelTests.swift
@@ -0,0 +1,218 @@
+//
+//  EditFeaturedGroupsModelTests.swift
+//  FlipcashTests
+//
+
+import Foundation
+import Testing
+import FlipcashCore
+@testable import Flipcash
+
+@MainActor
+@Suite("EditFeaturedGroupsModel")
+struct EditFeaturedGroupsModelTests {
+
+    private struct Boom: Error {}
+
+    @MainActor
+    private final class Calls {
+        var submitted: [[ConversationID]] = []
+        var handedBack: [[Conversation]] = []
+    }
+
+    private func group(_ byte: UInt8, title: String? = nil, isPrivate: Bool = false, type: ConversationType = .group) -> Conversation {
+        Conversation(
+            id: ConversationID(data: Data(repeating: byte, count: 32)),
+            members: [],
+            lastMessage: nil,
+            lastActivity: Date(timeIntervalSince1970: 0),
+            type: type,
+            title: title,
+            isPrivate: isPrivate
+        )
+    }
+
+    private func makeModel(
+        cached: [Conversation] = [],
+        featured: [Conversation]? = [],
+        joined: [Conversation] = [],
+        calls: Calls = Calls(),
+        saving: (([ConversationID]) async throws -> [Conversation])? = nil
+    ) -> EditFeaturedGroupsModel {
+        EditFeaturedGroupsModel(
+            featured: cached,
+            loadingFeatured: { featured },
+            joinedGroups: { joined },
+            saving: { ids in
+                calls.submitted.append(ids)
+                return try await saving?(ids) ?? []
+            },
+            saved: { calls.handedBack.append($0) }
+        )
+    }
+
+    @Test("Candidates are the featured groups in their order, then joined public groups")
+    func candidatesOrder() async {
+        let a = group(1), b = group(2), c = group(3), secret = group(4, isPrivate: true), dm = group(5, type: .tipDm)
+        let model = makeModel(featured: [b, a], joined: [a, c, secret, dm])
+
+        await model.loadCandidates()
+
+        #expect(model.candidates.map(\.id) == [b.id, a.id, c.id])
+        #expect(model.selection == [b.id, a.id])
+        #expect(model.loadState == .loaded)
+    }
+
+    @Test("A featured group the user has left stays on offer so it can be removed")
+    func leftGroupStays() async {
+        let left = group(1)
+        let model = makeModel(featured: [left], joined: [])
+
+        await model.loadCandidates()
+
+        #expect(model.candidates.map(\.id) == [left.id])
+        #expect(model.isSelected(left.id))
+    }
+
+    @Test("Toggling appends at the end of the order and removes in place")
+    func toggleOrder() async {
+        let a = group(1), b = group(2), c = group(3)
+        let model = makeModel(featured: [a], joined: [b, c])
+        await model.loadCandidates()
+
+        model.toggle(c.id)
+        model.toggle(b.id)
+        #expect(model.selection == [a.id, c.id, b.id])
+
+        model.toggle(a.id)
+        #expect(model.selection == [c.id, b.id])
+    }
+
+    @Test("No more than ten can be chosen, and a chosen one can still be dropped")
+    func capsAtLimit() async {
+        let groups = (1...11).map { group(UInt8($0)) }
+        let model = makeModel(featured: [], joined: groups)
+        await model.loadCandidates()
+
+        groups.prefix(FeaturedGroups.limit).forEach { model.toggle($0.id) }
+        #expect(model.selection.count == FeaturedGroups.limit)
+        #expect(!model.canToggle(groups[10].id))
+
+        model.toggle(groups[10].id)
+        #expect(model.selection.count == FeaturedGroups.limit)
+
+        #expect(model.canToggle(groups[0].id))
+        model.toggle(groups[0].id)
+        #expect(model.selection.count == FeaturedGroups.limit - 1)
+    }
+
+    @Test("Save stays shut until the featured list is read, and while unchanged")
+    func canSave() async {
+        let a = group(1), b = group(2)
+        let model = makeModel(cached: [a], featured: [a], joined: [b])
+
+        model.toggle(a.id)
+        #expect(!model.canSave)
+
+        await model.loadCandidates()
+        // A choice made while loading stands.
+        #expect(model.selection.isEmpty)
+        #expect(model.canSave)
+
+        model.toggle(a.id)
+        #expect(!model.canSave)
+    }
+
+    @Test("A failed read of the featured list keeps Save shut")
+    func failedLoad() async {
+        let a = group(1)
+        let model = makeModel(cached: [], featured: nil, joined: [a])
+
+        await model.loadCandidates()
+        model.toggle(a.id)
+
+        #expect(model.loadState == .failed)
+        #expect(!model.canSave)
+    }
+
+    @Test("An untouched selection follows the re-read list")
+    func untouchedSelectionFollowsServer() async {
+        let stale = group(1), fresh = group(2)
+        let model = makeModel(cached: [stale], featured: [fresh])
+
+        await model.loadCandidates()
+
+        #expect(model.selection == [fresh.id])
+        #expect(!model.canSave)
+    }
+
+    @Test("Saving submits the ordered selection and hands back the server's list")
+    func saveSubmits() async {
+        let a = group(1), b = group(2)
+        let calls = Calls()
+        let model = makeModel(featured: [a], joined: [b], calls: calls) { _ in [b, a] }
+        await model.loadCandidates()
+        model.toggle(a.id)
+        model.toggle(b.id)
+        model.toggle(a.id)
+
+        await model.save()
+
+        #expect(calls.submitted == [[b.id, a.id]])
+        #expect(calls.handedBack.map { $0.map(\.id) } == [[b.id, a.id]])
+        #expect(model.state == .saved)
+    }
+
+    @Test("Clearing every group saves an empty list")
+    func saveEmpty() async {
+        let a = group(1)
+        let calls = Calls()
+        let model = makeModel(featured: [a], calls: calls)
+        await model.loadCandidates()
+        model.toggle(a.id)
+
+        await model.save()
+
+        #expect(calls.submitted == [[]])
+    }
+
+    @Test("A denied save names the private-group failure and leaves the selection")
+    func deniedSave() async {
+        let a = group(1)
+        let model = makeModel(featured: [], joined: [a]) { _ in throw ErrorSetFeaturedGroups.denied }
+        await model.loadCandidates()
+        model.toggle(a.id)
+
+        await model.save()
+
+        #expect(model.failure == .privateGroup)
+        #expect(model.state == .normal)
+        #expect(model.selection == [a.id])
+    }
+
+    @Test("Any other failure is generic")
+    func otherFailure() async {
+        let a = group(1)
+        let model = makeModel(featured: [], joined: [a]) { _ in throw Boom() }
+        await model.loadCandidates()
+        model.toggle(a.id)
+
+        await model.save()
+
+        #expect(model.failure == .other)
+        #expect(model.state == .normal)
+    }
+
+    @Test("Search filters by title, ignoring case")
+    func search() async {
+        let cats = group(1, title: "Cat People"), dogs = group(2, title: "Dog people")
+        let model = makeModel(featured: [], joined: [cats, dogs])
+        await model.loadCandidates()
+
+        model.query = "cat"
+        #expect(model.visibleCandidates.map(\.id) == [cats.id])
+
+        model.query = "  "
+        #expect(model.visibleCandidates.count == 2)
+    }
+}
diff --git a/FlipcashTests/Navigation/SettingsRoutingTests.swift b/FlipcashTests/Navigation/SettingsRoutingTests.swift
index e16994558..7aaaab98e 100644
--- a/FlipcashTests/Navigation/SettingsRoutingTests.swift
+++ b/FlipcashTests/Navigation/SettingsRoutingTests.swift
@@ -15,6 +15,7 @@ struct SettingsRoutingTests {
         AppRouter.Destination.accountInfo,
         AppRouter.Destination.editProfile,
         AppRouter.Destination.editBio,
+        AppRouter.Destination.editFeaturedGroups,
         AppRouter.Destination.changeCoverPicture,
     ])
     func owningStack(destination: AppRouter.Destination) {

From 6ce9374229b03e667875af1e724c22d352f36507 Mon Sep 17 00:00:00 2001
From: Brandon McAnsh <git@bmcreations.dev>
Date: Tue, 6 Oct 2026 14:47:45 -0400
Subject: [PATCH 40/45] fix(profile): draw favorite public groups as Figma does

The section now sits under a divider with a heading-weight title, and its
rows drop the card and separators for a 48pt rounded-square picture beside
the title and description (node 10961:111). ContactAvatarView takes an
optional corner radius for that; every existing caller stays a circle.

Another person's featured groups now report a failed load instead of
dropping it silently, matching the own-profile path.
---
 .../Profile/EditFeaturedGroupsScreen.swift    |  1 -
 .../Profile/FeaturedGroupsSection.swift       | 39 +++++++++++--------
 .../Screens/Profile/UserProfileScreen.swift   | 15 ++++---
 .../Views/Contacts/ContactAvatarView.swift    | 15 ++++++-
 4 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/Flipcash/Core/Screens/Main/Profile/EditFeaturedGroupsScreen.swift b/Flipcash/Core/Screens/Main/Profile/EditFeaturedGroupsScreen.swift
index 21155a8f2..9d0c4d745 100644
--- a/Flipcash/Core/Screens/Main/Profile/EditFeaturedGroupsScreen.swift
+++ b/Flipcash/Core/Screens/Main/Profile/EditFeaturedGroupsScreen.swift
@@ -82,7 +82,6 @@ struct EditFeaturedGroupsScreen: View {
             FeaturedGroupRow(group: group) {
                 CheckView(active: model.isSelected(group.id))
             }
-            .padding(.vertical, 6)
             .contentShape(Rectangle())
         }
         .buttonStyle(.plain)
diff --git a/Flipcash/Core/Screens/Profile/FeaturedGroupsSection.swift b/Flipcash/Core/Screens/Profile/FeaturedGroupsSection.swift
index 89f2f4546..7dad1bd19 100644
--- a/Flipcash/Core/Screens/Profile/FeaturedGroupsSection.swift
+++ b/Flipcash/Core/Screens/Profile/FeaturedGroupsSection.swift
@@ -27,12 +27,10 @@ struct FeaturedGroupsSection: View {
                     .padding(.bottom, 12)
                     .accessibilityAddTraits(.isHeader)
 
-                VStack(spacing: 0) {
+                VStack(spacing: 2) {
                     ForEach(groups) { group in
                         Button { onTap(group.id) } label: {
                             FeaturedGroupRow(group: group) { EmptyView() }
-                                .padding(.horizontal, 16)
-                                .padding(.vertical, 12)
                                 .contentShape(Rectangle())
                         }
                         .buttonStyle(.plain)
@@ -40,15 +38,8 @@ struct FeaturedGroupsSection: View {
                         .accessibilityLabel(Text(group.featuredRowAccessibilityLabel))
                         .accessibilityAddTraits(.isButton)
                         .accessibilityIdentifier("profile-featured-group")
-
-                        if group.id != groups.last?.id {
-                            Color.rowSeparator
-                                .frame(height: 1)
-                                .padding(.leading, 72)
-                        }
                     }
                 }
-                .background(Color.backgroundRow, in: RoundedRectangle(cornerRadius: Metrics.boxRadius, style: .continuous))
             }
             .padding(.horizontal, ProfileHeaderView<EmptyView, EmptyView, EmptyView>.inset)
             .accessibilityIdentifier("profile-featured-groups")
@@ -68,15 +59,29 @@ struct FeaturedGroupRow<Trailing: View>: View {
     private var subtitle: String { group.featuredRowSubtitle }
 
     var body: some View {
-        RecipientRowBody(
-            avatarID: group.id.description,
-            title: group.groupLinkTitle,
-            subtitle: AttributedString(subtitle),
-            imageData: sessionContainer.profileAvatars.data(for: .chat(group.id)),
-            blurhash: group.picture?.thumbnailBlurhash
-        ) {
+        HStack(spacing: 14) {
+            ContactAvatarView(
+                id: group.id.description,
+                displayName: group.groupLinkTitle,
+                imageData: sessionContainer.profileAvatars.data(for: .chat(group.id)),
+                blurhash: group.picture?.thumbnailBlurhash,
+                size: 48,
+                cornerRadius: 15
+            )
+            VStack(alignment: .leading, spacing: 3) {
+                Text(group.groupLinkTitle)
+                    .font(.appTextMedium)
+                    .foregroundStyle(Color.textMain)
+                    .lineLimit(1)
+                Text(subtitle)
+                    .font(.appTextCaption)
+                    .foregroundStyle(Color.textSecondary)
+                    .lineLimit(1)
+            }
+            Spacer(minLength: 12)
             trailing
         }
+        .frame(minHeight: 66)
         .task(id: group.picture?.thumbnailBlobID) {
             await sessionContainer.profileAvatars.load(.chat(group.id), picture: group.picture)
         }
diff --git a/Flipcash/Core/Screens/Profile/UserProfileScreen.swift b/Flipcash/Core/Screens/Profile/UserProfileScreen.swift
index f5a08bdde..6beaae56a 100644
--- a/Flipcash/Core/Screens/Profile/UserProfileScreen.swift
+++ b/Flipcash/Core/Screens/Profile/UserProfileScreen.swift
@@ -495,13 +495,16 @@ final class UserProfileViewModel {
         await profileAvatars.load(userID: userID, picture: profile.profilePicture)
     }
 
-    /// Reads the groups this person features, once their handle is known. Best effort: a profile
-    /// without the section is still the profile.
+    /// Reads the groups this person features, once their handle is known. A failure leaves the
+    /// section hidden; the rest of the profile stands.
     func loadFeaturedGroups() async {
-        guard let username,
-              let groups = try? await flipClient.getFeaturedGroups(owner: owner, username: username)
-        else { return }
-        featuredGroups = groups
+        guard let username else { return }
+        do {
+            featuredGroups = try await flipClient.getFeaturedGroups(owner: owner, username: username)
+        } catch {
+            guard !Task.isCancelled else { return }
+            ErrorReporting.captureError(error, reason: "Failed to load featured groups")
+        }
     }
 
     private func apply(_ profile: Profile) {
diff --git a/FlipcashUI/Sources/FlipcashUI/Views/Contacts/ContactAvatarView.swift b/FlipcashUI/Sources/FlipcashUI/Views/Contacts/ContactAvatarView.swift
index d91675814..4ab272c6d 100644
--- a/FlipcashUI/Sources/FlipcashUI/Views/Contacts/ContactAvatarView.swift
+++ b/FlipcashUI/Sources/FlipcashUI/Views/Contacts/ContactAvatarView.swift
@@ -21,8 +21,11 @@ public struct ContactAvatarView: View {
     /// The monogram's color. Full-strength by default; a surface whose design mutes the initials
     /// passes a dimmer one.
     public let initialsColor: Color
+    /// Rounds the avatar into a square with this corner radius; `nil` keeps it a circle.
+    public let cornerRadius: CGFloat?
 
-    public init(id: String, displayName: String, imageData: Data? = nil, blurhash: String? = nil, size: CGFloat = 44, initialsColor: Color = .textMain) {
+    public init(id: String, displayName: String, imageData: Data? = nil, blurhash: String? = nil, size: CGFloat = 44, initialsColor: Color = .textMain, cornerRadius: CGFloat? = nil) {
+        self.cornerRadius = cornerRadius
         self.id = id
         self.displayName = displayName
         self.imageData = imageData
@@ -31,6 +34,14 @@ public struct ContactAvatarView: View {
         self.initialsColor = initialsColor
     }
 
+    private var clipShape: AnyShape {
+        if let cornerRadius {
+            AnyShape(RoundedRectangle(cornerRadius: cornerRadius, style: .continuous))
+        } else {
+            AnyShape(Circle())
+        }
+    }
+
     public var body: some View {
         Group {
             if let imageData,
@@ -61,7 +72,7 @@ public struct ContactAvatarView: View {
             }
         }
         .frame(width: size, height: size)
-        .clipShape(Circle())
+        .clipShape(clipShape)
         .accessibilityElement(children: .ignore)
         .accessibilityLabel(Text(displayName.isEmpty ? "Contact" : displayName))
         .accessibilityAddTraits(.isImage)

From e7aadf8402ccc5ae806d65598cec9ad2c9d912b6 Mon Sep 17 00:00:00 2001
From: Brandon McAnsh <git@bmcreations.dev>
Date: Tue, 6 Oct 2026 14:57:23 -0400
Subject: [PATCH 41/45] fix(profile): match the favorite groups picker to Figma

Titles the screen "Favorite Groups", drops the row separators, and adds
the footer line from node 10961:188. The search prompt now reads "Search
your public groups".
---
 .../Main/Profile/EditFeaturedGroupsScreen.swift  | 16 ++++++++++++----
 .../Screens/Profile/FeaturedGroupsSection.swift  |  2 +-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/Flipcash/Core/Screens/Main/Profile/EditFeaturedGroupsScreen.swift b/Flipcash/Core/Screens/Main/Profile/EditFeaturedGroupsScreen.swift
index 9d0c4d745..6b7efaba8 100644
--- a/Flipcash/Core/Screens/Main/Profile/EditFeaturedGroupsScreen.swift
+++ b/Flipcash/Core/Screens/Main/Profile/EditFeaturedGroupsScreen.swift
@@ -34,20 +34,28 @@ struct EditFeaturedGroupsScreen: View {
 
         Background(color: .backgroundMain) {
             List {
-                Section(header: ListHeader("\(model.selection.count) of \(FeaturedGroups.limit) selected")) {
+                Section {
                     ForEach(model.visibleCandidates) { group in
                         row(group)
                     }
+                } header: {
+                    ListHeader("\(model.selection.count) of \(FeaturedGroups.limit) selected")
+                } footer: {
+                    if !model.candidates.isEmpty {
+                        Text("These public groups will appear on your public profile")
+                            .font(.appTextCaption)
+                            .foregroundStyle(Color.textSecondary)
+                    }
                 }
-                .listRowSeparatorTint(Color.rowSeparator)
+                .listRowSeparator(.hidden)
             }
             .listStyle(.grouped)
             .scrollContentBackground(.hidden)
             .overlay { emptyState }
         }
-        .navigationTitle("Favorite Public Groups")
+        .navigationTitle("Favorite Groups")
         .navigationBarTitleDisplayMode(.inline)
-        .searchable(text: $model.query, prompt: "Search Groups")
+        .searchable(text: $model.query, prompt: "Search your public groups")
         .scrollEdgeBar(.bottom) {
             Button(action: save) {
                 ButtonStateLabel("Save", state: buttonState)
diff --git a/Flipcash/Core/Screens/Profile/FeaturedGroupsSection.swift b/Flipcash/Core/Screens/Profile/FeaturedGroupsSection.swift
index 7dad1bd19..9944f6ad2 100644
--- a/Flipcash/Core/Screens/Profile/FeaturedGroupsSection.swift
+++ b/Flipcash/Core/Screens/Profile/FeaturedGroupsSection.swift
@@ -7,7 +7,7 @@ import SwiftUI
 import FlipcashCore
 import FlipcashUI
 
-/// The "Favorite Public Groups" card on a profile, one row per group in the owner's order. Draws
+/// The "Favorite Public Groups" section on a profile, one row per group in the owner's order. Draws
 /// nothing when the list is empty.
 struct FeaturedGroupsSection: View {
 

From fb892687f226ac0d1504d0918ae98c79f56f87db Mon Sep 17 00:00:00 2001
From: Brandon McAnsh <git@bmcreations.dev>
Date: Tue, 6 Oct 2026 15:45:58 -0400
Subject: [PATCH 42/45] fix(profile): tighten the favorite groups list and its
 tokens

Group descriptions use appTextSmall, the subtitle token RecipientRow uses,
instead of the smaller appTextCaption, and wrap to two lines. Rows drop the
66pt minimum height that stacked on the list's own insets.

The picker shows a spinner until the group feed is read, so the list
appears whole instead of growing from the featured groups. Save sits below
the list, as in the other Edit Profile editors, rather than over it.
---
 .../Profile/EditFeaturedGroupsScreen.swift    | 75 ++++++++++++-------
 .../Profile/FeaturedGroupsSection.swift       |  5 +-
 2 files changed, 49 insertions(+), 31 deletions(-)

diff --git a/Flipcash/Core/Screens/Main/Profile/EditFeaturedGroupsScreen.swift b/Flipcash/Core/Screens/Main/Profile/EditFeaturedGroupsScreen.swift
index 6b7efaba8..2c8e18a49 100644
--- a/Flipcash/Core/Screens/Main/Profile/EditFeaturedGroupsScreen.swift
+++ b/Flipcash/Core/Screens/Main/Profile/EditFeaturedGroupsScreen.swift
@@ -33,40 +33,23 @@ struct EditFeaturedGroupsScreen: View {
         @Bindable var model = model
 
         Background(color: .backgroundMain) {
-            List {
-                Section {
-                    ForEach(model.visibleCandidates) { group in
-                        row(group)
-                    }
-                } header: {
-                    ListHeader("\(model.selection.count) of \(FeaturedGroups.limit) selected")
-                } footer: {
-                    if !model.candidates.isEmpty {
-                        Text("These public groups will appear on your public profile")
-                            .font(.appTextCaption)
-                            .foregroundStyle(Color.textSecondary)
-                    }
+            VStack(spacing: 0) {
+                content
+
+                Button(action: save) {
+                    ButtonStateLabel("Save", state: buttonState)
                 }
-                .listRowSeparator(.hidden)
+                .buttonStyle(.filled)
+                .disabled(!model.canSave)
+                .accessibilityIdentifier("edit-featured-groups-save")
+                .padding(.horizontal, 20)
+                .padding(.top, 12)
+                .padding(.bottom, 20)
             }
-            .listStyle(.grouped)
-            .scrollContentBackground(.hidden)
-            .overlay { emptyState }
         }
         .navigationTitle("Favorite Groups")
         .navigationBarTitleDisplayMode(.inline)
         .searchable(text: $model.query, prompt: "Search your public groups")
-        .scrollEdgeBar(.bottom) {
-            Button(action: save) {
-                ButtonStateLabel("Save", state: buttonState)
-            }
-            .buttonStyle(.filled)
-            .disabled(!model.canSave)
-            .accessibilityIdentifier("edit-featured-groups-save")
-            .padding(.horizontal, 20)
-            .padding(.top, 12)
-            .padding(.bottom, 8)
-        }
         .dialog(item: $dialog)
         .task { await model.loadCandidates() }
         .onChange(of: model.failure) { _, failure in
@@ -83,6 +66,42 @@ struct EditFeaturedGroupsScreen: View {
         .onDisappear { saveTask?.cancel() }
     }
 
+    /// The list appears whole once the feed is read, rather than growing from the featured groups.
+    @ViewBuilder
+    private var content: some View {
+        switch model.loadState {
+        case .loading:
+            ProgressView()
+                .tint(Color.textSecondary)
+                .frame(maxWidth: .infinity, maxHeight: .infinity)
+        case .loaded, .failed:
+            list
+        }
+    }
+
+    private var list: some View {
+        List {
+            Section {
+                ForEach(model.visibleCandidates) { group in
+                    row(group)
+                }
+            } header: {
+                ListHeader("\(model.selection.count) of \(FeaturedGroups.limit) selected")
+            } footer: {
+                if !model.candidates.isEmpty {
+                    Text("These public groups will appear on your public profile")
+                        .font(.appTextSmall)
+                        .foregroundStyle(Color.textSecondary)
+                }
+            }
+            .listRowSeparator(.hidden)
+            .listRowInsets(EdgeInsets(top: 8, leading: 20, bottom: 8, trailing: 20))
+        }
+        .listStyle(.grouped)
+        .scrollContentBackground(.hidden)
+        .overlay { emptyState }
+    }
+
     private func row(_ group: Conversation) -> some View {
         Button {
             model.toggle(group.id)
diff --git a/Flipcash/Core/Screens/Profile/FeaturedGroupsSection.swift b/Flipcash/Core/Screens/Profile/FeaturedGroupsSection.swift
index 9944f6ad2..22833bff5 100644
--- a/Flipcash/Core/Screens/Profile/FeaturedGroupsSection.swift
+++ b/Flipcash/Core/Screens/Profile/FeaturedGroupsSection.swift
@@ -74,14 +74,13 @@ struct FeaturedGroupRow<Trailing: View>: View {
                     .foregroundStyle(Color.textMain)
                     .lineLimit(1)
                 Text(subtitle)
-                    .font(.appTextCaption)
+                    .font(.appTextSmall)
                     .foregroundStyle(Color.textSecondary)
-                    .lineLimit(1)
+                    .lineLimit(2)
             }
             Spacer(minLength: 12)
             trailing
         }
-        .frame(minHeight: 66)
         .task(id: group.picture?.thumbnailBlobID) {
             await sessionContainer.profileAvatars.load(.chat(group.id), picture: group.picture)
         }

From 53bdbb0a2495f8f78277f820967db463f88d1cb8 Mon Sep 17 00:00:00 2001
From: Brandon McAnsh <git@bmcreations.dev>
Date: Tue, 6 Oct 2026 16:16:31 -0400
Subject: [PATCH 43/45] fix(profile): keep the group search field in place and
 space out favorite groups

The picker swapped a spinner for the List while loading, which rebuilt the
List and dropped the search field attached to it. The List now stays, with
the spinner drawn over it, and the field is pinned with
navigationBarDrawer(displayMode: .always) so it shows before any scroll.

Profile rows get 16pt between them (was 2pt) and 24pt under the heading
(was 12pt).
---
 .../Profile/EditFeaturedGroupsScreen.swift    | 40 ++++++++++---------
 .../Profile/FeaturedGroupsSection.swift       |  4 +-
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/Flipcash/Core/Screens/Main/Profile/EditFeaturedGroupsScreen.swift b/Flipcash/Core/Screens/Main/Profile/EditFeaturedGroupsScreen.swift
index 2c8e18a49..d29871d87 100644
--- a/Flipcash/Core/Screens/Main/Profile/EditFeaturedGroupsScreen.swift
+++ b/Flipcash/Core/Screens/Main/Profile/EditFeaturedGroupsScreen.swift
@@ -34,7 +34,7 @@ struct EditFeaturedGroupsScreen: View {
 
         Background(color: .backgroundMain) {
             VStack(spacing: 0) {
-                content
+                list
 
                 Button(action: save) {
                     ButtonStateLabel("Save", state: buttonState)
@@ -49,7 +49,11 @@ struct EditFeaturedGroupsScreen: View {
         }
         .navigationTitle("Favorite Groups")
         .navigationBarTitleDisplayMode(.inline)
-        .searchable(text: $model.query, prompt: "Search your public groups")
+        .searchable(
+            text: $model.query,
+            placement: .navigationBarDrawer(displayMode: .always),
+            prompt: "Search your public groups"
+        )
         .dialog(item: $dialog)
         .task { await model.loadCandidates() }
         .onChange(of: model.failure) { _, failure in
@@ -66,29 +70,20 @@ struct EditFeaturedGroupsScreen: View {
         .onDisappear { saveTask?.cancel() }
     }
 
-    /// The list appears whole once the feed is read, rather than growing from the featured groups.
-    @ViewBuilder
-    private var content: some View {
-        switch model.loadState {
-        case .loading:
-            ProgressView()
-                .tint(Color.textSecondary)
-                .frame(maxWidth: .infinity, maxHeight: .infinity)
-        case .loaded, .failed:
-            list
-        }
-    }
-
     private var list: some View {
         List {
             Section {
-                ForEach(model.visibleCandidates) { group in
-                    row(group)
+                // The list appears whole once the feed is read, rather than growing from the
+                // featured groups. The List itself stays so the search field keeps its place.
+                if model.loadState != .loading {
+                    ForEach(model.visibleCandidates) { group in
+                        row(group)
+                    }
                 }
             } header: {
                 ListHeader("\(model.selection.count) of \(FeaturedGroups.limit) selected")
             } footer: {
-                if !model.candidates.isEmpty {
+                if model.loadState != .loading, !model.candidates.isEmpty {
                     Text("These public groups will appear on your public profile")
                         .font(.appTextSmall)
                         .foregroundStyle(Color.textSecondary)
@@ -99,7 +94,14 @@ struct EditFeaturedGroupsScreen: View {
         }
         .listStyle(.grouped)
         .scrollContentBackground(.hidden)
-        .overlay { emptyState }
+        .overlay {
+            if model.loadState == .loading {
+                ProgressView()
+                    .tint(Color.textSecondary)
+            } else {
+                emptyState
+            }
+        }
     }
 
     private func row(_ group: Conversation) -> some View {
diff --git a/Flipcash/Core/Screens/Profile/FeaturedGroupsSection.swift b/Flipcash/Core/Screens/Profile/FeaturedGroupsSection.swift
index 22833bff5..8131e9d89 100644
--- a/Flipcash/Core/Screens/Profile/FeaturedGroupsSection.swift
+++ b/Flipcash/Core/Screens/Profile/FeaturedGroupsSection.swift
@@ -24,10 +24,10 @@ struct FeaturedGroupsSection: View {
                     .font(.appTextLarge)
                     .foregroundStyle(Color.textMain)
                     .padding(.top, 24)
-                    .padding(.bottom, 12)
+                    .padding(.bottom, 24)
                     .accessibilityAddTraits(.isHeader)
 
-                VStack(spacing: 2) {
+                VStack(spacing: 16) {
                     ForEach(groups) { group in
                         Button { onTap(group.id) } label: {
                             FeaturedGroupRow(group: group) { EmptyView() }

From 32b40db85a65fcb8ada11fc4d7d2dda99169e6bd Mon Sep 17 00:00:00 2001
From: Brandon McAnsh <git@bmcreations.dev>
Date: Tue, 6 Oct 2026 16:24:52 -0400
Subject: [PATCH 44/45] fix(profile): blur the group list under a pinned Save
 button

Save is pinned with scrollEdgeBar(.bottom), so rows scroll under it. A new
hardScrollEdge(for:) modifier in FlipcashUI swaps the app-wide soft edge for
the hard one on this list, which blurs the rows out instead of leaving them
readable. The disabled filled style is a 10% tint, so the button gets a
backgroundMain backing in its own shape to stop rows showing through it.
---
 .../Profile/EditFeaturedGroupsScreen.swift    | 27 ++++++++++---------
 .../FlipcashUI/Modifiers/ScrollEdge.swift     | 20 ++++++++++++++
 2 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/Flipcash/Core/Screens/Main/Profile/EditFeaturedGroupsScreen.swift b/Flipcash/Core/Screens/Main/Profile/EditFeaturedGroupsScreen.swift
index d29871d87..dc6f12d81 100644
--- a/Flipcash/Core/Screens/Main/Profile/EditFeaturedGroupsScreen.swift
+++ b/Flipcash/Core/Screens/Main/Profile/EditFeaturedGroupsScreen.swift
@@ -33,19 +33,22 @@ struct EditFeaturedGroupsScreen: View {
         @Bindable var model = model
 
         Background(color: .backgroundMain) {
-            VStack(spacing: 0) {
-                list
-
-                Button(action: save) {
-                    ButtonStateLabel("Save", state: buttonState)
+            list
+                // Rows scroll under Save but are blurred out there, not left readable.
+                .hardScrollEdge(for: .bottom)
+                .scrollEdgeBar(.bottom) {
+                    Button(action: save) {
+                        ButtonStateLabel("Save", state: buttonState)
+                    }
+                    .buttonStyle(.filled)
+                    // The disabled fill is translucent; without this the rows show through it.
+                    .background(Color.backgroundMain, in: RoundedRectangle(cornerRadius: Metrics.buttonRadius))
+                    .disabled(!model.canSave)
+                    .accessibilityIdentifier("edit-featured-groups-save")
+                    .padding(.horizontal, 20)
+                    .padding(.top, 12)
+                    .padding(.bottom, 20)
                 }
-                .buttonStyle(.filled)
-                .disabled(!model.canSave)
-                .accessibilityIdentifier("edit-featured-groups-save")
-                .padding(.horizontal, 20)
-                .padding(.top, 12)
-                .padding(.bottom, 20)
-            }
         }
         .navigationTitle("Favorite Groups")
         .navigationBarTitleDisplayMode(.inline)
diff --git a/FlipcashUI/Sources/FlipcashUI/Modifiers/ScrollEdge.swift b/FlipcashUI/Sources/FlipcashUI/Modifiers/ScrollEdge.swift
index e43fbb126..2bcebfe05 100644
--- a/FlipcashUI/Sources/FlipcashUI/Modifiers/ScrollEdge.swift
+++ b/FlipcashUI/Sources/FlipcashUI/Modifiers/ScrollEdge.swift
@@ -20,6 +20,13 @@ extension View {
         modifier(SoftScrollEdge(edges: edges))
     }
 
+    /// Uses the hard scroll edge effect on iOS 26+, so content under a bar on `edges` is blurred
+    /// out rather than fading and staying legible. Overrides the app-wide soft edge for the
+    /// scrollable views below it. No-op below iOS 26.
+    public func hardScrollEdge(for edges: Edge.Set) -> some View {
+        modifier(HardScrollEdge(edges: edges))
+    }
+
     /// Hides the top scroll edge effect until the scroll view has moved past `offset`, for a screen
     /// whose content starts with a full-bleed image under the bar: at rest the effect would only
     /// darken that image and leave a visible band where it stops. No-op below iOS 26.
@@ -52,6 +59,19 @@ private struct SoftScrollEdge: ViewModifier {
     }
 }
 
+private struct HardScrollEdge: ViewModifier {
+
+    let edges: Edge.Set
+
+    func body(content: Content) -> some View {
+        if #available(iOS 26.0, *) {
+            content.scrollEdgeEffectStyle(.hard, for: edges)
+        } else {
+            content
+        }
+    }
+}
+
 private struct HidesTopScrollEdge: ViewModifier {
 
     let offset: CGFloat

From e824272e301f8f80d2642431eb300219fe49de34 Mon Sep 17 00:00:00 2001
From: Brandon McAnsh <git@bmcreations.dev>
Date: Tue, 6 Oct 2026 16:29:00 -0400
Subject: [PATCH 45/45] fix(profile): drop the hard scroll edge under the group
 picker's Save

The hard edge drew a full-width blurred band with a line across it behind
the button. The picker goes back to the app-wide soft edge, and the
button's own backing keeps rows from showing through it. hardScrollEdge
had no other caller, so it goes too.
---
 .../Profile/EditFeaturedGroupsScreen.swift    |  2 --
 .../FlipcashUI/Modifiers/ScrollEdge.swift     | 20 -------------------
 2 files changed, 22 deletions(-)

diff --git a/Flipcash/Core/Screens/Main/Profile/EditFeaturedGroupsScreen.swift b/Flipcash/Core/Screens/Main/Profile/EditFeaturedGroupsScreen.swift
index dc6f12d81..58ab3b392 100644
--- a/Flipcash/Core/Screens/Main/Profile/EditFeaturedGroupsScreen.swift
+++ b/Flipcash/Core/Screens/Main/Profile/EditFeaturedGroupsScreen.swift
@@ -34,8 +34,6 @@ struct EditFeaturedGroupsScreen: View {
 
         Background(color: .backgroundMain) {
             list
-                // Rows scroll under Save but are blurred out there, not left readable.
-                .hardScrollEdge(for: .bottom)
                 .scrollEdgeBar(.bottom) {
                     Button(action: save) {
                         ButtonStateLabel("Save", state: buttonState)
diff --git a/FlipcashUI/Sources/FlipcashUI/Modifiers/ScrollEdge.swift b/FlipcashUI/Sources/FlipcashUI/Modifiers/ScrollEdge.swift
index 2bcebfe05..e43fbb126 100644
--- a/FlipcashUI/Sources/FlipcashUI/Modifiers/ScrollEdge.swift
+++ b/FlipcashUI/Sources/FlipcashUI/Modifiers/ScrollEdge.swift
@@ -20,13 +20,6 @@ extension View {
         modifier(SoftScrollEdge(edges: edges))
     }
 
-    /// Uses the hard scroll edge effect on iOS 26+, so content under a bar on `edges` is blurred
-    /// out rather than fading and staying legible. Overrides the app-wide soft edge for the
-    /// scrollable views below it. No-op below iOS 26.
-    public func hardScrollEdge(for edges: Edge.Set) -> some View {
-        modifier(HardScrollEdge(edges: edges))
-    }
-
     /// Hides the top scroll edge effect until the scroll view has moved past `offset`, for a screen
     /// whose content starts with a full-bleed image under the bar: at rest the effect would only
     /// darken that image and leave a visible band where it stops. No-op below iOS 26.
@@ -59,19 +52,6 @@ private struct SoftScrollEdge: ViewModifier {
     }
 }
 
-private struct HardScrollEdge: ViewModifier {
-
-    let edges: Edge.Set
-
-    func body(content: Content) -> some View {
-        if #available(iOS 26.0, *) {
-            content.scrollEdgeEffectStyle(.hard, for: edges)
-        } else {
-            content
-        }
-    }
-}
-
 private struct HidesTopScrollEdge: ViewModifier {
 
     let offset: CGFloat