Merge branch 'master' into dc/ios-chat-screen-infinite-scroll

2024-12-17 17:20:21 +01:00 · 2024-10-14 09:34:13 +01:00
parent c6b1413b78 1cb3c25478
commit 095cc286de
134 changed files with 6478 additions and 1083 deletions
@@ -462,7 +462,7 @@ func apiGetNtfToken() -> (DeviceToken?, NtfTknStatus?, NotificationsMode, String
    let r = chatSendCmdSync(.apiGetNtfToken)
    switch r {
    case let .ntfToken(token, status, ntfMode, ntfServer): return (token, status, ntfMode, ntfServer)
-    case .chatCmdError(_, .errorAgent(.CMD(.PROHIBITED))): return (nil, nil, .off, nil)
+    case .chatCmdError(_, .errorAgent(.CMD(.PROHIBITED, _))): return (nil, nil, .off, nil)
    default:
        logger.debug("apiGetNtfToken response: \(String(describing: r))")
        return (nil, nil, .off, nil)
@@ -585,12 +585,18 @@ func apiContactInfo(_ contactId: Int64) async throws -> (ConnectionStats?, Profi
    throw r
 }

-func apiGroupMemberInfo(_ groupId: Int64, _ groupMemberId: Int64) throws -> (GroupMember, ConnectionStats?) {
+func apiGroupMemberInfoSync(_ groupId: Int64, _ groupMemberId: Int64) throws -> (GroupMember, ConnectionStats?) {
    let r = chatSendCmdSync(.apiGroupMemberInfo(groupId: groupId, groupMemberId: groupMemberId))
    if case let .groupMemberInfo(_, _, member, connStats_) = r { return (member, connStats_) }
    throw r
 }

+func apiGroupMemberInfo(_ groupId: Int64, _ groupMemberId: Int64) async throws -> (GroupMember, ConnectionStats?) {
+    let r = await chatSendCmd(.apiGroupMemberInfo(groupId: groupId, groupMemberId: groupMemberId))
+    if case let .groupMemberInfo(_, _, member, connStats_) = r { return (member, connStats_) }
+    throw r
+}
+
 func apiContactQueueInfo(_ contactId: Int64) async throws -> (RcvMsgInfo?, ServerQueueInfo) {
    let r = await chatSendCmd(.apiContactQueueInfo(contactId: contactId))
    if case let .queueInfo(_, rcvMsgInfo, queueInfo) = r { return (rcvMsgInfo, queueInfo) }
@@ -645,8 +651,8 @@ func apiGetContactCode(_ contactId: Int64) async throws -> (Contact, String) {
    throw r
 }

-func apiGetGroupMemberCode(_ groupId: Int64, _ groupMemberId: Int64) throws -> (GroupMember, String) {
-    let r = chatSendCmdSync(.apiGetGroupMemberCode(groupId: groupId, groupMemberId: groupMemberId))
+func apiGetGroupMemberCode(_ groupId: Int64, _ groupMemberId: Int64) async throws -> (GroupMember, String) {
+    let r = await chatSendCmd(.apiGetGroupMemberCode(groupId: groupId, groupMemberId: groupMemberId))
    if case let .groupMemberCode(_, _, member, connectionCode) = r { return (member, connectionCode) }
    throw r
 }
@@ -401,15 +401,13 @@ struct ActiveCallOverlay: View {

    private func endCallButton() -> some View {
        let cc = CallController.shared
-        return callButton("phone.down.fill", padding: 10) {
+        return callButton("phone.down.fill", .red, padding: 10) {
            if let uuid = call.callUUID {
                cc.endCall(callUUID: uuid)
            } else {
                cc.endCall(call: call) {}
            }
        }
-        .background(.red)
-        .clipShape(.circle)
    }

    private func toggleMicButton() -> some View {
@@ -434,12 +432,12 @@ struct ActiveCallOverlay: View {
                audioDevicePickerButton()
            }
        }
-        .onChange(of: call.hasVideo) { hasVideo in
+        .onChange(of: call.localMediaSources.hasVideo) { hasVideo in
            let current = AVAudioSession.sharedInstance().currentRoute.outputs.first?.portType
            let speakerEnabled = current == .builtInSpeaker
            let receiverEnabled = current == .builtInReceiver
-            // react automatically only when speaker or receiver were selected, otherwise keep an external device selected
-            if hasVideo != speakerEnabled && (speakerEnabled || receiverEnabled) {
+            // react automatically only when receiver were selected, otherwise keep an external device selected
+            if !speakerEnabled && hasVideo && receiverEnabled {
                client.setSpeakerEnabledAndConfigureSession(!speakerEnabled, skipExternalDevice: true)
                call.speakerEnabled = !speakerEnabled
            }
@@ -480,9 +478,7 @@ struct ActiveCallOverlay: View {
    }

    @ViewBuilder private func controlButton(_ call: Call, _ imageName: String, padding: CGFloat, _ perform: @escaping () -> Void) -> some View {
-        callButton(imageName, padding: padding, perform)
-            .background(call.peerMediaSources.hasVideo ? Color.black.opacity(0.2) : Color.white.opacity(0.2))
-            .clipShape(.circle)
+        callButton(imageName, call.peerMediaSources.hasVideo ? Color.black.opacity(0.2) : Color.white.opacity(0.2), padding: padding, perform)
    }

    @ViewBuilder private func audioDevicePickerButton() -> some View {
@@ -495,7 +491,7 @@ struct ActiveCallOverlay: View {
            .clipShape(.circle)
    }

-    private func callButton(_ imageName: String, padding: CGFloat, _ perform: @escaping () -> Void) -> some View {
+    private func callButton(_ imageName: String, _ background: Color, padding: CGFloat, _ perform: @escaping () -> Void) -> some View {
        Button {
            perform()
        } label: {
@@ -504,8 +500,10 @@ struct ActiveCallOverlay: View {
                .scaledToFit()
                .padding(padding)
                .frame(width: 60, height: 60)
+                .background(background)
        }
        .foregroundColor(whiteColorWithAlpha)
+        .clipShape(.circle)
    }

    private var whiteColorWithAlpha: Color {
@@ -357,11 +357,9 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
                self.provider.reportCall(with: uuid, updated: update)
            }
        } else if callManager.startOutgoingCall(callUUID: callUUID) {
-            if callManager.startOutgoingCall(callUUID: callUUID) {
-                logger.debug("CallController.startCall: call started")
-            } else {
-                logger.error("CallController.startCall: no active call")
-            }
+            logger.debug("CallController.startCall: call started")
+        } else {
+            logger.error("CallController.startCall: no active call")
        }
    }

@@ -21,16 +21,22 @@ struct CallViewRemote: UIViewRepresentable {
        let remoteCameraRenderer = RTCMTLVideoView(frame: view.frame)
        remoteCameraRenderer.videoContentMode = contentMode
        remoteCameraRenderer.tag = 0
+
+        let screenVideo = call.peerMediaSources.screenVideo
        let remoteScreenRenderer = RTCMTLVideoView(frame: view.frame)
        remoteScreenRenderer.videoContentMode = contentMode
        remoteScreenRenderer.tag = 1
-        remoteScreenRenderer.alpha = call.peerMediaSources.screenVideo ? 1 : 0
+        remoteScreenRenderer.alpha = screenVideo ? 1 : 0

        context.coordinator.cameraRenderer = remoteCameraRenderer
        context.coordinator.screenRenderer = remoteScreenRenderer
        client.addRemoteCameraRenderer(remoteCameraRenderer)
        client.addRemoteScreenRenderer(remoteScreenRenderer)
-        addSubviewAndResize(remoteCameraRenderer, remoteScreenRenderer, into: view)
+        if screenVideo {
+            addSubviewAndResize(remoteScreenRenderer, remoteCameraRenderer, into: view)
+        } else {
+            addSubviewAndResize(remoteCameraRenderer, remoteScreenRenderer, into: view)
+        }

        if AVPictureInPictureController.isPictureInPictureSupported() {
            makeViewWithRTCRenderer(remoteCameraRenderer, remoteScreenRenderer, view, context)
@@ -306,8 +306,7 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
    func setupMuteUnmuteListener(_ transceiver: RTCRtpTransceiver, _ track: RTCMediaStreamTrack) {
        // logger.log("Setting up mute/unmute listener in the call without encryption for mid = \(transceiver.mid)")
        Task {
-            // for some reason even for disabled tracks one packet arrives (seeing this on screenVideo track)
-            var lastPacketsReceived = 1
+            var lastBytesReceived: Int64 = 0
            // muted initially
            var mutedSeconds = 4
            while let call = self.activeCall, transceiver.receiver.track?.readyState == .live {
@@ -315,8 +314,8 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
                let stat = stats.statistics.values.first(where: { stat in stat.type == "inbound-rtp"})
                if let stat {
                    //logger.debug("Stat \(stat.debugDescription)")
-                    let packets = stat.values["packetsReceived"] as! Int
-                    if packets <= lastPacketsReceived {
+                    let bytes = stat.values["bytesReceived"] as! Int64
+                    if bytes <= lastBytesReceived {
                        mutedSeconds += 1
                        if mutedSeconds == 3 {
                            await MainActor.run {
@@ -329,7 +328,7 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
                                self.onMediaMuteUnmute(transceiver.mid, false)
                            }
                        }
-                        lastPacketsReceived = packets
+                        lastBytesReceived = bytes
                        mutedSeconds = 0
                    }
                }
@@ -48,7 +48,7 @@ struct CIRcvDecryptionError: View {
                if case let .group(groupInfo) = chat.chatInfo,
                   case let .groupRcv(groupMember) = chatItem.chatDir {
                    do {
-                        let (member, stats) = try apiGroupMemberInfo(groupInfo.apiId, groupMember.groupMemberId)
+                        let (member, stats) = try apiGroupMemberInfoSync(groupInfo.apiId, groupMember.groupMemberId)
                        if let s = stats {
                            m.updateGroupMemberConnectionStats(groupInfo, member, s)
                        }
@@ -137,6 +137,14 @@ struct ChatView: View {
                }
            }
        }
+        // it should be presented on top level in order to prevent a bug in SwiftUI on iOS 16 related to .focused() modifier in AddGroupMembersView's search field
+        .appSheet(isPresented: $showAddMembersSheet) {
+            Group {
+                if case let .group(groupInfo) = cInfo {
+                    AddGroupMembersView(chat: chat, groupInfo: groupInfo)
+                }
+            }
+        }
        .sheet(isPresented: Binding(
            get: { !forwardedChatItems.isEmpty },
            set: { isPresented in
@@ -304,9 +312,6 @@ struct ChatView: View {
                                        }
                                } else {
                                    addMembersButton()
-                                        .appSheet(isPresented: $showAddMembersSheet) {
-                                            AddGroupMembersView(chat: chat, groupInfo: groupInfo)
-                                        }
                                }
                            }
                            Menu {
@@ -1185,7 +1190,7 @@ struct ChatView: View {
                    allowMenu: $allowMenu
                )
                .environment(\.showTimestamp, itemSeparation.timestamp)
-                .modifier(ChatItemClipped(ci, tailVisible: itemSeparation.largeGap))
+                .modifier(ChatItemClipped(ci, tailVisible: itemSeparation.largeGap && (ci.meta.itemDeleted == nil || revealed)))
                .contextMenu { menu(ci, range, live: composeState.liveMessage != nil) }
                .accessibilityLabel("")
                if ci.content.msgContent != nil && (ci.meta.itemDeleted == nil || revealed) && ci.reactions.count > 0 {
@@ -18,6 +18,7 @@ struct GroupMemberInfoView: View {
    var navigation: Bool = false
    @State private var connectionStats: ConnectionStats? = nil
    @State private var connectionCode: String? = nil
+    @State private var connectionLoaded: Bool = false
    @State private var newRole: GroupMemberRole = .member
    @State private var alert: GroupMemberInfoViewAlert?
    @State private var sheet: PlanAndConnectActionSheet?
@@ -94,129 +95,137 @@ struct GroupMemberInfoView: View {
                    .listRowSeparator(.hidden)
                    .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))

-                if member.memberActive {
-                    Section {
-                        if let code = connectionCode { verifyCodeButton(code) }
-                        if let connStats = connectionStats,
-                            connStats.ratchetSyncAllowed {
-                            synchronizeConnectionButton()
-                        }
-                        // } else if developerTools {
-                        //     synchronizeConnectionButtonForce()
-                        // }
-                    }
-                }
+                if connectionLoaded {

-                if let contactLink = member.contactLink {
-                    Section {
-                        SimpleXLinkQRCode(uri: contactLink)
-                        Button {
-                            showShareSheet(items: [simplexChatLink(contactLink)])
-                        } label: {
-                            Label("Share address", systemImage: "square.and.arrow.up")
+                    if member.memberActive {
+                        Section {
+                            if let code = connectionCode { verifyCodeButton(code) }
+                            if let connStats = connectionStats,
+                               connStats.ratchetSyncAllowed {
+                                synchronizeConnectionButton()
+                            }
+                            // } else if developerTools {
+                            //     synchronizeConnectionButtonForce()
+                            // }
                        }
-                        if let contactId = member.memberContactId {
-                            if knownDirectChat(contactId) == nil && !groupInfo.fullGroupPreferences.directMessages.on(for: groupInfo.membership) {
+                    }
+
+                    if let contactLink = member.contactLink {
+                        Section {
+                            SimpleXLinkQRCode(uri: contactLink)
+                            Button {
+                                showShareSheet(items: [simplexChatLink(contactLink)])
+                            } label: {
+                                Label("Share address", systemImage: "square.and.arrow.up")
+                            }
+                            if let contactId = member.memberContactId {
+                                if knownDirectChat(contactId) == nil && !groupInfo.fullGroupPreferences.directMessages.on(for: groupInfo.membership) {
+                                    connectViaAddressButton(contactLink)
+                                }
+                            } else {
                                connectViaAddressButton(contactLink)
                            }
-                        } else {
-                            connectViaAddressButton(contactLink)
+                        } header: {
+                            Text("Address")
+                                .foregroundColor(theme.colors.secondary)
+                        } footer: {
+                            Text("You can share this address with your contacts to let them connect with **\(member.displayName)**.")
+                                .foregroundColor(theme.colors.secondary)
                        }
-                    } header: {
-                        Text("Address")
-                            .foregroundColor(theme.colors.secondary)
-                    } footer: {
-                        Text("You can share this address with your contacts to let them connect with **\(member.displayName)**.")
-                            .foregroundColor(theme.colors.secondary)
                    }
-                }

-                Section(header: Text("Member").foregroundColor(theme.colors.secondary)) {
-                    infoRow("Group", groupInfo.displayName)
+                    Section(header: Text("Member").foregroundColor(theme.colors.secondary)) {
+                        infoRow("Group", groupInfo.displayName)

-                    if let roles = member.canChangeRoleTo(groupInfo: groupInfo) {
-                        Picker("Change role", selection: $newRole) {
-                            ForEach(roles) { role in
-                                Text(role.text)
+                        if let roles = member.canChangeRoleTo(groupInfo: groupInfo) {
+                            Picker("Change role", selection: $newRole) {
+                                ForEach(roles) { role in
+                                    Text(role.text)
+                                }
                            }
+                            .frame(height: 36)
+                        } else {
+                            infoRow("Role", member.memberRole.text)
                        }
-                        .frame(height: 36)
-                    } else {
-                        infoRow("Role", member.memberRole.text)
                    }
-                }

-                if let connStats = connectionStats {
-                    Section(header: Text("Servers").foregroundColor(theme.colors.secondary)) {
-                        // TODO network connection status
-                        Button("Change receiving address") {
-                            alert = .switchAddressAlert
-                        }
-                        .disabled(
-                            connStats.rcvQueuesInfo.contains { $0.rcvSwitchStatus != nil }
-                            || connStats.ratchetSyncSendProhibited
-                        )
-                        if connStats.rcvQueuesInfo.contains(where: { $0.rcvSwitchStatus != nil }) {
-                            Button("Abort changing address") {
-                                alert = .abortSwitchAddressAlert
+                    if let connStats = connectionStats {
+                        Section(header: Text("Servers").foregroundColor(theme.colors.secondary)) {
+                            // TODO network connection status
+                            Button("Change receiving address") {
+                                alert = .switchAddressAlert
                            }
                            .disabled(
-                                connStats.rcvQueuesInfo.contains { $0.rcvSwitchStatus != nil && !$0.canAbortSwitch }
+                                connStats.rcvQueuesInfo.contains { $0.rcvSwitchStatus != nil }
                                || connStats.ratchetSyncSendProhibited
                            )
+                            if connStats.rcvQueuesInfo.contains(where: { $0.rcvSwitchStatus != nil }) {
+                                Button("Abort changing address") {
+                                    alert = .abortSwitchAddressAlert
+                                }
+                                .disabled(
+                                    connStats.rcvQueuesInfo.contains { $0.rcvSwitchStatus != nil && !$0.canAbortSwitch }
+                                    || connStats.ratchetSyncSendProhibited
+                                )
+                            }
+                            smpServers("Receiving via", connStats.rcvQueuesInfo.map { $0.rcvServer }, theme.colors.secondary)
+                            smpServers("Sending via", connStats.sndQueuesInfo.map { $0.sndServer }, theme.colors.secondary)
                        }
-                        smpServers("Receiving via", connStats.rcvQueuesInfo.map { $0.rcvServer }, theme.colors.secondary)
-                        smpServers("Sending via", connStats.sndQueuesInfo.map { $0.sndServer }, theme.colors.secondary)
                    }
-                }

-                if groupInfo.membership.memberRole >= .admin {
-                    adminDestructiveSection(member)
-                } else {
-                    nonAdminBlockSection(member)
-                }
+                    if groupInfo.membership.memberRole >= .admin {
+                        adminDestructiveSection(member)
+                    } else {
+                        nonAdminBlockSection(member)
+                    }

-                if developerTools {
-                    Section(header: Text("For console").foregroundColor(theme.colors.secondary)) {
-                        infoRow("Local name", member.localDisplayName)
-                        infoRow("Database ID", "\(member.groupMemberId)")
-                        if let conn = member.activeConn {
-                            let connLevelDesc = conn.connLevel == 0 ? NSLocalizedString("direct", comment: "connection level description") : String.localizedStringWithFormat(NSLocalizedString("indirect (%d)", comment: "connection level description"), conn.connLevel)
-                            infoRow("Connection", connLevelDesc)
-                        }
-                        Button ("Debug delivery") {
-                            Task {
-                                do {
-                                    let info = queueInfoText(try await apiGroupMemberQueueInfo(groupInfo.apiId, member.groupMemberId))
-                                    await MainActor.run { alert = .queueInfo(info: info) }
-                                } catch let e {
-                                    logger.error("apiContactQueueInfo error: \(responseError(e))")
-                                    let a = getErrorAlert(e, "Error")
-                                    await MainActor.run { alert = .error(title: a.title, error: a.message) }
+                    if developerTools {
+                        Section(header: Text("For console").foregroundColor(theme.colors.secondary)) {
+                            infoRow("Local name", member.localDisplayName)
+                            infoRow("Database ID", "\(member.groupMemberId)")
+                            if let conn = member.activeConn {
+                                let connLevelDesc = conn.connLevel == 0 ? NSLocalizedString("direct", comment: "connection level description") : String.localizedStringWithFormat(NSLocalizedString("indirect (%d)", comment: "connection level description"), conn.connLevel)
+                                infoRow("Connection", connLevelDesc)
+                            }
+                            Button ("Debug delivery") {
+                                Task {
+                                    do {
+                                        let info = queueInfoText(try await apiGroupMemberQueueInfo(groupInfo.apiId, member.groupMemberId))
+                                        await MainActor.run { alert = .queueInfo(info: info) }
+                                    } catch let e {
+                                        logger.error("apiContactQueueInfo error: \(responseError(e))")
+                                        let a = getErrorAlert(e, "Error")
+                                        await MainActor.run { alert = .error(title: a.title, error: a.message) }
+                                    }
                                }
                            }
                        }
                    }
+
                }
            }
            .navigationBarHidden(true)
-            .onAppear {
+            .task {
                if #unavailable(iOS 16) {
                    // this condition prevents re-setting picker
                    if !justOpened { return }
                }
                justOpened = false
-                DispatchQueue.main.async {
-                    newRole = member.memberRole
-                    do {
-                        let (_, stats) = try apiGroupMemberInfo(groupInfo.apiId, member.groupMemberId)
-                        let (mem, code) = member.memberActive ? try apiGetGroupMemberCode(groupInfo.apiId, member.groupMemberId) : (member, nil)
+                newRole = member.memberRole
+                do {
+                    let (_, stats) = try await apiGroupMemberInfo(groupInfo.apiId, member.groupMemberId)
+                    let (mem, code) = member.memberActive ? try await apiGetGroupMemberCode(groupInfo.apiId, member.groupMemberId) : (member, nil)
+                    await MainActor.run {
                        _ = chatModel.upsertGroupMember(groupInfo, mem)
                        connectionStats = stats
                        connectionCode = code
-                    } catch let error {
-                        logger.error("apiGroupMemberInfo or apiGetGroupMemberCode error: \(responseError(error))")
+                        connectionLoaded = true
                    }
+                } catch let error {
+                    await MainActor.run {
+                        connectionLoaded = true
+                    }
+                    logger.error("apiGroupMemberInfo or apiGetGroupMemberCode error: \(responseError(error))")
                }
            }
            .onChange(of: newRole) { newRole in
@@ -41,7 +41,8 @@ struct SelectedItemsBottomToolbar: View {

    @State var forwardEnabled: Bool = false

-    @State var allButtonsDisabled = false
+    @State var deleteCountProhibited = false
+    @State var forwardCountProhibited = false

    var body: some View {
        VStack(spacing: 0) {
@@ -55,9 +56,9 @@ struct SelectedItemsBottomToolbar: View {
                        .resizable()
                        .scaledToFit()
                        .frame(width: 20, height: 20, alignment: .center)
-                        .foregroundColor(!deleteEnabled || allButtonsDisabled ? theme.colors.secondary: .red)
+                        .foregroundColor(!deleteEnabled || deleteCountProhibited ? theme.colors.secondary: .red)
                }
-                .disabled(!deleteEnabled || allButtonsDisabled)
+                .disabled(!deleteEnabled || deleteCountProhibited)

                Spacer()
                Button {
@@ -67,9 +68,9 @@ struct SelectedItemsBottomToolbar: View {
                        .resizable()
                        .scaledToFit()
                        .frame(width: 20, height: 20, alignment: .center)
-                        .foregroundColor(!moderateEnabled || allButtonsDisabled ? theme.colors.secondary : .red)
+                        .foregroundColor(!moderateEnabled || deleteCountProhibited ? theme.colors.secondary : .red)
                }
-                .disabled(!moderateEnabled || allButtonsDisabled)
+                .disabled(!moderateEnabled || deleteCountProhibited)
                .opacity(canModerate ? 1 : 0)

                Spacer()
@@ -80,9 +81,9 @@ struct SelectedItemsBottomToolbar: View {
                        .resizable()
                        .scaledToFit()
                        .frame(width: 20, height: 20, alignment: .center)
-                        .foregroundColor(!forwardEnabled || allButtonsDisabled ? theme.colors.secondary : theme.colors.primary)
+                        .foregroundColor(!forwardEnabled || forwardCountProhibited ? theme.colors.secondary : theme.colors.primary)
                }
-                .disabled(!forwardEnabled || allButtonsDisabled)
+                .disabled(!forwardEnabled || forwardCountProhibited)
            }
            .frame(maxHeight: .infinity)
            .padding([.leading, .trailing], 12)
@@ -105,7 +106,8 @@ struct SelectedItemsBottomToolbar: View {

    private func recheckItems(_ chatInfo: ChatInfo, _ chatItems: [ChatItem], _ selectedItems: Set<Int64>?) {
        let count = selectedItems?.count ?? 0
-        allButtonsDisabled = count == 0 || count > 20
+        deleteCountProhibited = count == 0 || count > 200
+        forwardCountProhibited = count == 0 || count > 20
        canModerate = possibleToModerate(chatInfo)
        if let selected = selectedItems {
            let me: Bool
@@ -437,7 +437,7 @@ struct SubsStatusIndicator: View {
    private func startTask() {
        task = Task {
            while !Task.isCancelled {
-                if AppChatState.shared.value == .active {
+                if AppChatState.shared.value == .active, ChatModel.shared.chatRunning == true {
                    do {
                        let (subs, hasSess) = try await getAgentSubsTotal()
                        await MainActor.run {
@@ -33,6 +33,7 @@ struct UserPicker: View {
            .sorted(using: KeyPathComparator<UserInfo>(\.user.activeOrder, order: .reverse))
        let sectionWidth = max(frameWidth - sectionHorizontalPadding * 2, 0)
        let currentUserWidth = max(frameWidth - sectionHorizontalPadding - rowPadding * 2 - 14 - imageSize, 0)
+        let stopped = m.chatRunning != true
        VStack(spacing: sectionSpacing) {
            if let user = m.currentUser {
                StickyScrollView(resetScroll: $resetScroll) {
@@ -46,10 +47,14 @@ struct UserPicker: View {
                        .frame(width: otherUsers.isEmpty ? sectionWidth : currentUserWidth, alignment: .leading)
                        .modifier(ListRow { activeSheet = .currentProfile })
                        .clipShape(sectionShape)
+                        .disabled(stopped)
+                        .opacity(stopped ? 0.4 : 1)
                        ForEach(otherUsers) { u in
                            userView(u, size: imageSize)
                                .frame(maxWidth: sectionWidth * 0.618)
                                .fixedSize()
+                                .disabled(stopped)
+                                .opacity(stopped ? 0.4 : 1)
                        }
                    }
                    .padding(.horizontal, sectionHorizontalPadding)
@@ -60,10 +65,10 @@ struct UserPicker: View {
                .onPreferenceChange(DetermineWidth.Key.self) { frameWidth = $0 }
            }
            VStack(spacing: 0) {
-                openSheetOnTap("qrcode", title: m.userAddress == nil ? "Create SimpleX address" : "Your SimpleX address", sheet: .address)
-                openSheetOnTap("switch.2", title: "Chat preferences", sheet: .chatPreferences)
-                openSheetOnTap("person.crop.rectangle.stack", title: "Your chat profiles", sheet: .chatProfiles)
-                openSheetOnTap("desktopcomputer", title: "Use from desktop", sheet: .useFromDesktop)
+                openSheetOnTap("qrcode", title: m.userAddress == nil ? "Create SimpleX address" : "Your SimpleX address", sheet: .address, disabled: stopped)
+                openSheetOnTap("switch.2", title: "Chat preferences", sheet: .chatPreferences, disabled: stopped)
+                openSheetOnTap("person.crop.rectangle.stack", title: "Your chat profiles", sheet: .chatProfiles, disabled: stopped)
+                openSheetOnTap("desktopcomputer", title: "Use from desktop", sheet: .useFromDesktop, disabled: stopped)
                ZStack(alignment: .trailing) {
                    openSheetOnTap("gearshape", title: "Settings", sheet: .settings, showDivider: false)
                    Image(systemName: colorScheme == .light ? "sun.max" : "moon.fill")
@@ -149,15 +154,16 @@ struct UserPicker: View {
        .clipShape(sectionShape)
    }

-    private func openSheetOnTap(_ icon: String, title: LocalizedStringKey, sheet: UserPickerSheet, showDivider: Bool = true) -> some View {
+    private func openSheetOnTap(_ icon: String, title: LocalizedStringKey, sheet: UserPickerSheet, showDivider: Bool = true, disabled: Bool = false) -> some View {
        ZStack(alignment: .bottom) {
            settingsRow(icon, color: theme.colors.secondary) {
-                Text(title).foregroundColor(.primary)
+                Text(title).foregroundColor(.primary).opacity(disabled ? 0.4 : 1)
            }
            .frame(maxWidth: .infinity, alignment: .leading)
            .padding(.horizontal, rowPadding)
            .padding(.vertical, rowVerticalPadding)
            .modifier(ListRow { activeSheet = sheet })
+            .disabled(disabled)
            if showDivider {
                Divider().padding(.leading, 52)
            }
@@ -36,12 +36,7 @@ struct ChatItemClipped: ViewModifier {
                    .sndMsgContent,
                    .rcvMsgContent,
                    .rcvDecryptionError,
-                    .sndDeleted,
-                    .rcvDeleted,
                    .rcvIntegrityError,
-                    .sndModerated,
-                    .rcvModerated,
-                    .rcvBlocked,
                    .invalidJSON:
                let tail = if let mc = ci.content.msgContent, mc.isImageOrVideo && mc.text.isEmpty {
                    false
@@ -14,7 +14,8 @@ enum ContactType: Int {
 }

 struct NewChatMenuButton: View {
-    @EnvironmentObject var chatModel: ChatModel
+    // do not use chatModel here because it prevents showing AddGroupMembersView after group creation and QR code after link creation on iOS 16
+//    @EnvironmentObject var chatModel: ChatModel
    @State private var showNewChatSheet = false
    @State private var alert: SomeAlert? = nil
    @State private var pendingConnection: PendingContactConnection? = nil
@@ -32,7 +33,7 @@ struct NewChatMenuButton: View {
            NewChatSheet(pendingConnection: $pendingConnection)
                .environment(\EnvironmentValues.refresh as! WritableKeyPath<EnvironmentValues, RefreshAction?>, nil)
                .onDisappear {
-                    alert = cleanupPendingConnection(chatModel: chatModel, contactConnection: pendingConnection)
+                    alert = cleanupPendingConnection(contactConnection: pendingConnection)
                    pendingConnection = nil
                }
        }
@@ -45,10 +45,10 @@ enum NewChatOption: Identifiable {
    var id: Self { self }
 }

-func cleanupPendingConnection(chatModel: ChatModel, contactConnection: PendingContactConnection?) -> SomeAlert? {
+func cleanupPendingConnection(contactConnection: PendingContactConnection?) -> SomeAlert? {
    var alert: SomeAlert? = nil

-    if !(chatModel.showingInvitation?.connChatUsed ?? true),
+    if !(ChatModel.shared.showingInvitation?.connChatUsed ?? true),
       let conn = contactConnection {
        alert = SomeAlert(
            alert: Alert(
@@ -68,7 +68,7 @@ func cleanupPendingConnection(chatModel: ChatModel, contactConnection: PendingCo
        )
    }
    
-    chatModel.showingInvitation = nil
+    ChatModel.shared.showingInvitation = nil

    return alert
 }
@@ -97,6 +97,11 @@ struct NewChatView: View {
            }
            .pickerStyle(.segmented)
            .padding()
+            .onChange(of: $selection.wrappedValue) { opt in
+                if opt == NewChatOption.connect {
+                    showQRCodeScanner = true
+                }
+            }

            VStack {
                // it seems there's a bug in iOS 15 if several views in switch (or if-else) statement have different transitions
@@ -152,7 +157,7 @@ struct NewChatView: View {
        }
        .onDisappear {
            if !choosingProfile {
-                parentAlert = cleanupPendingConnection(chatModel: m, contactConnection: contactConnection)
+                parentAlert = cleanupPendingConnection(contactConnection: contactConnection)
                contactConnection = nil
            }
        }
@@ -467,6 +467,39 @@ private let versionDescriptions: [VersionDescription] = [
            )
        ]
    ),
+    VersionDescription(
+        version: "v6.1",
+        post: URL(string: "https://simplex.chat/blog/20241014-simplex-network-v6-1-security-review-better-calls-user-experience.html"),
+        features: [
+            FeatureDescription(
+                icon: "checkmark.shield",
+                title: "Better security ✅",
+                description: "SimpleX protocols reviewed by Trail of Bits."
+            ),
+            FeatureDescription(
+                icon: "video",
+                title: "Better calls",
+                description: "Switch audio and video during the call."
+            ),
+            FeatureDescription(
+                icon: "bolt",
+                title: "Better notifications",
+                description: "Improved delivery, reduced traffic usage.\nMore improvements are coming soon!"
+            ),
+            FeatureDescription(
+                icon: nil,
+                title: "Better user experience",
+                description: nil,
+                subfeatures: [
+                    ("link", "Switch chat profile for 1-time invitations."),
+                    ("message", "Customizable message shape."),
+                    ("calendar", "Better message dates."),
+                    ("arrowshape.turn.up.right", "Forward up to 20 messages at once."),
+                    ("flag", "Delete or moderate up to 200 messages.")
+                ]
+            ),
+        ]
+    ),
 ]

 private let lastVersion = versionDescriptions.last!.version
@@ -196,11 +196,14 @@ struct AdvancedNetworkSettings: View {
                if developerTools {
                    Section {
                        Picker("Transport isolation", selection: $netCfg.sessionMode) {
-                            ForEach(TransportSessionMode.values, id: \.self) { Text($0.text) }
+                            let modes = TransportSessionMode.values.contains(netCfg.sessionMode)
+                                ? TransportSessionMode.values
+                                : TransportSessionMode.values + [netCfg.sessionMode]
+                            ForEach(modes, id: \.self) { Text($0.text) }
                        }
                        .frame(height: 36)
                    } footer: {
-                        Text(sessionModeInfo(netCfg.sessionMode))
+                        sessionModeInfo(netCfg.sessionMode)
                            .foregroundColor(theme.colors.secondary)
                    }
                }
@@ -353,10 +356,13 @@ struct AdvancedNetworkSettings: View {
        }
    }

-    private func sessionModeInfo(_ mode: TransportSessionMode) -> LocalizedStringKey {
-        switch mode {
-        case .user: return "A separate TCP connection will be used **for each chat profile you have in the app**."
-        case .entity: return "A separate TCP connection will be used **for each contact and group member**.\n**Please note**: if you have many connections, your battery and traffic consumption can be substantially higher and some connections may fail."
+    private func sessionModeInfo(_ mode: TransportSessionMode) -> Text {
+        let userMode = Text("A separate TCP connection will be used **for each chat profile you have in the app**.")
+        return switch mode {
+        case .user: userMode
+        case .session: userMode + Text("\n") + Text("New SOCKS credentials will be used every time you start the app.")
+        case .server: userMode + Text("\n") + Text("New SOCKS credentials will be used for each server.")
+        case .entity: Text("A separate TCP connection will be used **for each contact and group member**.\n**Please note**: if you have many connections, your battery and traffic consumption can be substantially higher and some connections may fail.")
        }
    }