Merge branch 'dev' into jarod/context-menu-reactions-bar

Author: yewreeka

.gitignore

@@ -129,4 +129,4 @@ qa/cxdb/qa.sqlite
 qa/cxdb/qa.sqlite-wal
 qa/cxdb/qa.sqlite-shm
 .DS_Store
-docs/plans/.mote-preview.html
+.mote-preview.html

Convos.xcodeproj/project.pbxproj

@@ -160,13 +160,6 @@ struct AppSettingsView: View {
                     }
                     .foregroundStyle(.colorTextPrimary)
 
-                    NavigationLink {
-                        PendingInviteDebugView(session: session)
-                    } label: {
-                        Text("Pending Invites")
-                    }
-                    .foregroundStyle(.colorTextPrimary)
-
                     if !ConfigManager.shared.currentEnvironment.isProduction {
                         NavigationLink {
                             DebugExportView(environment: ConfigManager.shared.currentEnvironment, session: session)

Convos/App Settings/AppSettingsView.swift

@@ -0,0 +1,24 @@
+import Foundation
+
+@MainActor @Observable
+final class FeatureFlags {
+    static let shared: FeatureFlags = FeatureFlags()
+
+    var isAssistantEnabled: Bool {
+        get {
+            guard !isProductionEnvironment else { return false }
+            return UserDefaults.standard.bool(forKey: Constant.assistantEnabledKey)
+        }
+        set {
+            UserDefaults.standard.set(newValue, forKey: Constant.assistantEnabledKey)
+        }
+    }
+
+    private var isProductionEnvironment: Bool {
+        ConfigManager.shared.currentEnvironment.isProduction
+    }
+
+    private enum Constant {
+        static let assistantEnabledKey: String = "featureFlags.assistantEnabled"
+    }
+}

Convos/Config/FeatureFlags.swift

@@ -5,7 +5,6 @@ struct NewConversationView: View {
     let viewModel: NewConversationViewModel
     @Bindable var quicknameViewModel: QuicknameSettingsViewModel
     @State private var hasShownScannerOnAppear: Bool = false
-    @State private var presentingJoiningStateInfo: Bool = false
     @State private var sidebarWidth: CGFloat = 0.0
     @State private var focusCoordinator: FocusCoordinator = FocusCoordinator(horizontalSizeClass: nil)
 
@@ -51,21 +50,10 @@ struct NewConversationView: View {
                 .toolbar {
                     if !viewModel.showingFullScreenScanner {
                         ToolbarItem(placement: .topBarLeading) {
-                            let closeAction = {
-                                if viewModel.conversationViewModel?.onboardingCoordinator.isWaitingForInviteAcceptance == true {
-                                    presentingJoiningStateInfo = true
-                                } else {
-                                    dismiss()
-                                }
+                            Button(role: .close) {
+                                dismiss()
                             }
-                            Button(role: .close, action: closeAction)
-                                .confirmationDialog("This convo will appear on your home screen after someone approves you",
-                                                    isPresented: $presentingJoiningStateInfo,
-                                                    titleVisibility: .visible) {
-                                    Button("Continue") {
-                                        dismiss()
-                                    }
-                                }
+                            .accessibilityIdentifier("close-new-conversation")
                         }
                     }
                 }

Convos/Conversation Creation/NewConversationView.swift

@@ -7,7 +7,30 @@ struct AddToConversationMenu: View {
     let onConvoCode: () -> Void
     var onMenuOpen: (() -> Void)?
 
+    private var isAssistantEnabled: Bool { FeatureFlags.shared.isAssistantEnabled }
+
+    private var labelColor: Color {
+        if !isEnabled {
+            return .colorTextSecondary.opacity(0.4)
+        }
+        return isFull ? .colorTextSecondary : .colorTextPrimary
+    }
+
     var body: some View {
+        if isAssistantEnabled {
+            menuView
+        } else {
+            Button(action: onConvoCode) {
+                Image(systemName: "plus")
+                    .foregroundStyle(labelColor)
+            }
+            .disabled(!isEnabled)
+            .accessibilityLabel("Add to conversation")
+            .accessibilityIdentifier("add-to-conversation-button")
+        }
+    }
+
+    private var menuView: some View {
         Menu {
             Section {
                 EmptyView()
@@ -47,7 +70,7 @@ struct AddToConversationMenu: View {
             }
         } label: {
             Image(systemName: "plus")
-                .foregroundStyle(isFull ? .colorTextSecondary : .colorTextPrimary)
+                .foregroundStyle(labelColor)
         }
         .disabled(!isEnabled)
         .accessibilityLabel("Add to conversation")

Convos/Conversation Detail/AddToConversationMenu.swift

@@ -3,20 +3,24 @@ import SwiftUI
 struct InviteAcceptedView: View {
     @State private var showingDescription: Bool = false
 
+    @Environment(\.openURL) private var openURL: OpenURLAction
+
     var body: some View {
-        Group {
+        Button {
+            openURL(Constant.learnMoreURL)
+        } label: {
             VStack(spacing: DesignConstants.Spacing.step2x) {
                 HStack {
-                    Image(systemName: "checkmark.circle.fill")
+                    Image(systemName: "qrcode")
                         .font(.footnote)
-                        .foregroundStyle(.colorGreen)
-                    Text("Invite accepted")
+                        .foregroundStyle(.colorLava)
+                    Text("Verifying")
                         .foregroundStyle(.colorTextPrimary)
                 }
                 .font(.body)
 
                 if showingDescription {
-                    Text("See and send messages after someone approves you.")
+                    Text("See and send messages after your access is verified")
                         .font(.caption)
                         .foregroundStyle(.colorTextSecondary)
                         .multilineTextAlignment(.center)
@@ -25,12 +29,14 @@ struct InviteAcceptedView: View {
             .transition(.blurReplace)
             .animation(.spring(duration: 0.4, bounce: 0.2), value: showingDescription)
             .padding(DesignConstants.Spacing.step6x)
+            .frame(maxWidth: .infinity)
+            .background(.colorFillMinimal)
+            .clipShape(RoundedRectangle(cornerRadius: DesignConstants.CornerRadius.mediumLarge))
         }
-        .frame(maxWidth: .infinity)
-        .background(.colorFillMinimal)
-        .clipShape(RoundedRectangle(cornerRadius: DesignConstants.CornerRadius.mediumLarge))
+        .buttonStyle(.plain)
         .accessibilityElement(children: .combine)
-        .accessibilityLabel("Invite accepted. See and send messages after someone approves you.")
+        .accessibilityIdentifier("invite-accepted-view")
+        .accessibilityLabel("Verifying. See and send messages after your access is verified.")
         .onAppear {
             DispatchQueue.main
                 .asyncAfter(deadline: .now() + ConversationOnboardingState.waitingForInviteAcceptanceDelay) {
@@ -40,6 +46,11 @@ struct InviteAcceptedView: View {
             }
         }
     }
+
+    private enum Constant {
+        // swiftlint:disable:next force_unwrapping
+        static let learnMoreURL: URL = URL(string: "https://learn.convos.org/verifying")!
+    }
 }
 
 #Preview {

Convos/Conversation Detail/Conversation Detail Drawer/InviteAcceptedView.swift

@@ -454,13 +454,6 @@ struct ConversationInfoView: View {
                                 }
                             }
                         )
-                        .fullScreenCover(isPresented: $presentingShareView) {
-                            ConversationShareView(conversation: viewModel.conversation, invite: viewModel.invite)
-                                .presentationBackground(.clear)
-                        }
-                        .transaction { transaction in
-                            transaction.disablesAnimations = true
-                        }
                         .accessibilityIdentifier("info-add-button")
                     }
                 }
@@ -483,6 +476,16 @@ struct ConversationInfoView: View {
                     showingFullInfo = false
                 })
             }
+            .overlay {
+                if presentingShareView {
+                    ConversationShareOverlay(
+                        conversation: viewModel.conversation,
+                        invite: viewModel.invite,
+                        isPresented: $presentingShareView,
+                        topSafeAreaInset: 0
+                    )
+                }
+            }
             .background {
                 Color.clear
                     .fullScreenCover(isPresented: $showingExplodeSheet) {

Convos/Conversation Detail/ConversationInfoView.swift

@@ -544,6 +544,7 @@ final class ConversationOnboardingCoordinator {
     }
 
     private func shouldShowAssistantHint() -> Bool {
+        guard FeatureFlags.shared.isAssistantEnabled else { return false }
         guard isConversationCreator, let clientId = currentClientId else { return false }
         return !hasDismissedAssistantHint(for: clientId)
     }