Merge branch 'stable' into stable-android

2024-12-17 17:20:21 +01:00 · 2024-12-13 09:37:44 +00:00 · 2024-12-08 09:30:39 +00:00 · 2024-10-18 19:20:22 +01:00 · 2024-10-12 12:33:16 +01:00 · 2024-10-09 08:28:29 +01:00
35 changed files with 576 additions and 2084 deletions
@@ -102,7 +102,7 @@ jobs:
        uses: actions/checkout@v3

      - name: Setup Haskell
-        uses: haskell-actions/setup@v2
+        uses: haskell/actions/setup@v2
        with:
          ghc-version: ${{ matrix.ghc }}
          cabal-version: "3.10.1.0"
@@ -230,7 +230,7 @@ jobs:
          APPLE_SIMPLEX_NOTARIZATION_APPLE_ID: ${{ secrets.APPLE_SIMPLEX_NOTARIZATION_APPLE_ID }}
          APPLE_SIMPLEX_NOTARIZATION_PASSWORD: ${{ secrets.APPLE_SIMPLEX_NOTARIZATION_PASSWORD }}
        run: |
-          scripts/ci/build-desktop-mac.sh
+          scripts/build-desktop-mac.sh
          path=$(echo $PWD/apps/multiplatform/release/main/dmg/SimpleX-*.dmg)
          echo "package_path=$path" >> $GITHUB_OUTPUT
          echo "package_hash=$(echo SHA2-512\(${{ matrix.desktop_asset_name }}\)= $(openssl sha512 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT
@@ -310,7 +310,9 @@ jobs:
      # Unix /

      # / Windows
-      # rm -rf dist-newstyle/src/direct-sq* is here because of the bug in cabal's dependency which prevents second build from finishing
+
+      # * In powershell multiline commands do not fail if individual commands fail - https://github.community/t/multiline-commands-on-windows-do-not-fail-if-individual-commands-fail/16753
+      # * And GitHub Actions does not support parameterizing shell in a matrix job - https://github.community/t/using-matrix-to-specify-shell-is-it-possible/17065

      - name: 'Setup MSYS2'
        if: matrix.os == 'windows-latest'
@@ -100,13 +100,6 @@ class ItemsModel: ObservableObject {
    }
 }

-class ChatTagsModel: ObservableObject {
-    static let shared = ChatTagsModel()
-    
-    @Published var userTags: [ChatTag] = []
-    @Published var activeFilter: ActiveFilter? = nil
-}
-
 class NetworkModel: ObservableObject {
    // map of connections network statuses, key is agent connection id
    @Published var networkStatuses: Dictionary<String, NetworkStatus> = [:]
@@ -313,13 +313,6 @@ func apiGetChatsAsync() async throws -> [ChatData] {
    return try apiChatsResponse(await chatSendCmd(.apiGetChats(userId: userId)))
 }

-func apiGetChatTags() async throws -> [ChatTag] {
-    let userId = try currentUserId("apiGetChatTags")
-    let r = await chatSendCmd(.apiGetChatTags(userId: userId))
-    if case let .chatTags(_, chatTags) = r { return chatTags }
-    throw r
-}
-
 private func apiChatsResponse(_ r: ChatResponse) throws -> [ChatData] {
    if case let .apiChats(_, chats) = r { return chats }
    throw r
@@ -375,30 +368,6 @@ func apiForwardChatItems(toChatType: ChatType, toChatId: Int64, fromChatType: Ch
    return await processSendMessageCmd(toChatType: toChatType, cmd: cmd)
 }

-func apiCreateChatTag(type: ChatType, id: Int64, tag: ChatTagData) async throws -> ([ChatTag], [Int64]) {
-    let r = await chatSendCmd(.apiCreateChatTag(type: type, id: id, tag: tag))
-    if case let .tagsUpdated(_, userTags, chatTags) = r {
-        return (userTags, chatTags)
-    }
-    throw r
-}
-
-func apiTagChat(type: ChatType, id: Int64, tagId: Int64) async throws -> ([ChatTag], [Int64]) {
-    let r = await chatSendCmd(.apiTagChat(type: type, id: id, tagId: tagId))
-    if case let .tagsUpdated(_, userTags, chatTags) = r {
-        return (userTags, chatTags)
-    }
-    throw r
-}
-
-func apiUntagChat(type: ChatType, id: Int64, tagId: Int64) async throws -> ([ChatTag], [Int64]) {
-    let r = await chatSendCmd(.apiUntagChat(type: type, id: id, tagId: tagId))
-    if case let .chatUntagged(_, userTags, chatTags) = r {
-        return (userTags, chatTags)
-    }
-    throw r
-}
-
 func apiSendMessages(type: ChatType, id: Int64, live: Bool = false, ttl: Int? = nil, composedMessages: [ComposedMessage]) async -> [ChatItem]? {
    let cmd: ChatCommand = .apiSendMessages(type: type, id: id, live: live, ttl: ttl, composedMessages: composedMessages)
    return await processSendMessageCmd(toChatType: type, cmd: cmd)
@@ -332,7 +332,7 @@ struct ChatInfoView: View {
        .sheet(item: $sheet) { 
            if #available(iOS 16.0, *) {
                $0.content
-                    .presentationDetents([.fraction($0.fraction)])
+                    .presentationDetents([.fraction(0.4)])
            } else {
                $0.content
            }
@@ -8,7 +8,6 @@

 import SwiftUI
 import SimpleXChat
-import ElegantEmojiPicker

 typealias DynamicSizes = (
    rowHeight: CGFloat,
@@ -44,11 +43,9 @@ func dynamicSize(_ font: DynamicTypeSize) -> DynamicSizes {
 struct ChatListNavLink: View {
    @EnvironmentObject var chatModel: ChatModel
    @EnvironmentObject var theme: AppTheme
-    @EnvironmentObject var chatTagsModel: ChatTagsModel
    @Environment(\.dynamicTypeSize) private var userFont: DynamicTypeSize
    @AppStorage(GROUP_DEFAULT_ONE_HAND_UI, store: groupDefaults) private var oneHandUI = false
    @ObservedObject var chat: Chat
-    @Binding var parentSheet: SomeSheet<AnyView>?
    @State private var showContactRequestDialog = false
    @State private var showJoinGroupDialog = false
    @State private var showContactConnectionInfo = false
@@ -88,7 +85,6 @@ struct ChatListNavLink: View {
                progressByTimeout = false
            }
        }
-        .actionSheet(item: $actionSheet) { $0.actionSheet }
    }
    
    @ViewBuilder private func contactNavLink(_ contact: Contact) -> some View {
@@ -128,7 +124,6 @@ struct ChatListNavLink: View {
                    toggleNtfsButton(chat: chat)
                }
                .swipeActions(edge: .trailing, allowsFullSwipe: true) {
-                    tagChatButton(chat)
                    if !chat.chatItems.isEmpty {
                        clearChatButton()
                    }
@@ -150,10 +145,11 @@ struct ChatListNavLink: View {
            }
        }
        .alert(item: $alert) { $0.alert }
+        .actionSheet(item: $actionSheet) { $0.actionSheet }
        .sheet(item: $sheet) {
            if #available(iOS 16.0, *) {
                $0.content
-                    .presentationDetents([.fraction($0.fraction)])
+                    .presentationDetents([.fraction(0.4)])
            } else {
                $0.content
            }
@@ -189,7 +185,6 @@ struct ChatListNavLink: View {
                    AlertManager.shared.showAlert(groupInvitationAcceptedAlert())
                }
                .swipeActions(edge: .trailing) {
-                    tagChatButton(chat)
                    if (groupInfo.membership.memberCurrent) {
                        leaveGroupChatButton(groupInfo)
                    }
@@ -211,25 +206,14 @@ struct ChatListNavLink: View {
                toggleNtfsButton(chat: chat)
            }
            .swipeActions(edge: .trailing, allowsFullSwipe: true) {
-                tagChatButton(chat)
-                let showClearButton = !chat.chatItems.isEmpty
-                let showDeleteGroup = groupInfo.canDelete
-                let showLeaveGroup = groupInfo.membership.memberCurrent
-                let totalNumberOfButtons = 1 + (showClearButton ? 1 : 0) + (showDeleteGroup ? 1 : 0) + (showLeaveGroup ? 1 : 0)
-
-                if showClearButton, totalNumberOfButtons <= 3 {
+                if !chat.chatItems.isEmpty {
                    clearChatButton()
                }
-                if (showLeaveGroup) {
+                if (groupInfo.membership.memberCurrent) {
                    leaveGroupChatButton(groupInfo)
                }
-                
-                if showDeleteGroup {
-                    if totalNumberOfButtons <= 3 {
-                        deleteGroupChatButton(groupInfo)
-                    } else {
-                        moreOptionsButton(chat, groupInfo)
-                    }
+                if groupInfo.canDelete {
+                    deleteGroupChatButton(groupInfo)
                }
            }
        }
@@ -322,73 +306,7 @@ struct ChatListNavLink: View {
        }
        .tint(Color.orange)
    }
-    
-    private func tagChatButton(_ chat: Chat) -> some View {
-        Button {
-            setTagChatSheet(chat)
-        } label: {
-            SwipeLabel(NSLocalizedString("List", comment: "swipe action"), systemImage: "tag.fill", inverted: oneHandUI)
-        }
-        .tint(.mint)
-    }
-    
-    private func setTagChatSheet(_ chat: Chat) {
-        let fraction: Double

-        switch chatTagsModel.userTags.count {
-        case 0..<4:
-            fraction = 0.35
-        case 4..<9:
-            fraction = 0.7
-        default:
-            fraction = 1
-        }
-        
-        parentSheet = SomeSheet(
-            content: {
-                AnyView(
-                    NavigationView {
-                        if chatTagsModel.userTags.isEmpty {
-                            ChatListTagEditor(chat: chat)
-                        } else {
-                            ChatListTag(chat: chat)
-                        }
-                    }
-                )
-            },
-            id: "lists sheet",
-            fraction: fraction
-        )
-    }
-    
-    private func moreOptionsButton(_ chat: Chat, _ groupInfo: GroupInfo?) -> some View {
-        Button {
-            var buttons: [Alert.Button] = [
-                .default(Text("Clear")) {
-                    AlertManager.shared.showAlert(clearChatAlert())
-                }
-            ]
-            
-            if let gi = groupInfo, gi.canDelete {
-                buttons.append(.destructive(Text("Delete")) {
-                    AlertManager.shared.showAlert(deleteGroupAlert(gi))
-                })
-            }
-            
-            buttons.append(.cancel())
-                               
-            actionSheet = SomeActionSheet(
-                actionSheet: ActionSheet(
-                    title: Text("Clear or delete group?"),
-                    buttons: buttons
-                ),
-                id: "other options"
-            )
-        } label: {
-            SwipeLabel(NSLocalizedString("More", comment: "swipe action"), systemImage: "ellipsis", inverted: oneHandUI)
-        }
-    }
-    
    private func clearNoteFolderButton() -> some View {
        Button {
            AlertManager.shared.showAlert(clearNoteFolderAlert())
@@ -566,389 +484,6 @@ struct ChatListNavLink: View {
    }
 }

-struct TagEditorNavParams {
-    let chat: Chat?
-    let chatListTag: ChatTagData?
-    let tagId: Int64?
-}
-
-struct ChatListTag: View {
-    var chat: Chat? = nil
-    var editMode: Bool = false
-    @Environment(\.dismiss) var dismiss: DismissAction
-    @EnvironmentObject var theme: AppTheme
-    @EnvironmentObject var chatTagsModel: ChatTagsModel
-    @EnvironmentObject var m: ChatModel
-    @State private var tagEditorNavParams: TagEditorNavParams? = nil
-    
-    var chatTagsIds: [Int64] { chat?.chatInfo.contact?.chatTags ?? chat?.chatInfo.groupInfo?.chatTags ?? [] }
-    
-    var body: some View {
-        let v = List {
-            Section {
-                ForEach(chatTagsModel.userTags, id: \.id) { tag in
-                    let text = tag.chatTagText
-                    let emoji = tag.chatTagEmoji
-                    let tagId = tag.chatTagId
-                    let selected = chatTagsIds.contains(tagId)
-                    
-                    HStack {
-                        if let emoji {
-                            Text(emoji)
-                        } else {
-                            Image(systemName: "tag")
-                        }
-                        Text(text)
-                            .padding(.leading, 12)
-                        Spacer()
-                        if chat != nil {
-                            radioButton(selected: selected)
-                        }
-                    }
-                    .onTapGesture {
-                        if let c = chat {
-                            if selected {
-                                untagChat(tagId: tagId, chat: c)
-                            } else {
-                                // TODO: Temporary until API is final.
-                                chatTagsIds.forEach { t in
-                                    untagChat(tagId: t, chat: c)
-                                }
-                                tagChat(tagId: tagId, chat: c)
-                            }
-                        }
-                    }
-                    .swipeActions(edge: .trailing, allowsFullSwipe: true) {
-                        Button {
-                            showAlert(
-                                NSLocalizedString("Delete list?", comment: "alert title"),
-                                message: NSLocalizedString("\(text) will be deleted", comment: "alert message"),
-                                actions: {[
-                                    UIAlertAction(
-                                        title: NSLocalizedString("Cancel", comment: "alert action"),
-                                        style: .default
-                                    ),
-                                    UIAlertAction(
-                                        title: NSLocalizedString("Delete", comment: "alert action"),
-                                        style: .destructive,
-                                        handler: { _ in
-                                            deleteTag(tagId)
-                                        }
-                                    )
-                                ]}
-                            )
-                        } label: {
-                            Label("Delete", systemImage: "trash.fill")
-                        }
-                        .tint(.red)
-                    }
-                    .swipeActions(edge: .leading, allowsFullSwipe: true) {
-                        Button {
-                            tagEditorNavParams = TagEditorNavParams(chat: nil, chatListTag: ChatTagData(emoji: emoji, text: text), tagId: tagId)
-                        } label: {
-                            Label("Edit", systemImage: "pencil")
-                        }
-                        .tint(theme.colors.primary)
-                    }
-                    .background(
-                        // isActive required to navigate to edit view from any possible tag edited in swipe action
-                        NavigationLink(isActive: Binding(get: { tagEditorNavParams != nil }, set: { _ in tagEditorNavParams = nil })) {
-                            if let params = tagEditorNavParams {
-                                ChatListTagEditor(
-                                    chat: params.chat,
-                                    tagId: params.tagId,
-                                    emoji: params.chatListTag?.emoji,
-                                    name: params.chatListTag?.text ?? ""
-                                )
-                            }
-                        } label: {
-                            EmptyView()
-                        }
-                            .opacity(0)
-                    )
-                }
-                .onMove(perform: moveItem)
-                
-                NavigationLink {
-                    ChatListTagEditor(chat: chat)
-                } label: {
-                    Label("Create list", systemImage: "plus")
-                }
-            }
-        }
-        .listStyle(.insetGrouped)
-        
-        if editMode {
-            v.toolbar {
-                ToolbarItem(placement: .topBarTrailing) {
-                    EditButton()
-                }
-            }
-        } else {
-            v
-        }
-    }
-    
-    @ViewBuilder private func radioButton(selected: Bool) -> some View {
-        Image(systemName: selected ? "checkmark.circle.fill" : "circle")
-            .imageScale(.large)
-            .foregroundStyle(selected ? Color.accentColor : Color(.tertiaryLabel))
-    }
-
-    private func moveItem(from source: IndexSet, to destination: Int) {
-        // TODO: API for reordering tags
-        Task {
-            do {
-                await MainActor.run {
-                    chatTagsModel.userTags.move(fromOffsets: source, toOffset: destination)
-                }
-            } catch let error {
-                showAlert(
-                    NSLocalizedString("Error reordering lists", comment: "alert title"),
-                    message: responseError(error)
-                )
-            }
-        }
-    }
-    
-    private func tagChat(tagId: Int64, chat: Chat) {
-        Task {
-            do {
-                let (userTags, chatTags) = try await apiTagChat(
-                    type: chat.chatInfo.chatType,
-                    id: chat.chatInfo.apiId,
-                    tagId: tagId
-                )
-                
-                await MainActor.run {
-                    chatTagsModel.userTags = userTags
-                    updateChatTags(chat: chat, chatTags: chatTags)
-                    dismiss()
-                }
-            } catch let error {
-                showAlert(
-                    NSLocalizedString("Error adding chat to list", comment: "alert title"),
-                    message: responseError(error)
-                )
-            }
-        }
-    }
-    
-    private func untagChat(tagId: Int64, chat: Chat) {
-        Task {
-            do {
-                let (userTags, chatTags) = try await apiUntagChat(
-                    type: chat.chatInfo.chatType,
-                    id: chat.chatInfo.apiId,
-                    tagId: tagId
-                )
-                
-                await MainActor.run {
-                    chatTagsModel.userTags = userTags
-                    if case let .userTag(tag) = chatTagsModel.activeFilter,
-                       !userTags.contains(where: { $0.chatTagId == tag.chatTagId }) {
-                        chatTagsModel.activeFilter = nil
-                    }
-                    updateChatTags(chat: chat, chatTags: chatTags)
-                    dismiss()
-                }
-            } catch let error {
-                showAlert(
-                    NSLocalizedString("Error removing chat from list", comment: "alert title"),
-                    message: responseError(error)
-                )
-            }
-
-        }
-    }
-    
-    private func deleteTag(_ tagId: Int64) {
-        // TODO: Delete tag API
-        Task {
-            await MainActor.run {
-                chatTagsModel.userTags = chatTagsModel.userTags.filter { $0.chatTagId != tagId }
-                if case let .userTag(tag) = chatTagsModel.activeFilter, tagId == tag.chatTagId {
-                    chatTagsModel.activeFilter = nil
-                }
-                m.chats.forEach { c in
-                    if var contact = c.chatInfo.contact, contact.chatTags.contains(tagId) {
-                        contact.chatTags = contact.chatTags.filter({ $0 != tagId })
-                        m.updateContact(contact)
-                    } else if var group = c.chatInfo.groupInfo, group.chatTags.contains(tagId) {
-                        group.chatTags = group.chatTags.filter({ $0 != tagId })
-                        m.updateGroup(group)
-                    }
-                }
-            }
-        }
-    }
-    
-    private func updateChatTags(chat: Chat, chatTags: [Int64]) {
-        if var contact = chat.chatInfo.contact {
-            contact.chatTags = chatTags
-            m.updateContact(contact)
-        } else if var group = chat.chatInfo.groupInfo {
-            group.chatTags = chatTags
-            m.updateGroup(group)
-        }
-    }
-}
-
-struct EmojiPickerView: UIViewControllerRepresentable {
-    @Binding var selectedEmoji: String?
-    @Binding var showingPicker: Bool
-    @Environment(\.presentationMode) var presentationMode
-
-    class Coordinator: NSObject, ElegantEmojiPickerDelegate, UIAdaptivePresentationControllerDelegate {
-        var parent: EmojiPickerView
-        
-        init(parent: EmojiPickerView) {
-            self.parent = parent
-        }
-        
-        func emojiPicker(_ picker: ElegantEmojiPicker, didSelectEmoji emoji: Emoji?) {
-            parent.selectedEmoji = emoji?.emoji
-            parent.showingPicker = false
-            picker.dismiss(animated: true)
-        }
-        
-        // Called when the picker is dismissed manually (without selection)
-        func presentationControllerWillDismiss(_ presentationController: UIPresentationController) {
-            parent.showingPicker = false
-        }
-    }
-    
-    func makeCoordinator() -> Coordinator {
-        return Coordinator(parent: self)
-    }
-    
-    func makeUIViewController(context: Context) -> UIViewController {
-        let config = ElegantConfiguration(showRandom: false, showReset: true, showClose: false)
-        let picker = ElegantEmojiPicker(delegate: context.coordinator, configuration: config)
-        
-        picker.presentationController?.delegate = context.coordinator
-
-        let viewController = UIViewController()
-        DispatchQueue.main.async {
-            if let topVC = getTopViewController() {
-                topVC.present(picker, animated: true)
-            }
-        }
-        
-        return viewController
-    }
-    
-    func updateUIViewController(_ uiViewController: UIViewController, context: Context) {
-        // No need to update the controller after creation
-    }
-}
-
-struct ChatListTagEditor: View {
-    var chat: Chat? = nil
-    var tagId: Int64? = nil
-    @Environment(\.dismiss) var dismiss: DismissAction
-    @EnvironmentObject var chatTagsModel: ChatTagsModel
-    @EnvironmentObject var m: ChatModel
-    @State var emoji: String? = nil
-    @State var name: String = ""
-    @State private var isPickerPresented = false
-
-    var body: some View {
-        VStack {
-            List {
-                HStack {
-                    Button {
-                        isPickerPresented = true
-                    } label: {
-                        if let emoji {
-                            Text(emoji)
-                        } else {
-                            Image(systemName: "face.smiling")
-                                .resizable()
-                                .scaledToFit()
-                                .frame(width: 18, height: 18)
-                                .foregroundColor(.secondary)
-                        }
-                    }
-                    TextField("List name...", text: $name)
-                }
-                
-                Button {
-                    if let tId = tagId {
-                        if let em = emoji, !name.isEmpty {
-                            updateChatTag(tagId: tId, chatTagData: ChatTagData(emoji: em, text: name))
-                        }
-                    } else {
-                        createChatTag()
-                    }
-                } label: {
-                    Text(NSLocalizedString(tagId == nil ? "Create list" : "Change list", comment: "list editor button"))
-                }
-                .disabled(name.isEmpty)
-            }
-            .listStyle(.insetGrouped)
-            if isPickerPresented {
-                EmojiPickerView(selectedEmoji: $emoji, showingPicker: $isPickerPresented)
-            }
-        }
-    }
-    
-    private func createChatTag() {
-        // TODO: Allow creating tag without chat
-        if let chat = chat {
-            Task {
-                do {
-                    let (userTags, chatTags) = try await apiCreateChatTag(
-                        type: chat.chatInfo.chatType,
-                        id: chat.chatInfo.apiId,
-                        tag: ChatTagData(emoji: emoji ?? "😂", text: name)
-                    )
-                    
-                    await MainActor.run {
-                        chatTagsModel.userTags = userTags
-                        if var contact = chat.chatInfo.contact {
-                            contact.chatTags = chatTags
-                            m.updateContact(contact)
-                        } else if var group = chat.chatInfo.groupInfo {
-                            group.chatTags = chatTags
-                            m.updateGroup(group)
-                        }
-                        dismiss()
-                    }
-                } catch let error {
-                    showAlert(
-                        NSLocalizedString("Error creating list", comment: "alert title"),
-                        message: responseError(error)
-                    )
-                }
-            }
-        }
-    }
-    
-    private func updateChatTag(tagId: Int64, chatTagData: ChatTagData) {
-        // TODO: Create endpoint for edit
-        Task {
-            do {
-                await MainActor.run {
-                    chatTagsModel.userTags = chatTagsModel.userTags.map { tag in
-                        if tag.chatTagId == tagId {
-                            ChatTag(chatTagId: tag.chatTagId, chatTagText: chatTagData.text, chatTagEmoji: chatTagData.emoji)
-                        } else {
-                            tag
-                        }
-                    }
-                    dismiss()
-                }
-            } catch let error {
-                showAlert(
-                    NSLocalizedString("Error creating list", comment: "alert title"),
-                    message: responseError(error)
-                )
-            }
-        }
-    }
-}
-
 func rejectContactRequestAlert(_ contactRequest: UserContactRequest) -> Alert {
    Alert(
        title: Text("Reject contact request"),
@@ -1050,15 +585,15 @@ struct ChatListNavLink_Previews: PreviewProvider {
            ChatListNavLink(chat: Chat(
                chatInfo: ChatInfo.sampleData.direct,
                chatItems: [ChatItem.getSample(1, .directSnd, .now, "hello")]
-            ), parentSheet: .constant(nil))
+            ))
            ChatListNavLink(chat: Chat(
                chatInfo: ChatInfo.sampleData.direct,
                chatItems: [ChatItem.getSample(1, .directSnd, .now, "hello")]
-            ), parentSheet: .constant(nil))
+            ))
            ChatListNavLink(chat: Chat(
                chatInfo: ChatInfo.sampleData.contactRequest,
                chatItems: []
-            ), parentSheet: .constant(nil))
+            ))
        }
        .previewLayout(.fixed(width: 360, height: 82))
    }
@@ -31,29 +31,6 @@ enum UserPickerSheet: Identifiable {
    }
 }

-enum PresetTag: Int, Identifiable, CaseIterable, Equatable {
-    case favorites = 0
-    case contacts = 1
-    case groups = 2
-    case business = 3
-    
-    var id: Int { rawValue }
-}
-
-enum ActiveFilter: Identifiable, Equatable {
-    case presetTag(PresetTag)
-    case userTag(ChatTag)
-    case unread
-    
-    var id: String {
-        switch self {
-        case let .presetTag(tag): return "preset \(tag.id)"
-        case let .userTag(tag): return "user \(tag.chatTagId)"
-        case .unread: return "unread"
-        }
-    }
-}
-
 class SaveableSettings: ObservableObject {
    @Published var servers: ServerSettings = ServerSettings(currUserServers: [], userServers: [], serverErrors: [])
 }
@@ -140,10 +117,8 @@ struct ChatListView: View {
    @State private var searchChatFilteredBySimplexLink: String? = nil
    @State private var scrollToSearchBar = false
    @State private var userPickerShown: Bool = false
-    @State private var sheet: SomeSheet<AnyView>? = nil
-    @State private var presetTags: [PresetTag] = []
-    @StateObject private var chatTagsModel = ChatTagsModel.shared

+    @AppStorage(DEFAULT_SHOW_UNREAD_AND_FAVORITES) private var showUnreadAndFavorites = false
    @AppStorage(GROUP_DEFAULT_ONE_HAND_UI, store: groupDefaults) private var oneHandUI = true
    @AppStorage(DEFAULT_ONE_HAND_UI_CARD_SHOWN) private var oneHandUICardShown = false
    @AppStorage(DEFAULT_ADDRESS_CREATION_CARD_SHOWN) private var addressCreationCardShown = false
@@ -186,16 +161,6 @@ struct ChatListView: View {
                }
            }
        }
-        .sheet(item: $sheet) {
-            if #available(iOS 16.0, *) {
-                $0.content
-                    .presentationDetents([.fraction($0.fraction)])
-            } else {
-                $0.content
-
-            }
-        }
-        .environmentObject(chatTagsModel)
    }

    private var chatListView: some View {
@@ -341,7 +306,7 @@ struct ChatListView: View {
                    }
                    if #available(iOS 16.0, *) {
                        ForEach(cs, id: \.viewId) { chat in
-                            ChatListNavLink(chat: chat, parentSheet: $sheet)
+                            ChatListNavLink(chat: chat)
                                .scaleEffect(x: 1, y: oneHandUI ? -1 : 1, anchor: .center)
                                .padding(.trailing, -16)
                                .disabled(chatModel.chatRunning != true || chatModel.deletedChats.contains(chat.chatInfo.id))
@@ -353,7 +318,7 @@ struct ChatListView: View {
                            VStack(spacing: .zero) {
                                Divider()
                                    .padding(.leading, 16)
-                                ChatListNavLink(chat: chat,  parentSheet: $sheet)
+                                ChatListNavLink(chat: chat)
                                    .padding(.horizontal, 8)
                                    .padding(.vertical, 6)
                            }
@@ -427,40 +392,45 @@ struct ChatListView: View {
            return chatModel.chats.filter { $0.id == linkChatId }
        } else {
            let s = searchString()
-            return s == ""
+            return s == "" && !showUnreadAndFavorites
            ? chatModel.chats.filter { chat in
-                !chat.chatInfo.chatDeleted && !chat.chatInfo.contactCard && filtered(chat)
+                !chat.chatInfo.chatDeleted && chatContactType(chat: chat) != ContactType.card
            }
            : chatModel.chats.filter { chat in
                let cInfo = chat.chatInfo
-                return switch cInfo {
+                switch cInfo {
                case let .direct(contact):
-                    !contact.chatDeleted && !chat.chatInfo.contactCard && (
-                        ( viewNameContains(cInfo, s) ||
-                          contact.profile.displayName.localizedLowercase.contains(s) ||
-                          contact.fullName.localizedLowercase.contains(s)
-                        )
+                    return !contact.chatDeleted && chatContactType(chat: chat) != ContactType.card && (
+                        s == ""
+                        ? filtered(chat)
+                        : (viewNameContains(cInfo, s) ||
+                           contact.profile.displayName.localizedLowercase.contains(s) ||
+                           contact.fullName.localizedLowercase.contains(s))
                    )
-                case .group: viewNameContains(cInfo, s)
-                case .local: viewNameContains(cInfo, s)
-                case .contactRequest: viewNameContains(cInfo, s)
-                case let .contactConnection(conn): conn.localAlias.localizedLowercase.contains(s)
-                case .invalidJSON: false
+                case let .group(gInfo):
+                    return s == ""
+                    ? (filtered(chat) || gInfo.membership.memberStatus == .memInvited)
+                    : viewNameContains(cInfo, s)
+                case .local:
+                    return s == "" || viewNameContains(cInfo, s)
+                case .contactRequest:
+                    return s == "" || viewNameContains(cInfo, s)
+                case let .contactConnection(conn):
+                    return s != "" && conn.localAlias.localizedLowercase.contains(s)
+                case .invalidJSON:
+                    return false
                }
            }
        }
-        
+
        func searchString() -> String {
            searchShowingSimplexLink ? "" : searchText.trimmingCharacters(in: .whitespaces).localizedLowercase
        }

        func filtered(_ chat: Chat) -> Bool {
-            switch chatTagsModel.activeFilter {
-            case let .presetTag(tag): presetTagMatchesChat(tag, chat)
-            case let .userTag(tag): chat.chatInfo.chatTags?.contains(tag.chatTagId) == true
-            case .unread: chat.chatStats.unreadChat ||  chat.chatInfo.ntfsEnabled && chat.chatStats.unreadCount > 0
-            case .none: true
-            }
+            (chat.chatInfo.chatSettings?.favorite ?? false) ||
+            chat.chatStats.unreadChat ||
+            (chat.chatInfo.ntfsEnabled && chat.chatStats.unreadCount > 0)
        }

        func viewNameContains(_ cInfo: ChatInfo, _ s: String) -> Bool {
@@ -530,7 +500,6 @@ struct SubsStatusIndicator: View {
 struct ChatListSearchBar: View {
    @EnvironmentObject var m: ChatModel
    @EnvironmentObject var theme: AppTheme
-    @EnvironmentObject var chatTagsModel: ChatTagsModel
    @Binding var searchMode: Bool
    @FocusState.Binding var searchFocussed: Bool
    @Binding var searchText: String
@@ -539,10 +508,10 @@ struct ChatListSearchBar: View {
    @State private var ignoreSearchTextChange = false
    @State private var alert: PlanAndConnectAlert?
    @State private var sheet: PlanAndConnectActionSheet?
+    @AppStorage(DEFAULT_SHOW_UNREAD_AND_FAVORITES) private var showUnreadAndFavorites = false

    var body: some View {
        VStack(spacing: 12) {
-            ScrollView([.horizontal], showsIndicators: false) { ChatTagsView() }
            HStack(spacing: 12) {
                HStack(spacing: 4) {
                    Image(systemName: "magnifyingglass")
@@ -609,21 +578,16 @@ struct ChatListSearchBar: View {
    }

    private func toggleFilterButton() -> some View {
-        let showUnread = chatTagsModel.activeFilter == .unread
-        return ZStack {
+        ZStack {
            Color.clear
                .frame(width: 22, height: 22)
-            Image(systemName: showUnread ? "line.3.horizontal.decrease.circle.fill" : "line.3.horizontal.decrease")
+            Image(systemName: showUnreadAndFavorites ? "line.3.horizontal.decrease.circle.fill" : "line.3.horizontal.decrease")
                .resizable()
                .scaledToFit()
-                .foregroundColor(showUnread ? theme.colors.primary : theme.colors.secondary)
-                .frame(width: showUnread ? 22 : 16, height: showUnread ? 22 : 16)
+                .foregroundColor(showUnreadAndFavorites ? theme.colors.primary : theme.colors.secondary)
+                .frame(width: showUnreadAndFavorites ? 22 : 16, height: showUnreadAndFavorites ? 22 : 16)
                .onTapGesture {
-                    if chatTagsModel.activeFilter == .unread {
-                        chatTagsModel.activeFilter = nil
-                    } else {
-                        chatTagsModel.activeFilter = .unread
-                    }
+                    showUnreadAndFavorites = !showUnreadAndFavorites
                }
        }
    }
@@ -641,233 +605,6 @@ struct ChatListSearchBar: View {
    }
 }

-struct ChatTagsView: View {
-    @EnvironmentObject var chatTagsModel: ChatTagsModel
-    @EnvironmentObject var chatModel: ChatModel
-    @State private var sheet: SomeSheet<AnyView>? = nil
-    @State private var chatTagsLoaded: Bool = false
-    var presetTags: [PresetTag] = []
-
-    var body: some View {
-        HStack {
-            if chatTagsLoaded {
-                tagsView()
-            } else {
-                tagsViewPlaceholder()
-            }
-        }.task {
-            getChatTags()
-        }
-        .onChange(of: chatModel.currentUser?.userId) { _ in
-            chatTagsModel.activeFilter = nil
-            getChatTags()
-        }
-        .sheet(item: $sheet) {
-            if #available(iOS 16.0, *) {
-                $0.content.presentationDetents([.fraction($0.fraction)])
-            } else {
-                $0.content
-            }
-        }
-    }
-    
-    @ViewBuilder private func tagsView() -> some View {
-        if presetTags.count + chatTagsModel.userTags.count <= 5 {
-            expandedPresetTagsFiltersView()
-        } else {
-            collapsedTagsFilterView()
-        }
-        ForEach(chatTagsModel.userTags, id: \.id) { tag in
-            let current = if case let .userTag(t) = chatTagsModel.activeFilter {
-                t == tag
-            } else {
-                false
-            }
-            
-            let color: Color = current ? .accentColor : .secondary
-            ZStack {
-                HStack(spacing: 4) {
-                    if let emoji = tag.chatTagEmoji {
-                        Text(emoji)
-                    } else {
-                        Image(systemName: current ? "tag.fill" : "tag")
-                            .foregroundColor(color)
-                    }
-                    ZStack {
-                        Text(tag.chatTagText).fontWeight(.semibold).foregroundColor(.clear)
-                        Text(tag.chatTagText).fontWeight(current ? .semibold : .regular).foregroundColor(color)
-                    }
-                }
-                .onTapGesture {
-                    setActiveFilter(filter: .userTag(tag))
-                }
-                .onLongPressGesture {
-                    let fraction: Double
-
-                    switch chatTagsModel.userTags.count {
-                    case 0..<4:
-                        fraction = 0.35
-                    case 4..<9:
-                        fraction = 0.7
-                    default:
-                        fraction = 1
-                    }
-                    sheet = SomeSheet(
-                        content: {
-                            AnyView(
-                                NavigationView {
-                                    ChatListTag(chat: nil, editMode: true)
-                                }
-                            )
-                        },
-                        id: "tag list",
-                        fraction: fraction
-                    )
-                }
-            }
-        }
-        
-        if chatTagsModel.userTags.isEmpty {
-            Button {
-                sheet = SomeSheet(
-                    content: {
-                        AnyView(
-                            NavigationView {
-                                ChatListTagEditor()
-                            }
-                        )
-                    },
-                    id: "tag create"
-                )
-            } label: {
-                Image(systemName: "plus")
-                    .foregroundColor(.secondary)
-            }
-            .buttonStyle(PlainButtonStyle())
-        }
-    }
-    
-    @ViewBuilder private func tagsViewPlaceholder() -> some View {
-        HStack {
-            Text("🙂").foregroundColor(.clear)
-            ZStack {
-                Text("Create list").fontWeight(.semibold).foregroundColor(.clear)
-            }
-        }
-    }
-    
-    @ViewBuilder private func createChatListTagView() -> some View {
-        NavigationView {
-            ChatListTagEditor()
-                .modifier(ThemedBackground(grouped: true))
-        }
-    }
-    
-    @ViewBuilder private func expandedPresetTagsFiltersView() -> some View {
-        let selectedPresetTag: PresetTag? = if case let .presetTag(tag) = chatTagsModel.activeFilter {
-            tag
-        } else {
-            nil
-        }
-        
-        ForEach(presetTags, id: \.id) { tag in
-            let active = tag == selectedPresetTag
-            let (icon, text) = presetTagLabel(tag: tag, active: active)
-            let color: Color = active ? .accentColor : .secondary
-
-            HStack {
-                Image(systemName: icon)
-                    .foregroundColor(color)
-                ZStack {
-                    Text(text).fontWeight(.semibold).foregroundColor(.clear)
-                    Text(text).fontWeight(active ? .semibold : .regular).foregroundColor(color)
-                }
-            }
-            .onTapGesture {
-                setActiveFilter(filter: .presetTag(tag))
-            }
-        }
-    }
-    
-    @ViewBuilder private func collapsedTagsFilterView() -> some View {
-        let selectedPresetTag: PresetTag? = if case let .presetTag(tag) = chatTagsModel.activeFilter {
-            tag
-        } else {
-            nil
-        }
-        Menu {
-            ForEach(presetTags, id: \.id) { tag in
-                Button {
-                    setActiveFilter(filter: .presetTag(tag))
-                } label: {
-                    let (systemName, text) = presetTagLabel(tag: tag, active: tag == selectedPresetTag)
-                    HStack {
-                        Image(systemName: systemName)
-                        Text(text)
-                    }
-                }
-            }
-            Button {
-                chatTagsModel.activeFilter = nil
-            } label: {
-                let (systemName, text) = presetTagLabel(tag: nil, active: false)
-                HStack {
-                    Image(systemName: systemName)
-                    Text(text)
-                }
-            }
-        } label: {
-            let active = selectedPresetTag != nil
-            let (systemName, _) = presetTagLabel(tag: selectedPresetTag, active: active)
-            Image(systemName: systemName)
-                .foregroundColor(active ? .accentColor : .secondary)
-        }
-        .frame(minWidth: 28)
-    }
-    
-    private func presetTagLabel(tag: PresetTag?, active: Bool) -> (String, LocalizedStringKey) {
-        switch tag {
-        case .favorites: (active ? "star.fill" : "star", "Favorites")
-        case .contacts: (active ? "person.fill" : "person", "Contacts")
-        case .groups: (active ? "person.2.fill" : "person.2", "Groups")
-        case .business: (active ? "briefcase.fill" : "briefcase", "Businesses")
-        case .none: ("list.bullet", "All")
-        }
-    }
-    
-    private func setActiveFilter(filter: ActiveFilter) {
-        if filter != chatTagsModel.activeFilter {
-            chatTagsModel.activeFilter = filter
-        } else {
-            chatTagsModel.activeFilter = nil
-        }
-    }
-    
-    private func getChatTags() {
-        Task {
-            do {
-                chatTagsLoaded = false
-                let chatTags = try await apiGetChatTags()
-                
-                await MainActor.run {
-                    self.chatTagsModel.userTags = chatTags
-                    if case let .userTag(tag) = self.chatTagsModel.activeFilter {
-                        if !chatTags.contains(tag) {
-                            self.chatTagsModel.activeFilter = nil
-                        }
-                    }
-                    withAnimation {
-                        self.chatTagsLoaded = true
-                    }
-                }
-            } catch let error {
-                AlertManager.shared.showAlertMsg(title: "Error", message: "\(responseError(error))")
-                chatTagsLoaded = false
-            }
-        }
-    }
-}
-
 func chatStoppedIcon() -> some View {
    Button {
        AlertManager.shared.showAlertMsg(
@@ -879,43 +616,6 @@ func chatStoppedIcon() -> some View {
    }
 }

-private func getPresetTags(_ chats: [Chat]) -> [PresetTag] {
-    var matches: Set<PresetTag> = []
-    for chat in chats {
-        for tag in PresetTag.allCases {
-            if presetTagMatchesChat(tag, chat) {
-                matches.insert(tag)
-            }
-        }
-        if matches.count == PresetTag.allCases.count {
-            break
-        }
-    }
-    return Array(matches).sorted(by: { $0.rawValue < $1.rawValue })
-}
-
-private func presetTagMatchesChat(_ tag: PresetTag, _ chat: Chat) -> Bool {
-    switch tag {
-    case .favorites:
-        chat.chatInfo.chatSettings?.favorite == true
-    case .contacts:
-        switch chat.chatInfo {
-        case .direct: true
-        case .contactRequest: true
-        case .contactConnection: true
-        case let .group(groupInfo): groupInfo.businessChat?.chatType == .customer
-        default: false
-        }
-    case .groups:
-        switch chat.chatInfo {
-        case let .group(groupInfo): groupInfo.businessChat == nil
-        default: false
-        }
-    case .business:
-        chat.chatInfo.groupInfo?.businessChat?.chatType == .business
-    }
-}
-
 struct ChatListView_Previews: PreviewProvider {
    @State static var userPickerSheet: UserPickerSheet? = .none

@@ -20,7 +20,7 @@ struct ContactListNavLink: View {
    @State private var showContactRequestDialog = false

    var body: some View {
-        let contactType = chatContactType(chat)
+        let contactType = chatContactType(chat: chat)

        Group {
            switch (chat.chatInfo) {
@@ -186,7 +186,7 @@ struct NewChatSheet: View {
    }
 }

-func chatContactType(_ chat: Chat) -> ContactType {
+func chatContactType(chat: Chat) -> ContactType {
    switch chat.chatInfo {
    case .contactRequest:
        return .request
@@ -207,7 +207,7 @@ func chatContactType(_ chat: Chat) -> ContactType {

 private func filterContactTypes(chats: [Chat], contactTypes: [ContactType]) -> [Chat] {
    return chats.filter { chat in
-        contactTypes.contains(chatContactType(chat))
+        contactTypes.contains(chatContactType(chat: chat))
    }
 }

@@ -279,8 +279,8 @@ struct ContactsList: View {
    }
    
    private func chatsByTypeComparator(chat1: Chat, chat2: Chat) -> Bool {
-        let chat1Type = chatContactType(chat1)
-        let chat2Type = chatContactType(chat2)
+        let chat1Type = chatContactType(chat: chat1)
+        let chat2Type = chatContactType(chat: chat2)

        if chat1Type.rawValue < chat2Type.rawValue {
            return true
@@ -25,7 +25,6 @@ struct SomeActionSheet: Identifiable {
 struct SomeSheet<Content: View>: Identifiable {
    @ViewBuilder var content: Content
    var id: String
-    var fraction = 0.4
 }

 private enum NewChatViewAlert: Identifiable {
@@ -21,7 +21,7 @@ struct AddressCreationCard: View {
    var body: some View {
        let addressExists = chatModel.userAddress != nil
        let chats = chatModel.chats.filter { chat in
-            !chat.chatInfo.chatDeleted && !chat.chatInfo.contactCard
+            !chat.chatInfo.chatDeleted && chatContactType(chat: chat) != ContactType.card
        }
        ZStack(alignment: .topTrailing) {
            HStack(alignment: .top, spacing: 16) {
@@ -203,7 +203,6 @@
 		8CC4ED902BD7B8530078AEE8 /* CallAudioDeviceManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CC4ED8F2BD7B8530078AEE8 /* CallAudioDeviceManager.swift */; };
 		8CC956EE2BC0041000412A11 /* NetworkObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CC956ED2BC0041000412A11 /* NetworkObserver.swift */; };
 		8CE848A32C5A0FA000D5C7C8 /* SelectableChatItemToolbars.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CE848A22C5A0FA000D5C7C8 /* SelectableChatItemToolbars.swift */; };
-		B728945B2D0C62BF00F7A19A /* ElegantEmojiPicker in Frameworks */ = {isa = PBXBuildFile; productRef = B728945A2D0C62BF00F7A19A /* ElegantEmojiPicker */; };
 		B73EFE532CE5FA3500C778EA /* CreateSimpleXAddress.swift in Sources */ = {isa = PBXBuildFile; fileRef = B73EFE522CE5FA3500C778EA /* CreateSimpleXAddress.swift */; };
 		B76E6C312C5C41D900EC11AA /* ContactListNavLink.swift in Sources */ = {isa = PBXBuildFile; fileRef = B76E6C302C5C41D900EC11AA /* ContactListNavLink.swift */; };
 		B79ADAFF2CE4EF930083DFFD /* AddressCreationCard.swift in Sources */ = {isa = PBXBuildFile; fileRef = B79ADAFE2CE4EF930083DFFD /* AddressCreationCard.swift */; };
@@ -637,7 +636,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				5CE2BA702845308900EC33A6 /* SimpleXChat.framework in Frameworks */,
-				B728945B2D0C62BF00F7A19A /* ElegantEmojiPicker in Frameworks */,
 				8C8118722C220B5B00E6FC94 /* Yams in Frameworks */,
 				8CB3476C2CF5CFFA006787A5 /* Ink in Frameworks */,
 				D741547829AF89AF0022400A /* StoreKit.framework in Frameworks */,
@@ -1188,7 +1186,6 @@
 				D7197A1729AE89660055C05A /* WebRTC */,
 				8C8118712C220B5B00E6FC94 /* Yams */,
 				8CB3476B2CF5CFFA006787A5 /* Ink */,
-				B728945A2D0C62BF00F7A19A /* ElegantEmojiPicker */,
 			);
 			productName = "SimpleX (iOS)";
 			productReference = 5CA059CA279559F40002BEB4 /* SimpleX.app */;
@@ -1333,7 +1330,6 @@
 				D7197A1629AE89660055C05A /* XCRemoteSwiftPackageReference "WebRTC" */,
 				8C73C1162C21E17B00892670 /* XCRemoteSwiftPackageReference "Yams" */,
 				8CB3476A2CF5CFFA006787A5 /* XCRemoteSwiftPackageReference "ink" */,
-				B72894592D0C62BF00F7A19A /* XCRemoteSwiftPackageReference "Elegant-Emoji-Picker" */,
 			);
 			productRefGroup = 5CA059CB279559F40002BEB4 /* Products */;
 			projectDirPath = "";
@@ -2391,14 +2387,6 @@
 				version = 0.6.0;
 			};
 		};
-		B72894592D0C62BF00F7A19A /* XCRemoteSwiftPackageReference "Elegant-Emoji-Picker" */ = {
-			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/Finalet/Elegant-Emoji-Picker";
-			requirement = {
-				branch = main;
-				kind = branch;
-			};
-		};
 		D7197A1629AE89660055C05A /* XCRemoteSwiftPackageReference "WebRTC" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/simplex-chat/WebRTC.git";
@@ -2441,11 +2429,6 @@
 			package = 8CB3476A2CF5CFFA006787A5 /* XCRemoteSwiftPackageReference "ink" */;
 			productName = Ink;
 		};
-		B728945A2D0C62BF00F7A19A /* ElegantEmojiPicker */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = B72894592D0C62BF00F7A19A /* XCRemoteSwiftPackageReference "Elegant-Emoji-Picker" */;
-			productName = ElegantEmojiPicker;
-		};
 		CE38A29B2C3FCD72005ED185 /* SwiftyGif */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = D77B92DA2952372200A5A1CC /* XCRemoteSwiftPackageReference "SwiftyGif" */;
@@ -1,5 +1,5 @@
 {
-  "originHash" : "07434ae88cbf078ce3d27c91c1f605836aaebff0e0cef5f25317795151c77db1",
+  "originHash" : "33afc44be5f4225325b3cb940ed71b6cbf3ef97290d348d7b6803697bcd0637d",
  "pins" : [
    {
      "identity" : "codescanner",
@@ -10,15 +10,6 @@
        "version" : "2.5.0"
      }
    },
-    {
-      "identity" : "elegant-emoji-picker",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/Finalet/Elegant-Emoji-Picker",
-      "state" : {
-        "branch" : "main",
-        "revision" : "71d2d46092b4d550cc593614efc06438f845f6e6"
-      }
-    },
    {
      "identity" : "ink",
      "kind" : "remoteSourceControl",
@@ -40,14 +40,10 @@ public enum ChatCommand {
    case testStorageEncryption(key: String)
    case apiSaveSettings(settings: AppSettings)
    case apiGetSettings(settings: AppSettings)
-    case apiGetChatTags(userId: Int64)
    case apiGetChats(userId: Int64)
    case apiGetChat(type: ChatType, id: Int64, pagination: ChatPagination, search: String)
    case apiGetChatItemInfo(type: ChatType, id: Int64, itemId: Int64)
    case apiSendMessages(type: ChatType, id: Int64, live: Bool, ttl: Int?, composedMessages: [ComposedMessage])
-    case apiCreateChatTag(type: ChatType, id: Int64, tag: ChatTagData)
-    case apiTagChat(type: ChatType, id: Int64, tagId: Int64)
-    case apiUntagChat(type: ChatType, id: Int64, tagId: Int64)
    case apiCreateChatItems(noteFolderId: Int64, composedMessages: [ComposedMessage])
    case apiUpdateChatItem(type: ChatType, id: Int64, itemId: Int64, msg: MsgContent, live: Bool)
    case apiDeleteChatItem(type: ChatType, id: Int64, itemIds: [Int64], mode: CIDeleteMode)
@@ -202,7 +198,6 @@ public enum ChatCommand {
            case let .testStorageEncryption(key): return "/db test key \(key)"
            case let .apiSaveSettings(settings): return "/_save app settings \(encodeJSON(settings))"
            case let .apiGetSettings(settings): return "/_get app settings \(encodeJSON(settings))"
-            case let .apiGetChatTags(userId): return "/_get tags \(userId)"
            case let .apiGetChats(userId): return "/_get chats \(userId) pcc=on"
            case let .apiGetChat(type, id, pagination, search): return "/_get chat \(ref(type, id)) \(pagination.cmdString)" +
                (search == "" ? "" : " search=\(search)")
@@ -211,9 +206,6 @@ public enum ChatCommand {
                let msgs = encodeJSON(composedMessages)
                let ttlStr = ttl != nil ? "\(ttl!)" : "default"
                return "/_send \(ref(type, id)) live=\(onOff(live)) ttl=\(ttlStr) json \(msgs)"
-            case let .apiCreateChatTag(type, id, tag): return "/_create tag \(ref(type, id)) \(encodeJSON(tag))"
-            case let .apiTagChat(type, id, tagId): return "/_tag \(ref(type, id)) \(tagId)"
-            case let .apiUntagChat(type, id, tagId): return "/_untag \(ref(type, id)) \(tagId)"
            case let .apiCreateChatItems(noteFolderId, composedMessages):
                let msgs = encodeJSON(composedMessages)
                return "/_create *\(noteFolderId) json \(msgs)"
@@ -375,14 +367,10 @@ public enum ChatCommand {
            case .testStorageEncryption: return "testStorageEncryption"
            case .apiSaveSettings: return "apiSaveSettings"
            case .apiGetSettings: return "apiGetSettings"
-            case .apiGetChatTags: return "apiGetChatTags"
            case .apiGetChats: return "apiGetChats"
            case .apiGetChat: return "apiGetChat"
            case .apiGetChatItemInfo: return "apiGetChatItemInfo"
            case .apiSendMessages: return "apiSendMessages"
-            case .apiCreateChatTag: return "apiCreateChatTag"
-            case .apiTagChat: return "apiTagChat"
-            case .apiUntagChat: return "apiUntagChat"
            case .apiCreateChatItems: return "apiCreateChatItems"
            case .apiUpdateChatItem: return "apiUpdateChatItem"
            case .apiDeleteChatItem: return "apiDeleteChatItem"
@@ -576,7 +564,6 @@ public enum ChatResponse: Decodable, Error {
    case chatSuspended
    case apiChats(user: UserRef, chats: [ChatData])
    case apiChat(user: UserRef, chat: ChatData)
-    case chatTags(user: UserRef, userTags: [ChatTag])
    case chatItemInfo(user: UserRef, chatItem: AChatItem, chatItemInfo: ChatItemInfo)
    case serverTestResult(user: UserRef, testServer: String, testFailure: ProtocolTestFailure?)
    case serverOperatorConditions(conditions: ServerOperatorConditions)
@@ -603,8 +590,6 @@ public enum ChatResponse: Decodable, Error {
    case contactCode(user: UserRef, contact: Contact, connectionCode: String)
    case groupMemberCode(user: UserRef, groupInfo: GroupInfo, member: GroupMember, connectionCode: String)
    case connectionVerified(user: UserRef, verified: Bool, expectedCode: String)
-    case tagsUpdated(user: UserRef, userTags: [ChatTag], chatTags: [Int64])
-    case chatUntagged(user: UserRef, userTags: [ChatTag], chatTags: [Int64])
    case invitation(user: UserRef, connReqInvitation: String, connection: PendingContactConnection)
    case connectionIncognitoUpdated(user: UserRef, toConnection: PendingContactConnection)
    case connectionUserChanged(user: UserRef, fromConnection: PendingContactConnection, toConnection: PendingContactConnection, newUser: UserRef)
@@ -756,7 +741,6 @@ public enum ChatResponse: Decodable, Error {
            case .chatSuspended: return "chatSuspended"
            case .apiChats: return "apiChats"
            case .apiChat: return "apiChat"
-            case .chatTags: return "chatTags"
            case .chatItemInfo: return "chatItemInfo"
            case .serverTestResult: return "serverTestResult"
            case .serverOperatorConditions: return "serverOperators"
@@ -783,8 +767,6 @@ public enum ChatResponse: Decodable, Error {
            case .contactCode: return "contactCode"
            case .groupMemberCode: return "groupMemberCode"
            case .connectionVerified: return "connectionVerified"
-            case .tagsUpdated: return "tagsUpdated"
-            case .chatUntagged: return "chatUntagged"
            case .invitation: return "invitation"
            case .connectionIncognitoUpdated: return "connectionIncognitoUpdated"
            case .connectionUserChanged: return "connectionUserChanged"
@@ -932,7 +914,6 @@ public enum ChatResponse: Decodable, Error {
            case .chatSuspended: return noDetails
            case let .apiChats(u, chats): return withUser(u, String(describing: chats))
            case let .apiChat(u, chat): return withUser(u, String(describing: chat))
-            case let .chatTags(u, userTags): return withUser(u, "userTags: \(String(describing: userTags))")
            case let .chatItemInfo(u, chatItem, chatItemInfo): return withUser(u, "chatItem: \(String(describing: chatItem))\nchatItemInfo: \(String(describing: chatItemInfo))")
            case let .serverTestResult(u, server, testFailure): return withUser(u, "server: \(server)\nresult: \(String(describing: testFailure))")
            case let .serverOperatorConditions(conditions): return "conditions: \(String(describing: conditions))"
@@ -961,8 +942,6 @@ public enum ChatResponse: Decodable, Error {
            case let .contactCode(u, contact, connectionCode): return withUser(u, "contact: \(String(describing: contact))\nconnectionCode: \(connectionCode)")
            case let .groupMemberCode(u, groupInfo, member, connectionCode): return withUser(u, "groupInfo: \(String(describing: groupInfo))\nmember: \(String(describing: member))\nconnectionCode: \(connectionCode)")
            case let .connectionVerified(u, verified, expectedCode): return withUser(u, "verified: \(verified)\nconnectionCode: \(expectedCode)")
-            case let .tagsUpdated(u, userTags, chatTags): return withUser(u, "userTags: \(String(describing: userTags))\nchatTags: \(String(describing: chatTags))")
-            case let .chatUntagged(u, userTags, chatTags): return withUser(u, "userTags: \(String(describing: userTags))\nchatTags: \(String(describing: chatTags))")
            case let .invitation(u, connReqInvitation, connection): return withUser(u, "connReqInvitation: \(connReqInvitation)\nconnection: \(connection)")
            case let .connectionIncognitoUpdated(u, toConnection): return withUser(u, String(describing: toConnection))
            case let .connectionUserChanged(u, fromConnection, toConnection, newUser): return withUser(u, "fromConnection: \(String(describing: fromConnection))\ntoConnection: \(String(describing: toConnection))\newUserId: \(String(describing: newUser.userId))")
@@ -1193,16 +1172,6 @@ public enum ChatPagination {
    }
 }

-public struct ChatTagData: Encodable {
-    public var emoji: String?
-    public var text: String
-    
-    public init(emoji: String?, text: String) {
-        self.emoji = emoji
-        self.text = text
-    }
-}
-
 public struct ComposedMessage: Encodable {
    public var fileSource: CryptoFile?
    var quotedItemId: Int64?
@@ -1334,13 +1334,6 @@ public enum ChatInfo: Identifiable, Decodable, NamedChat, Hashable {
        }
    }

-    public var contactCard: Bool {
-        switch self {
-        case let .direct(contact): contact.activeConn == nil && contact.profile.contactLink != nil && contact.active
-        default: false
-        }
-    }
-    
    public var groupInfo: GroupInfo? {
        switch self {
        case let .group(groupInfo): return groupInfo
@@ -1451,14 +1444,6 @@ public enum ChatInfo: Identifiable, Decodable, NamedChat, Hashable {
        default: return nil
        }
    }
-    
-    public var chatTags: [Int64]? {
-        switch self {
-        case let .direct(contact): return contact.chatTags
-        case let .group(groupInfo): return groupInfo.chatTags
-        default: return nil
-        }
-    }

    var createdAt: Date {
        switch self {
@@ -1560,7 +1545,6 @@ public struct Contact: Identifiable, Decodable, NamedChat, Hashable {
    var chatTs: Date?
    var contactGroupMemberId: Int64?
    var contactGrpInvSent: Bool
-    public var chatTags: [Int64]
    public var uiThemes: ThemeModeOverrides?
    public var chatDeleted: Bool
    
@@ -1631,7 +1615,6 @@ public struct Contact: Identifiable, Decodable, NamedChat, Hashable {
        createdAt: .now,
        updatedAt: .now,
        contactGrpInvSent: false,
-        chatTags: [],
        chatDeleted: false
    )
 }
@@ -1927,7 +1910,6 @@ public struct GroupInfo: Identifiable, Decodable, NamedChat, Hashable {
    public var fullName: String { get { groupProfile.fullName } }
    public var image: String? { get { groupProfile.image } }
    public var localAlias: String { "" }
-    public var chatTags: [Int64]

    public var isOwner: Bool {
        return membership.memberRole == .owner && membership.memberCurrent
@@ -1950,8 +1932,7 @@ public struct GroupInfo: Identifiable, Decodable, NamedChat, Hashable {
        hostConnCustomUserProfileId: nil,
        chatSettings: ChatSettings.defaults,
        createdAt: .now,
-        updatedAt: .now,
-        chatTags: []
+        updatedAt: .now
    )
 }

@@ -4229,20 +4210,6 @@ public enum ChatItemTTL: Identifiable, Comparable, Hashable {
    }
 }

-public struct ChatTag: Decodable, Hashable {
-    public var chatTagId: Int64
-    public var chatTagText: String
-    public var chatTagEmoji: String?
-    
-    public var id: Int64 { chatTagId }
-    
-    public init(chatTagId: Int64, chatTagText: String, chatTagEmoji: String?) {
-        self.chatTagId = chatTagId
-        self.chatTagText = chatTagText
-        self.chatTagEmoji = chatTagEmoji
-    }
-}
-
 public struct ChatItemInfo: Decodable, Hashable {
    public var itemVersions: [ChatItemVersion]
    public var memberDeliveryStatuses: [MemberDeliveryStatus]?
@@ -71,7 +71,7 @@ if(NOT APPLE)
 else()
 	# Without direct linking it can't find hs_init in linking step
 	add_library( rts SHARED IMPORTED )
-	FILE(GLOB RTSLIB ${CMAKE_SOURCE_DIR}/libs/${OS_LIB_PATH}-${OS_LIB_ARCH}/libHSrts*_thr-*.${OS_LIB_EXT})
+	FILE(GLOB RTSLIB ${CMAKE_SOURCE_DIR}/libs/${OS_LIB_PATH}-${OS_LIB_ARCH}/deps/libHSrts*_thr-*.${OS_LIB_EXT})
 	set_target_properties( rts PROPERTIES IMPORTED_LOCATION ${RTSLIB})

 	target_link_libraries(app-lib rts simplex)
@@ -16,6 +16,21 @@
        "type": "github"
      }
    },
+    "blank": {
+      "locked": {
+        "lastModified": 1625557891,
+        "narHash": "sha256-O8/MWsPBGhhyPoPLHZAuoZiiHo9q6FLlEeIDEXuj6T4=",
+        "owner": "divnix",
+        "repo": "blank",
+        "rev": "5a5d2684073d9f563072ed07c871d577a6c614a8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "divnix",
+        "repo": "blank",
+        "type": "github"
+      }
+    },
    "cabal-32": {
      "flake": false,
      "locked": {
@@ -83,6 +98,64 @@
        "type": "github"
      }
    },
+    "devshell": {
+      "inputs": {
+        "flake-utils": [
+          "haskellNix",
+          "tullia",
+          "std",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "haskellNix",
+          "tullia",
+          "std",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1663445644,
+        "narHash": "sha256-+xVlcK60x7VY1vRJbNUEAHi17ZuoQxAIH4S4iUFUGBA=",
+        "owner": "numtide",
+        "repo": "devshell",
+        "rev": "e3dc3e21594fe07bdb24bdf1c8657acaa4cb8f66",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "devshell",
+        "type": "github"
+      }
+    },
+    "dmerge": {
+      "inputs": {
+        "nixlib": [
+          "haskellNix",
+          "tullia",
+          "std",
+          "nixpkgs"
+        ],
+        "yants": [
+          "haskellNix",
+          "tullia",
+          "std",
+          "yants"
+        ]
+      },
+      "locked": {
+        "lastModified": 1659548052,
+        "narHash": "sha256-fzI2gp1skGA8mQo/FBFrUAtY0GQkAIAaV/V127TJPyY=",
+        "owner": "divnix",
+        "repo": "data-merge",
+        "rev": "d160d18ce7b1a45b88344aa3f13ed1163954b497",
+        "type": "github"
+      },
+      "original": {
+        "owner": "divnix",
+        "repo": "data-merge",
+        "type": "github"
+      }
+    },
    "flake-compat": {
      "flake": false,
      "locked": {
@@ -100,34 +173,74 @@
        "type": "github"
      }
    },
-    "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib"
-      },
+    "flake-compat_2": {
+      "flake": false,
      "locked": {
-        "lastModified": 1698579227,
-        "narHash": "sha256-KVWjFZky+gRuWennKsbo6cWyo7c/z/VgCte5pR9pEKg=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "f76e870d64779109e41370848074ac4eaa1606ec",
+        "lastModified": 1650374568,
+        "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "b4a34015c698c7793d592d66adbab377907a2be8",
        "type": "github"
      },
      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
+        "owner": "edolstra",
+        "repo": "flake-compat",
        "type": "github"
      }
    },
    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
      "locked": {
-        "lastModified": 1701680307,
-        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
+        "lastModified": 1676283394,
+        "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
+        "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_2": {
+      "locked": {
+        "lastModified": 1667395993,
+        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_3": {
+      "locked": {
+        "lastModified": 1653893745,
+        "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_4": {
+      "locked": {
+        "lastModified": 1659877975,
+        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
        "type": "github"
      },
      "original": {
@@ -153,51 +266,33 @@
        "type": "github"
      }
    },
-    "ghc98X": {
-      "flake": false,
+    "gomod2nix": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_2",
+        "utils": "utils"
+      },
      "locked": {
-        "lastModified": 1715066704,
-        "narHash": "sha256-F0EVR8x/fcpj1st+hz96Wdsz5uwVIOziGKAwRxLOYJw=",
-        "ref": "ghc-9.8",
-        "rev": "78a253543d466ac511a1664a3e6aff032ca684d5",
-        "revCount": 61757,
-        "submodules": true,
-        "type": "git",
-        "url": "https://gitlab.haskell.org/ghc/ghc"
+        "lastModified": 1655245309,
+        "narHash": "sha256-d/YPoQ/vFn1+GTmSdvbSBSTOai61FONxB4+Lt6w/IVI=",
+        "owner": "tweag",
+        "repo": "gomod2nix",
+        "rev": "40d32f82fc60d66402eb0972e6e368aeab3faf58",
+        "type": "github"
      },
      "original": {
-        "ref": "ghc-9.8",
-        "submodules": true,
-        "type": "git",
-        "url": "https://gitlab.haskell.org/ghc/ghc"
-      }
-    },
-    "ghc99": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1726585445,
-        "narHash": "sha256-IdwQBex4boY6s0Plj5+ixf36rfYSUyMdTWrztKvZH30=",
-        "ref": "refs/heads/master",
-        "rev": "7fd9e5e29ab54eb406880077463e8552e2ddd39a",
-        "revCount": 67238,
-        "submodules": true,
-        "type": "git",
-        "url": "https://gitlab.haskell.org/ghc/ghc"
-      },
-      "original": {
-        "submodules": true,
-        "type": "git",
-        "url": "https://gitlab.haskell.org/ghc/ghc"
+        "owner": "tweag",
+        "repo": "gomod2nix",
+        "type": "github"
      }
    },
    "hackage": {
      "flake": false,
      "locked": {
-        "lastModified": 1702513363,
-        "narHash": "sha256-kloro9uEe8aYhPMoMjVNq2rfrXNgMOZhOPwVH5DH2K0=",
+        "lastModified": 1702340598,
+        "narHash": "sha256-CC0HI+6iKPtH+8r/ZfcpW5v/OYvL7zMwpr0xfkXV1zU=",
        "owner": "input-output-hk",
        "repo": "hackage.nix",
-        "rev": "a9d931d0398da67846fa257922a924829233cb91",
+        "rev": "24617c569995e38bf3b83b48eec6628a50fdb4fb",
        "type": "github"
      },
      "original": {
@@ -214,43 +309,33 @@
        "cabal-36": "cabal-36",
        "cardano-shell": "cardano-shell",
        "flake-compat": "flake-compat",
+        "flake-utils": "flake-utils_2",
        "ghc-8.6.5-iohk": "ghc-8.6.5-iohk",
-        "ghc98X": "ghc98X",
-        "ghc99": "ghc99",
        "hackage": [
          "hackage"
        ],
-        "hls-1.10": "hls-1.10",
-        "hls-2.0": "hls-2.0",
-        "hls-2.2": "hls-2.2",
-        "hls-2.3": "hls-2.3",
-        "hls-2.4": "hls-2.4",
-        "hls-2.5": "hls-2.5",
-        "hls-2.6": "hls-2.6",
        "hpc-coveralls": "hpc-coveralls",
        "hydra": "hydra",
        "iserv-proxy": "iserv-proxy",
        "nixpkgs": [
-          "haskellNix",
-          "nixpkgs-unstable"
+          "nixpkgs"
        ],
        "nixpkgs-2003": "nixpkgs-2003",
        "nixpkgs-2105": "nixpkgs-2105",
        "nixpkgs-2111": "nixpkgs-2111",
        "nixpkgs-2205": "nixpkgs-2205",
        "nixpkgs-2211": "nixpkgs-2211",
-        "nixpkgs-2305": "nixpkgs-2305",
-        "nixpkgs-2311": "nixpkgs-2311",
        "nixpkgs-unstable": "nixpkgs-unstable",
        "old-ghc-nix": "old-ghc-nix",
-        "stackage": "stackage"
+        "stackage": "stackage",
+        "tullia": "tullia"
      },
      "locked": {
-        "lastModified": 1705833500,
-        "narHash": "sha256-rUIr6JNbCedt1g4gVYVvE9t0oFU6FUspCA0DS5cA8Bg=",
+        "lastModified": 1677975916,
+        "narHash": "sha256-dbe8lEEPyfzjdRwpePClv7J9p9lQg7BwbBqAMCw4RLw=",
        "owner": "input-output-hk",
        "repo": "haskell.nix",
-        "rev": "d0c35e75cbbc6858770af42ac32b0b85495fbd71",
+        "rev": "ab5efd87ce3fd8ade38a01d97693d29a4f1ae7e4",
        "type": "github"
      },
      "original": {
@@ -260,125 +345,6 @@
        "type": "github"
      }
    },
-    "hls-1.10": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1680000865,
-        "narHash": "sha256-rc7iiUAcrHxwRM/s0ErEsSPxOR3u8t7DvFeWlMycWgo=",
-        "owner": "haskell",
-        "repo": "haskell-language-server",
-        "rev": "b08691db779f7a35ff322b71e72a12f6e3376fd9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "haskell",
-        "ref": "1.10.0.0",
-        "repo": "haskell-language-server",
-        "type": "github"
-      }
-    },
-    "hls-2.0": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1687698105,
-        "narHash": "sha256-OHXlgRzs/kuJH8q7Sxh507H+0Rb8b7VOiPAjcY9sM1k=",
-        "owner": "haskell",
-        "repo": "haskell-language-server",
-        "rev": "783905f211ac63edf982dd1889c671653327e441",
-        "type": "github"
-      },
-      "original": {
-        "owner": "haskell",
-        "ref": "2.0.0.1",
-        "repo": "haskell-language-server",
-        "type": "github"
-      }
-    },
-    "hls-2.2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1693064058,
-        "narHash": "sha256-8DGIyz5GjuCFmohY6Fa79hHA/p1iIqubfJUTGQElbNk=",
-        "owner": "haskell",
-        "repo": "haskell-language-server",
-        "rev": "b30f4b6cf5822f3112c35d14a0cba51f3fe23b85",
-        "type": "github"
-      },
-      "original": {
-        "owner": "haskell",
-        "ref": "2.2.0.0",
-        "repo": "haskell-language-server",
-        "type": "github"
-      }
-    },
-    "hls-2.3": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1695910642,
-        "narHash": "sha256-tR58doOs3DncFehHwCLczJgntyG/zlsSd7DgDgMPOkI=",
-        "owner": "haskell",
-        "repo": "haskell-language-server",
-        "rev": "458ccdb55c9ea22cd5d13ec3051aaefb295321be",
-        "type": "github"
-      },
-      "original": {
-        "owner": "haskell",
-        "ref": "2.3.0.0",
-        "repo": "haskell-language-server",
-        "type": "github"
-      }
-    },
-    "hls-2.4": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1699862708,
-        "narHash": "sha256-YHXSkdz53zd0fYGIYOgLt6HrA0eaRJi9mXVqDgmvrjk=",
-        "owner": "haskell",
-        "repo": "haskell-language-server",
-        "rev": "54507ef7e85fa8e9d0eb9a669832a3287ffccd57",
-        "type": "github"
-      },
-      "original": {
-        "owner": "haskell",
-        "ref": "2.4.0.1",
-        "repo": "haskell-language-server",
-        "type": "github"
-      }
-    },
-    "hls-2.5": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1701080174,
-        "narHash": "sha256-fyiR9TaHGJIIR0UmcCb73Xv9TJq3ht2ioxQ2mT7kVdc=",
-        "owner": "haskell",
-        "repo": "haskell-language-server",
-        "rev": "27f8c3d3892e38edaef5bea3870161815c4d014c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "haskell",
-        "ref": "2.5.0.0",
-        "repo": "haskell-language-server",
-        "type": "github"
-      }
-    },
-    "hls-2.6": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1705325287,
-        "narHash": "sha256-+P87oLdlPyMw8Mgoul7HMWdEvWP/fNlo8jyNtwME8E8=",
-        "owner": "haskell",
-        "repo": "haskell-language-server",
-        "rev": "6e0b342fa0327e628610f2711f8c3e4eaaa08b1e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "haskell",
-        "ref": "2.6.0.0",
-        "repo": "haskell-language-server",
-        "type": "github"
-      }
-    },
    "hpc-coveralls": {
      "flake": false,
      "locked": {
@@ -418,14 +384,37 @@
        "type": "indirect"
      }
    },
+    "incl": {
+      "inputs": {
+        "nixlib": [
+          "haskellNix",
+          "tullia",
+          "std",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1669263024,
+        "narHash": "sha256-E/+23NKtxAqYG/0ydYgxlgarKnxmDbg6rCMWnOBqn9Q=",
+        "owner": "divnix",
+        "repo": "incl",
+        "rev": "ce7bebaee048e4cd7ebdb4cee7885e00c4e2abca",
+        "type": "github"
+      },
+      "original": {
+        "owner": "divnix",
+        "repo": "incl",
+        "type": "github"
+      }
+    },
    "iserv-proxy": {
      "flake": false,
      "locked": {
-        "lastModified": 1707968597,
-        "narHash": "sha256-C53NqToxl+n9s1pQ0iLtiH6P5vX3rM+NW/mFt4Ykpsk=",
+        "lastModified": 1670983692,
+        "narHash": "sha256-avLo34JnI9HNyOuauK5R69usJm+GfW3MlyGlYxZhTgY=",
        "ref": "hkm/remote-iserv",
-        "rev": "1b7f8aeb37bbc7c00f04e44d9379aa15a4409e8b",
-        "revCount": 18,
+        "rev": "50d0abb3317ac439a4e7495b185a64af9b7b9300",
+        "revCount": 10,
        "type": "git",
        "url": "https://gitlab.haskell.org/hamishmack/iserv-proxy.git"
      },
@@ -451,22 +440,32 @@
        "type": "github"
      }
    },
-    "mac2ios": {
+    "n2c": {
      "inputs": {
-        "flake-parts": "flake-parts",
-        "nixpkgs": "nixpkgs_2"
+        "flake-utils": [
+          "haskellNix",
+          "tullia",
+          "std",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "haskellNix",
+          "tullia",
+          "std",
+          "nixpkgs"
+        ]
      },
      "locked": {
-        "lastModified": 1699767871,
-        "narHash": "sha256-kxeCUfwC/Vgh2FvVMlBUq0eVx1JvfHyN+5MPKUik9mE=",
-        "owner": "zw3rk",
-        "repo": "mobile-core-tools",
-        "rev": "4dcb77d5ea896d749381806dfab5358851b08951",
+        "lastModified": 1665039323,
+        "narHash": "sha256-SAh3ZjFGsaCI8FRzXQyp56qcGdAqgKEfJWPCQ0Sr7tQ=",
+        "owner": "nlewo",
+        "repo": "nix2container",
+        "rev": "b008fe329ffb59b67bf9e7b08ede6ee792f2741a",
        "type": "github"
      },
      "original": {
-        "owner": "zw3rk",
-        "repo": "mobile-core-tools",
+        "owner": "nlewo",
+        "repo": "nix2container",
        "type": "github"
      }
    },
@@ -491,6 +490,95 @@
        "type": "github"
      }
    },
+    "nix-nomad": {
+      "inputs": {
+        "flake-compat": "flake-compat_2",
+        "flake-utils": [
+          "haskellNix",
+          "tullia",
+          "nix2container",
+          "flake-utils"
+        ],
+        "gomod2nix": "gomod2nix",
+        "nixpkgs": [
+          "haskellNix",
+          "tullia",
+          "nixpkgs"
+        ],
+        "nixpkgs-lib": [
+          "haskellNix",
+          "tullia",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1658277770,
+        "narHash": "sha256-T/PgG3wUn8Z2rnzfxf2VqlR1CBjInPE0l1yVzXxPnt0=",
+        "owner": "tristanpemble",
+        "repo": "nix-nomad",
+        "rev": "054adcbdd0a836ae1c20951b67ed549131fd2d70",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tristanpemble",
+        "repo": "nix-nomad",
+        "type": "github"
+      }
+    },
+    "nix2container": {
+      "inputs": {
+        "flake-utils": "flake-utils_3",
+        "nixpkgs": "nixpkgs_3"
+      },
+      "locked": {
+        "lastModified": 1658567952,
+        "narHash": "sha256-XZ4ETYAMU7XcpEeAFP3NOl9yDXNuZAen/aIJ84G+VgA=",
+        "owner": "nlewo",
+        "repo": "nix2container",
+        "rev": "60bb43d405991c1378baf15a40b5811a53e32ffa",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nlewo",
+        "repo": "nix2container",
+        "type": "github"
+      }
+    },
+    "nixago": {
+      "inputs": {
+        "flake-utils": [
+          "haskellNix",
+          "tullia",
+          "std",
+          "flake-utils"
+        ],
+        "nixago-exts": [
+          "haskellNix",
+          "tullia",
+          "std",
+          "blank"
+        ],
+        "nixpkgs": [
+          "haskellNix",
+          "tullia",
+          "std",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1661824785,
+        "narHash": "sha256-/PnwdWoO/JugJZHtDUioQp3uRiWeXHUdgvoyNbXesz8=",
+        "owner": "nix-community",
+        "repo": "nixago",
+        "rev": "8c1f9e5f1578d4b2ea989f618588d62a335083c3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixago",
+        "type": "github"
+      }
+    },
    "nixpkgs": {
      "locked": {
        "lastModified": 1657693803,
@@ -557,11 +645,11 @@
    },
    "nixpkgs-2205": {
      "locked": {
-        "lastModified": 1685573264,
-        "narHash": "sha256-Zffu01pONhs/pqH07cjlF10NnMDLok8ix5Uk4rhOnZQ=",
+        "lastModified": 1672580127,
+        "narHash": "sha256-3lW3xZslREhJogoOkjeZtlBtvFMyxHku7I/9IVehhT8=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "380be19fbd2d9079f677978361792cb25e8a3635",
+        "rev": "0874168639713f547c05947c76124f78441ea46c",
        "type": "github"
      },
      "original": {
@@ -573,11 +661,11 @@
    },
    "nixpkgs-2211": {
      "locked": {
-        "lastModified": 1688392541,
-        "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=",
+        "lastModified": 1675730325,
+        "narHash": "sha256-uNvD7fzO5hNlltNQUAFBPlcEjNG5Gkbhl/ROiX+GZU4=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b",
+        "rev": "b7ce17b1ebf600a72178f6302c77b6382d09323f",
        "type": "github"
      },
      "original": {
@@ -587,56 +675,6 @@
        "type": "github"
      }
    },
-    "nixpkgs-2305": {
-      "locked": {
-        "lastModified": 1705033721,
-        "narHash": "sha256-K5eJHmL1/kev6WuqyqqbS1cdNnSidIZ3jeqJ7GbrYnQ=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "a1982c92d8980a0114372973cbdfe0a307f1bdea",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-23.05-darwin",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-2311": {
-      "locked": {
-        "lastModified": 1719957072,
-        "narHash": "sha256-gvFhEf5nszouwLAkT9nWsDzocUTqLWHuL++dvNjMp9I=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "7144d6241f02d171d25fba3edeaf15e0f2592105",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-23.11-darwin",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-lib": {
-      "locked": {
-        "dir": "lib",
-        "lastModified": 1696019113,
-        "narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a",
-        "type": "github"
-      },
-      "original": {
-        "dir": "lib",
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
    "nixpkgs-regression": {
      "locked": {
        "lastModified": 1643052045,
@@ -655,36 +693,98 @@
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1694822471,
-        "narHash": "sha256-6fSDCj++lZVMZlyqOe9SIOL8tYSBz1bI8acwovRwoX8=",
+        "lastModified": 1675758091,
+        "narHash": "sha256-7gFSQbSVAFUHtGCNHPF7mPc5CcqDk9M2+inlVPZSneg=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "47585496bcb13fb72e4a90daeea2f434e2501998",
+        "rev": "747927516efcb5e31ba03b7ff32f61f6d47e7d87",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
        "repo": "nixpkgs",
-        "rev": "47585496bcb13fb72e4a90daeea2f434e2501998",
        "type": "github"
      }
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1698434055,
-        "narHash": "sha256-Phxi5mUKSoL7A0IYUiYtkI9e8NcGaaV5PJEaJApU1Ko=",
+        "lastModified": 1653581809,
+        "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "1a3c95e3b23b3cdb26750621c08cc2f1560cb883",
+        "rev": "83658b28fe638a170a19b8933aa008b30640fbd1",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
-        "ref": "nixos-23.05",
+        "ref": "nixos-unstable",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1654807842,
+        "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "fc909087cc3386955f21b4665731dbdaceefb1d8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1665087388,
+        "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "95fda953f6db2e9496d2682c4fc7b82f959878f7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_5": {
+      "locked": {
+        "lastModified": 1676726892,
+        "narHash": "sha256-M7OYVR6dKmzmlebIjybFf3l18S2uur8lMyWWnHQooLY=",
+        "owner": "angerman",
+        "repo": "nixpkgs",
+        "rev": "729469087592bdea58b360de59dadf6d58714c42",
+        "type": "github"
+      },
+      "original": {
+        "owner": "angerman",
+        "ref": "release-22.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nosys": {
+      "locked": {
+        "lastModified": 1667881534,
+        "narHash": "sha256-FhwJ15uPLRsvaxtt/bNuqE/ykMpNAPF0upozFKhTtXM=",
+        "owner": "divnix",
+        "repo": "nosys",
+        "rev": "2d0d5207f6a230e9d0f660903f8db9807b54814f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "divnix",
+        "repo": "nosys",
+        "type": "github"
+      }
+    },
    "old-ghc-nix": {
      "flake": false,
      "locked": {
@@ -707,21 +807,17 @@
        "flake-utils": "flake-utils",
        "hackage": "hackage",
        "haskellNix": "haskellNix",
-        "mac2ios": "mac2ios",
-        "nixpkgs": [
-          "haskellNix",
-          "nixpkgs-2305"
-        ]
+        "nixpkgs": "nixpkgs_5"
      }
    },
    "stackage": {
      "flake": false,
      "locked": {
-        "lastModified": 1726532152,
-        "narHash": "sha256-LRXbVY3M2S8uQWdwd2zZrsnVPEvt2GxaHGoy8EFFdJA=",
+        "lastModified": 1677888571,
+        "narHash": "sha256-YkhRNOaN6QVagZo1cfykYV8KqkI8/q6r2F5+jypOma4=",
        "owner": "input-output-hk",
        "repo": "stackage.nix",
-        "rev": "c77b3530cebad603812cb111c6f64968c2d2337d",
+        "rev": "cb50e6fabdfb2d7e655059039012ad0623f06a27",
        "type": "github"
      },
      "original": {
@@ -730,18 +826,110 @@
        "type": "github"
      }
    },
-    "systems": {
+    "std": {
+      "inputs": {
+        "arion": [
+          "haskellNix",
+          "tullia",
+          "std",
+          "blank"
+        ],
+        "blank": "blank",
+        "devshell": "devshell",
+        "dmerge": "dmerge",
+        "flake-utils": "flake-utils_4",
+        "incl": "incl",
+        "makes": [
+          "haskellNix",
+          "tullia",
+          "std",
+          "blank"
+        ],
+        "microvm": [
+          "haskellNix",
+          "tullia",
+          "std",
+          "blank"
+        ],
+        "n2c": "n2c",
+        "nixago": "nixago",
+        "nixpkgs": "nixpkgs_4",
+        "nosys": "nosys",
+        "yants": "yants"
+      },
      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "lastModified": 1674526466,
+        "narHash": "sha256-tMTaS0bqLx6VJ+K+ZT6xqsXNpzvSXJTmogkraBGzymg=",
+        "owner": "divnix",
+        "repo": "std",
+        "rev": "516387e3d8d059b50e742a2ff1909ed3c8f82826",
        "type": "github"
      },
      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
+        "owner": "divnix",
+        "repo": "std",
+        "type": "github"
+      }
+    },
+    "tullia": {
+      "inputs": {
+        "nix-nomad": "nix-nomad",
+        "nix2container": "nix2container",
+        "nixpkgs": [
+          "haskellNix",
+          "nixpkgs"
+        ],
+        "std": "std"
+      },
+      "locked": {
+        "lastModified": 1675695930,
+        "narHash": "sha256-B7rEZ/DBUMlK1AcJ9ajnAPPxqXY6zW2SBX+51bZV0Ac=",
+        "owner": "input-output-hk",
+        "repo": "tullia",
+        "rev": "621365f2c725608f381b3ad5b57afef389fd4c31",
+        "type": "github"
+      },
+      "original": {
+        "owner": "input-output-hk",
+        "repo": "tullia",
+        "type": "github"
+      }
+    },
+    "utils": {
+      "locked": {
+        "lastModified": 1653893745,
+        "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "yants": {
+      "inputs": {
+        "nixpkgs": [
+          "haskellNix",
+          "tullia",
+          "std",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1667096281,
+        "narHash": "sha256-wRRec6ze0gJHmGn6m57/zhz/Kdvp9HS4Nl5fkQ+uIuA=",
+        "owner": "divnix",
+        "repo": "yants",
+        "rev": "d18f356ec25cb94dc9c275870c3a7927a10f8c3c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "divnix",
+        "repo": "yants",
        "type": "github"
      }
    }
@@ -1,15 +1,15 @@
 {
  description = "nix flake for simplex-chat";
+  inputs.nixpkgs.url = "github:angerman/nixpkgs/release-22.11";
  inputs.haskellNix.url = "github:input-output-hk/haskell.nix/armv7a";
-  inputs.nixpkgs.follows = "haskellNix/nixpkgs-2305";
-  inputs.mac2ios.url = "github:zw3rk/mobile-core-tools";
+  inputs.haskellNix.inputs.nixpkgs.follows = "nixpkgs";
  inputs.hackage = {
    url = "github:input-output-hk/hackage.nix";
    flake = false;
  };
  inputs.haskellNix.inputs.hackage.follows = "hackage";
  inputs.flake-utils.url = "github:numtide/flake-utils";
-  outputs = { self, haskellNix, nixpkgs, flake-utils, mac2ios, ... }:
+  outputs = { self, haskellNix, nixpkgs, flake-utils, ... }:
    let systems = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; in
    flake-utils.lib.eachSystem systems (system:
      # this android26 overlay makes the pkgsCross.{aarch64-android,armv7a-android-prebuilt} to set stdVer to 26 (Android 8).
@@ -30,7 +30,7 @@
      # `appendOverlays` with a singleton is identical to `extend`.
      let pkgs = haskellNix.legacyPackages.${system}.appendOverlays [android26]; in
      let drv' = { extra-modules, pkgs', ... }: pkgs'.haskell-nix.project {
-        compiler-nix-name = "ghc963";
+        compiler-nix-name = "ghc8107";
        index-state = "2023-12-12T00:00:00Z";
        # We need this, to specify we want the cabal project.
        # If the stack.yaml was dropped, this would not be necessary.
@@ -40,12 +40,9 @@
          src = ./.;
        };
        sha256map = import ./scripts/nix/sha256map.nix;
-        modules = [
-        ({ pkgs, lib, ...}: lib.mkIf (!pkgs.stdenv.hostPlatform.isWindows) {
-          # This patch adds `dl` as an extra-library to direct-sqlciper, which is needed
-          # on pretty much all unix platforms, but then blows up on windows m(
+        modules = [{
          packages.direct-sqlcipher.patches = [ ./scripts/nix/direct-sqlcipher-2.3.27.patch ];
-        })
+        }
        ({ pkgs,lib, ... }: lib.mkIf (pkgs.stdenv.hostPlatform.isAndroid) {
          packages.simplex-chat.components.library.ghcOptions = [ "-pie" ];
        })] ++ extra-modules;
@@ -67,9 +64,6 @@
      }); in
      let iosPostInstall = bundleName: ''
        ${pkgs.tree}/bin/tree $out
-        mkdir tmp
-        find ./dist -name "libHS*-ghc*.a" -exec cp {} tmp \;
-        (cd tmp; ${pkgs.tree}/bin/tree .; ar x libHS*.a; for o in *.o; do if /usr/bin/otool -xv $o|grep ldadd ; then echo $o; fi; done; cd ..; rm -fR tmp)
        mkdir -p $out/_pkg
        # copy over includes, we might want those, but maybe not.
        # cp -r $out/lib/*/*/include $out/_pkg/
@@ -80,18 +74,6 @@
        find ${pkgs.gmp6.override { withStatic = true; }}/lib -name "*.a" -exec cp {} $out/_pkg \;
        # There is no static libc
        ${pkgs.tree}/bin/tree $out/_pkg
-        for pkg in $out/_pkg/*.a; do
-          chmod +w $pkg
-          ${mac2ios.packages.${system}.mac2ios}/bin/mac2ios $pkg
-          chmod -w $pkg
-        done
-
-        mkdir tmp
-        find $out/_pkg -name "libHS*-ghc*.a" -exec cp {} tmp \;
-        (cd tmp; ${pkgs.tree}/bin/tree .; ar x libHS*.a; for o in *.o; do if /usr/bin/otool -xv $o|grep ldadd ; then echo $o; fi; done; cd ..; rm -fR tmp)
-
-        sha256sum $out/_pkg/*.a
-
        (cd $out/_pkg; ${pkgs.zip}/bin/zip -r -9 $out/${bundleName}.zip *)
        rm -fR $out/_pkg
        mkdir -p $out/nix-support
@@ -137,150 +119,13 @@
                      hardeningDisable = [ "fortify" ];
                  }
              );in {
-              # STATIC x86_64-linux
              "${pkgs.pkgsCross.musl64.hostPlatform.system}-static:exe:simplex-chat" = (drv pkgs.pkgsCross.musl64).simplex-chat.components.exes.simplex-chat;
-              # STATIC i686-linux
-              "${pkgs.pkgsCross.musl32.hostPlatform.system}-static:exe:simplex-chat" = (drv' {
-                pkgs' = pkgs.pkgsCross.musl32;
-                extra-modules = [{
-                  # 32 bit patches
-                  packages.basement.patches = [
-                    ./scripts/nix/basement-pr-573.patch
-                  ];
-                  packages.memory.patches = [
-                    ./scripts/nix/memory-pr-99.patch
-                  ];
-                }];
-              }).simplex-chat.components.exes.simplex-chat;
-              # WINDOWS x86_64-mingwW64
-              "${pkgs.pkgsCross.mingwW64.hostPlatform.system}:exe:simplex-chat" = (drv' {
-                pkgs' = pkgs.pkgsCross.mingwW64;
-                extra-modules = [{
-                  packages.direct-sqlcipher.flags.openssl = true;
-                  packages.bitvec.flags.simd = false;
-                  packages.direct-sqlcipher.patches = [
-                    ./scripts/nix/direct-sqlcipher-2.3.27-win.patch
-                  ];
-                  packages.direct-sqlcipher.components.library.libs = pkgs.lib.mkForce [
-                    (pkgs.pkgsCross.mingwW64.openssl) #.override) # { static = true; enableKTLS = false; })
-                  ];
-                  packages.simplexmq.components.library.libs = pkgs.lib.mkForce [
-                    (pkgs.pkgsCross.mingwW64.openssl) #.override) # { static = true; enableKTLS = false; })
-                  ];
-                  packages.unix-time.postPatch = ''
-                    sed -i 's/mingwex//g' unix-time.cabal
-                  '';
-                 }];
-                }).simplex-chat.components.exes.simplex-chat.override {
-                postInstall = ''
-                  set -x
-                  ${pkgs.tree}/bin/tree $out
-                  mkdir -p $out/_pkg
-                  cp $out/bin/* $out/_pkg
-                  ${pkgs.tree}/bin/tree $out/_pkg
-                  (cd $out/_pkg; ${pkgs.zip}/bin/zip -r -9 $out/${pkgs.pkgsCross.mingwW64.hostPlatform.system}-simplex-chat.zip *)
-                  rm -fR $out/_pkg
-                  mkdir -p $out/nix-support
-                  echo "file binary-dist \"$(echo $out/*.zip)\"" \
-                      > $out/nix-support/hydra-build-products
-                '';
-              };
-              "${pkgs.pkgsCross.mingwW64.hostPlatform.system}:lib:simplex-chat" = (drv' rec {
-                pkgs' = pkgs.pkgsCross.mingwW64;
-                extra-modules = [{
-                  packages.direct-sqlcipher.flags.openssl = true;
-                  # simd will try to read __cpu_model, which we don't expose
-                  # from the rts (yet!).
-                  packages.bitvec.flags.simd = false;
-                  packages.direct-sqlcipher.patches = [
-                    ./scripts/nix/direct-sqlcipher-2.3.27-win.patch
-                  ];
-                  packages.direct-sqlcipher.components.library.libs = pkgs.lib.mkForce [
-                    pkgs.pkgsCross.mingwW64.openssl
-                  ];
-                  packages.simplexmq.flags.client_library = true;
-                  packages.simplexmq.components.library.libs = pkgs.lib.mkForce [
-                    pkgs.pkgsCross.mingwW64.openssl
-                  ];
-                  packages.unix-time.postPatch = ''
-                    sed -i 's/mingwex//g' unix-time.cabal
-                  '';
-                }];
-              }).simplex-chat.components.library
-              .override (p: {
-                # enableShared = false;
-                setupBuildFlags = p.component.setupBuildFlags ++ map (x: "--ghc-option=${x}") [
-                  "-shared"
-                  "-threaded"
-                  "-o" "libsimplex.dll"
-                  # "-optl-lHSrts_thr"
-                  "-optl-lffi"
-                  # "-optl-static-libgcc"
-                  # We can't do -optl-static-libstdc++ with gcc. g++ might
-                  # but then we are chaning the compiler altogether.
-                  "${./libsimplex.dll.def}"
-                ];
-                postInstall = ''
-                  set -x
-                  function deps() {
-                    ${pkgs.binutils}/bin/strings "$1" | grep '.\.dll'|grep -v -E 'Winsock|ADVAPI32|dbghelp|KERNEL32|msvcrt|ntdll|ole32|RPCRT4|SHELL32|USER32|WINMM|WS2_32|kernel32|GDI32'|grep -v "$1"
-                  }
-                  ${pkgs.tree}/bin/tree $out
-                  mkdir -p $out/_pkg
-                  cp libsimplex.dll $out/_pkg
-                  cp libsimplex.dll.a $out/_pkg
-                  mkdir $out/libs
-                  find ${pkgs.lib.getBin pkgs.pkgsCross.mingwW64.openssl}             -name "*.dll" -exec cp {} $out/libs \;
-                  find ${pkgs.lib.getBin pkgs.pkgsCross.mingwW64.libffi}              -name "*.dll" -exec cp {} $out/libs \;
-                  find ${pkgs.lib.getBin pkgs.pkgsCross.mingwW64.gmp}                 -name "*.dll" -exec cp {} $out/libs \;
-                  find ${pkgs.lib.getBin pkgs.pkgsCross.mingwW64.stdenv.cc.cc}        -name "*.dll" -exec cp {} $out/libs \;
-                  find ${pkgs.lib.getBin pkgs.pkgsCross.mingwW64.windows.mcfgthreads} -name "*.dll" -exec cp {} $out/libs \;
-
-                  pushd $out/_pkg
-                  function copyDeps() {
-                    for dep in $(deps "$1"); do
-                      if [ ! -f "$dep" ]; then
-                        if [ ! -f ../libs/"$dep" ]; then
-                          echo "WARN: $1 -> $dep not found!"
-                        else
-                          cp ../libs/"$dep" .
-                          copyDeps "$dep"
-                        fi
-                      fi
-                    done
-                  }
-                  copyDeps libsimplex.dll
-                  popd
-                  ${pkgs.tree}/bin/tree $out/_pkg
-                  (cd $out/_pkg; ${pkgs.zip}/bin/zip -r -9 $out/pkg-${pkgs.pkgsCross.mingwW64.hostPlatform.system}-libsimplex.zip *)
-                  rm -fR $out/_pkg
-                  mkdir -p $out/nix-support
-                  echo "file binary-dist \"$(echo $out/*.zip)\"" \
-                      > $out/nix-support/hydra-build-products
-                '';
-              });
+              "${pkgs.pkgsCross.musl32.hostPlatform.system}-static:exe:simplex-chat" = (drv pkgs.pkgsCross.musl32).simplex-chat.components.exes.simplex-chat;
              # "${pkgs.pkgsCross.muslpi.hostPlatform.system}-static:exe:simplex-chat" = (drv pkgs.pkgsCross.muslpi).simplex-chat.components.exes.simplex-chat;
-
-              # STATIC aarch64-linux
              "${pkgs.pkgsCross.aarch64-multiplatform-musl.hostPlatform.system}-static:exe:simplex-chat" = (drv pkgs.pkgsCross.aarch64-multiplatform-musl).simplex-chat.components.exes.simplex-chat;
-              "armv7a-android:lib:support" = (drv android32Pkgs).android-support.components.library.override (p: {
-                smallAddressSpace = true;
-                # we won't want -dyamic (see aarch64-android:lib:simplex-chat)
-                enableShared = false;
-                # we also do not want to have any dependencies listed (especially no rts!)
-                enableStatic = false;
-
-                # This used to work with 8.10.7...
-                # setupBuildFlags = p.component.setupBuildFlags ++ map (x: "--ghc-option=${x}") [ "-shared" "-o" "libsupport.so" ];
-                # ... but now with 9.6+
-                # we have to do the -shared thing by hand.
-                postBuild = ''
-                  armv7a-unknown-linux-androideabi-ghc -shared -o libsupport.so \
-                    -optl-Wl,-u,setLineBuffering \
-                    -optl-Wl,-u,pipe_std_to_socket \
-                    dist/build/*.a
-                '';
-
+              "armv7a-android:lib:support" = (drv android32Pkgs).android-support.components.library.override {
+                smallAddressSpace = true; enableShared = false;
+                setupBuildFlags = map (x: "--ghc-option=${x}") [ "-shared" "-o" "libsupport.so" ];
                postInstall = ''

                  mkdir -p $out/_pkg
@@ -293,29 +138,14 @@
                  echo "file binary-dist \"$(echo $out/*.zip)\"" \
                        > $out/nix-support/hydra-build-products
                '';
-              });
-              # The android-support package is at
-              # https://github.com/simplex-chat/android-support
-              "aarch64-android:lib:support" = (drv androidPkgs).android-support.components.library.override (p: {
-                smallAddressSpace = true;
-                # no -dynamic
-                enableShared = false;
-                # but also no -staticlib
-                enableStatic = false;
-
-                # we have to do the -shared thing by hand.
-                postBuild = ''
-                  aarch64-unknown-linux-android-ghc -shared -o libsupport.so \
-                    -optl-Wl,-u,setLineBuffering \
-                    -optl-Wl,-u,pipe_std_to_socket \
-                    dist/build/*.a
-                '';
-
+              };
+              "aarch64-android:lib:support" = (drv androidPkgs).android-support.components.library.override {
+                smallAddressSpace = true; enableShared = false;
+                setupBuildFlags = map (x: "--ghc-option=${x}") [ "-shared" "-o" "libsupport.so" ];
                postInstall = ''

                  mkdir -p $out/_pkg
                  cp libsupport.so $out/_pkg
-                  ls -lah $out/_pkg/*
                  ${pkgs.patchelf}/bin/patchelf --remove-needed libunwind.so.1 $out/_pkg/libsupport.so
                  (cd $out/_pkg; ${pkgs.zip}/bin/zip -r -9 $out/pkg-aarch64-android-libsupport.zip *)
                  rm -fR $out/_pkg
@@ -324,11 +154,10 @@
                  echo "file binary-dist \"$(echo $out/*.zip)\"" \
                        > $out/nix-support/hydra-build-products
                '';
-              });
+              };
              "armv7a-android:lib:simplex-chat" = (drv' {
                pkgs' = android32Pkgs;
                extra-modules = [{
-                  packages.text.flags.simdutf = false;
                  packages.direct-sqlcipher.flags.openssl = true;
                  packages.direct-sqlcipher.components.library.libs = pkgs.lib.mkForce [
                    (android32Pkgs.openssl.override { static = true; enableKTLS = false; })
@@ -340,56 +169,13 @@
                  packages.simplexmq.components.library.libs = pkgs.lib.mkForce [
                    (android32Pkgs.openssl.override { static = true; enableKTLS = false; })
                  ];
-                  # 32 bit patches
-                  packages.basement.patches = [
-                    ./scripts/nix/basement-pr-573.patch
-                  ];
-                  packages.memory.patches = [
-                    ./scripts/nix/memory-pr-99.patch
-                  ];
                }];
-              }).simplex-chat.components.library.override (p: {
-                smallAddressSpace = true;
-                # we want -shared, but not -dyanmic, hence `enableShared = false`.
-                enableShared = false;
-                # we _do_ want rts, and other libs. Hence `enableStatic = true`.
-                enableStatic = true;
+              }).simplex-chat.components.library.override {
+                smallAddressSpace = true; enableShared = false;
                # for android we build a shared library, passing these arguments is a bit tricky, as
                # we want only the threaded rts (HSrts_thr) and ffi to be linked, but not fed into iserv for
                # template haskell cross compilation. Thus we just pass them as linker options (-optl).
-                setupBuildFlags = p.component.setupBuildFlags
-                # flags to tell GHC we want to produce a -shared object, and we want to also link
-                # - the ffi library (ffi)
-                ++ map (x: "--ghc-option=${x}") [
-                  "-shared" "-o" "libsimplex.so"
-                  "-threaded"
-                  # "-debug"
-                  "-optl-lffi"
-                ]
-                # This is fairly idiotic. LLD will strip out foreign exported
-                # symbols (a GHC bug? Codegen bug?). So we need to pass `-u <sym>`
-                # to ensure they stay in the produced library. Having them
-                # _undefined_ and _lazy_ (lld will tell with -y <sym> that the
-                # symbol is lazy), makes them _defined_. m(
-                ++ map (sym: "--ghc-option=-optl-Wl,-u,${sym}") [
-                  "chat_close_store"
-                  "chat_decrypt_file"
-                  "chat_decrypt_media"
-                  "chat_encrypt_file"
-                  "chat_encrypt_media"
-                  "chat_migrate_init"
-                  "chat_parse_markdown"
-                  "chat_parse_server"
-                  "chat_password_hash"
-                  "chat_read_file"
-                  "chat_recv_msg"
-                  "chat_recv_msg_wait"
-                  "chat_send_cmd"
-                  "chat_send_remote_cmd"
-                  "chat_valid_name"
-                  "chat_json_length"
-                  "chat_write_file"
-                ];
+                setupBuildFlags = map (x: "--ghc-option=${x}") [ "-shared" "-o" "libsimplex.so" "-optl-lHSrts_thr" "-optl-lffi"];
                postInstall = ''
                  set -x
                  ${pkgs.tree}/bin/tree $out
@@ -433,11 +219,10 @@
                  echo "file binary-dist \"$(echo $out/*.zip)\"" \
                      > $out/nix-support/hydra-build-products
                '';
-              });
+              };
              "aarch64-android:lib:simplex-chat" = (drv' {
                pkgs' = androidPkgs;
                extra-modules = [{
-                  packages.text.flags.simdutf = false;
                  packages.direct-sqlcipher.flags.openssl = true;
                  packages.direct-sqlcipher.components.library.libs = pkgs.lib.mkForce [
                    (androidPkgs.openssl.override { static = true; })
@@ -450,50 +235,12 @@
                    (androidPkgs.openssl.override { static = true; })
                  ];
                }];
-              }).simplex-chat.components.library.override (p: {
-                smallAddressSpace = true;
-                # we do not want a dynamically linked object, even though we _do_
-                # want to produce a _shared_ object. But `shared` implied -dyanmic
-                # with cabal, so we disable and pass `-shared` explicitly.
-                enableShared = false;
-                # we do want static (e.g. pass all dependencies in, so we get -staticlib)
-                enableStatic = true;
+              }).simplex-chat.components.library.override {
+                smallAddressSpace = true; enableShared = false;
                # for android we build a shared library, passing these arguments is a bit tricky, as
                # we want only the threaded rts (HSrts_thr) and ffi to be linked, but not fed into iserv for
                # template haskell cross compilation. Thus we just pass them as linker options (-optl).
-                setupBuildFlags = p.component.setupBuildFlags
-                # flags to tell GHC we want to produce a -shared object, and we want to also link
-                # - the ffi library (ffi)
-                ++ map (x: "--ghc-option=${x}") [
-                  "-shared" "-o" "libsimplex.so"
-                  "-threaded"
-                  # "-debug"
-                  "-optl-lffi"
-                ]
-                # This is fairly idiotic. LLD will strip out foreign exported
-                # symbols (a GHC bug? Codegen bug?). So we need to pass `-u <sym>`
-                # to ensure they stay in the produced library. Having them
-                # _undefined_ and _lazy_ (lld will tell with -y <sym> that the
-                # symbol is lazy), makes them _defined_. m(
-                ++ map (sym: "--ghc-option=-optl-Wl,-u,${sym}") [
-                  "chat_close_store"
-                  "chat_decrypt_file"
-                  "chat_decrypt_media"
-                  "chat_encrypt_file"
-                  "chat_encrypt_media"
-                  "chat_migrate_init"
-                  "chat_parse_markdown"
-                  "chat_parse_server"
-                  "chat_password_hash"
-                  "chat_read_file"
-                  "chat_recv_msg"
-                  "chat_recv_msg_wait"
-                  "chat_send_cmd"
-                  "chat_send_remote_cmd"
-                  "chat_valid_name"
-                  "chat_json_length"
-                  "chat_write_file"
-                ];
+                setupBuildFlags = map (x: "--ghc-option=${x}") [ "-shared" "-o" "libsimplex.so" "-optl-lHSrts_thr" "-optl-lffi"];
                postInstall = ''
                  set -x
                  ${pkgs.tree}/bin/tree $out
@@ -537,7 +284,7 @@
                  echo "file binary-dist \"$(echo $out/*.zip)\"" \
                      > $out/nix-support/hydra-build-products
                '';
-              });
+              };
            };

            # builds for iOS and iOS simulator
@@ -552,8 +299,7 @@
                  packages.entropy.flags.DoNotGetEntropy = true;
                  packages.simplexmq.flags.client_library = true;
                  packages.simplexmq.components.library.libs = pkgs.lib.mkForce [
-                    # TODO: have a cross override for iOS, that sets this.
-                    ((pkgs.openssl.override { static = true; }).overrideDerivation (old: { CFLAGS = "-mcpu=apple-a7 -march=armv8-a+norcpc" ;}))
+                    (pkgs.openssl.override { static = true; })
                  ];
                }];
              }).simplex-chat.components.library.override (
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-security create-keychain -p "" simplex.keychain
-security set-keychain-settings -u simplex.keychain
-security add-certificates -k simplex.keychain "Developer ID Application: SimpleX Chat Ltd (5NN7GUYB6T).cer"
-security add-certificates -k simplex.keychain "Developer ID Certification Authority.cer"
-# Private key with access from any app
-security import "SimpleX Chat.p12" -P "" -k simplex.keychain -A
-# Public key
-security import "SimpleX Chat.pem" -k simplex.keychain
@@ -2,7 +2,7 @@

 set -e

-trap "rm apps/multiplatform/local.properties 2> /dev/null || true; rm local.properties 2> /dev/null || true; rm /tmp/simplex.keychain" EXIT
+trap "rm apps/multiplatform/local.properties || true; rm local.properties || true; rm /tmp/simplex.keychain || true" EXIT
 echo "desktop.mac.signing.identity=Developer ID Application: SimpleX Chat Ltd (5NN7GUYB6T)" >> apps/multiplatform/local.properties
 echo "desktop.mac.signing.keychain=/tmp/simplex.keychain" >> apps/multiplatform/local.properties
 echo "desktop.mac.notarization.apple_id=$APPLE_SIMPLEX_NOTARIZATION_APPLE_ID" >> apps/multiplatform/local.properties
@@ -10,10 +10,6 @@ echo "desktop.mac.notarization.password=$APPLE_SIMPLEX_NOTARIZATION_PASSWORD" >>
 echo "desktop.mac.notarization.team_id=5NN7GUYB6T" >> apps/multiplatform/local.properties
 echo "$APPLE_SIMPLEX_SIGNING_KEYCHAIN" | base64 --decode -o /tmp/simplex.keychain

-security unlock-keychain -p "" /tmp/simplex.keychain
-# Adding keychain to the list of keychains.
-# Otherwise, it can find cert but exits while signing with "error: The specified item could not be found in the keychain."
-security list-keychains -s `security list-keychains | xargs` /tmp/simplex.keychain
 scripts/desktop/build-lib-mac.sh
 cd apps/multiplatform
 ./gradlew packageDmg
@@ -8,7 +8,7 @@ function readlink() {

 OS=linux
 ARCH=${1:-`uname -a | rev | cut -d' ' -f2 | rev`}
-GHC_VERSION=9.6.3
+GHC_VERSION=8.10.7

 if [ "$ARCH" == "aarch64" ]; then
    COMPOSE_ARCH=arm64
@@ -25,7 +25,7 @@ for elem in "${exports[@]}"; do count=$(grep -R "$elem$" libsimplex.dll.def | wc
 for elem in "${exports[@]}"; do count=$(grep -R "\"$elem\"" flake.nix | wc -l); if [ $count -ne 2 ]; then echo Wrong exports in flake.nix. Add \"$elem\" in two places of the file; exit 1; fi ; done

 rm -rf $BUILD_DIR
-cabal build lib:simplex-chat --ghc-options='-optl-Wl,-rpath,$ORIGIN -flink-rts -threaded' --constraint 'simplexmq +client_library'
+cabal build lib:simplex-chat --ghc-options='-optl-Wl,-rpath,$ORIGIN' --ghc-options="-optl-L$(ghc --print-libdir)/rts -optl-Wl,--as-needed,-lHSrts_thr-ghc$GHC_VERSION" --constraint 'simplexmq +client_library'
 cd $BUILD_DIR/build
 #patchelf --add-needed libHSrts_thr-ghc${GHC_VERSION}.so libHSsimplex-chat-*-inplace-ghc${GHC_VERSION}.so
 #patchelf --add-rpath '$ORIGIN' libHSsimplex-chat-*-inplace-ghc${GHC_VERSION}.so
@@ -5,14 +5,13 @@ set -e
 OS=mac
 ARCH="${1:-`uname -a | rev | cut -d' ' -f1 | rev`}"
 COMPOSE_ARCH=$ARCH
-GHC_VERSION=9.6.3
+GHC_VERSION=8.10.7

 if [ "$ARCH" == "arm64" ]; then
    ARCH=aarch64
 else
    COMPOSE_ARCH=x64
 fi
-
 LIB_EXT=dylib
 LIB=libHSsimplex-chat-*-inplace-ghc*.$LIB_EXT
 GHC_LIBS_DIR=$(ghc --print-libdir)
@@ -24,26 +23,13 @@ for elem in "${exports[@]}"; do count=$(grep -R "$elem$" libsimplex.dll.def | wc
 for elem in "${exports[@]}"; do count=$(grep -R "\"$elem\"" flake.nix | wc -l); if [ $count -ne 2 ]; then echo Wrong exports in flake.nix. Add \"$elem\" in two places of the file; exit 1; fi ; done

 rm -rf $BUILD_DIR
-cabal build lib:simplex-chat lib:simplex-chat --ghc-options="-optl-Wl,-rpath,@loader_path -optl-Wl,-L$GHC_LIBS_DIR/$ARCH-osx-ghc-$GHC_VERSION -optl-lHSrts_thr-ghc$GHC_VERSION -optl-lffi" --constraint 'simplexmq +client_library'
+cabal build lib:simplex-chat lib:simplex-chat --ghc-options="-optl-Wl,-rpath,@loader_path -optl-Wl,-L$GHC_LIBS_DIR/rts -optl-lHSrts_thr-ghc8.10.7 -optl-lffi" --constraint 'simplexmq +client_library'

 cd $BUILD_DIR/build
 mkdir deps 2> /dev/null || true

 # It's not included by default for some reason. Compiled lib tries to find system one but it's not always available
-#cp $GHC_LIBS_DIR/libffi.dylib ./deps
-(
-  BUILD=$PWD
-  cp /tmp/libffi-3.4.4/*-apple-darwin*/.libs/libffi.dylib $BUILD/deps || \
-    ( \
-    cd /tmp && \
-    curl --tlsv1.2 "https://gitlab.haskell.org/ghc/libffi-tarballs/-/raw/libffi-3.4.4/libffi-3.4.4.tar.gz?inline=false" -o libffi.tar.gz && \
-    tar -xzvf libffi.tar.gz && \
-    cd "libffi-3.4.4" && \
-    ./configure && \
-    make && \
-    cp *-apple-darwin*/.libs/libffi.dylib $BUILD/deps \
-    )
-)
+cp $GHC_LIBS_DIR/rts/libffi.dylib ./deps

 DYLIBS=`otool -L $LIB | grep @rpath | tail -n +2 | cut -d' ' -f 1 | cut -d'/' -f2`
 RPATHS=`otool -l $LIB | grep "path "| cut -d' ' -f11`
@@ -84,8 +70,6 @@ function copy_deps() {
 }

 copy_deps $LIB
-# Special case
-cp $(ghc --print-libdir)/$ARCH-osx-ghc-$GHC_VERSION/libHSghc-boot-th-$GHC_VERSION-ghc$GHC_VERSION.dylib deps
 rm deps/`basename $LIB`

 cd -
@@ -1,242 +0,0 @@
-From 38be2c93acb6f459d24ed6c626981c35ccf44095 Mon Sep 17 00:00:00 2001
-From: Sylvain Henry <sylvain@haskus.fr>
-Date: Thu, 16 Feb 2023 15:40:45 +0100
-Subject: [PATCH] Fix build on 32-bit architectures
-
---
- Basement/Bits.hs                 |  4 ++++
- Basement/From.hs                 | 24 -----------------------
- Basement/Numerical/Additive.hs   |  4 ++++
- Basement/Numerical/Conversion.hs | 20 +++++++++++++++++++
- Basement/PrimType.hs             |  6 +++++-
- Basement/Types/OffsetSize.hs     | 22 +++++++++++++++++++--
- 6 files changed, 53 insertions(+), 27 deletions(-)
-
-diff --git a/Basement/Bits.hs b/Basement/Bits.hs
-index 7eeea0f5..24520ed7 100644
--- a/Basement/Bits.hs
-+++ b/Basement/Bits.hs
-@@ -54,8 +54,12 @@ import GHC.Int
- import Basement.Compat.Primitive
-
- #if WORD_SIZE_IN_BITS < 64
-+#if __GLASGOW_HASKELL__ >= 904
-+import GHC.Exts
-+#else
- import GHC.IntWord64
- #endif
-+#endif
-
- -- | operation over finite bits
- class FiniteBitsOps bits where
-diff --git a/Basement/From.hs b/Basement/From.hs
-index 7bbe141c..80014b3e 100644
--- a/Basement/From.hs
-+++ b/Basement/From.hs
-@@ -272,23 +272,11 @@ instance (NatWithinBound (CountOf ty) n, KnownNat n, PrimType ty)
-     tryFrom = BlockN.toBlockN . UArray.toBlock . BoxArray.mapToUnboxed id
-
- instance (KnownNat n, NatWithinBound Word8 n) => From (Zn64 n) Word8 where
-#if __GLASGOW_HASKELL__ >= 904
-    from = narrow . unZn64 where narrow (W64# w) = W8# (wordToWord8# (word64ToWord# (GHC.Prim.word64ToWord# w)))
-#else
-     from = narrow . unZn64 where narrow (W64# w) = W8# (wordToWord8# (word64ToWord# w))
-#endif
- instance (KnownNat n, NatWithinBound Word16 n) => From (Zn64 n) Word16 where
-#if __GLASGOW_HASKELL__ >= 904
-    from = narrow . unZn64 where narrow (W64# w) = W16# (wordToWord16# (word64ToWord# (GHC.Prim.word64ToWord# w)))
-#else
-     from = narrow . unZn64 where narrow (W64# w) = W16# (wordToWord16# (word64ToWord# w))
-#endif
- instance (KnownNat n, NatWithinBound Word32 n) => From (Zn64 n) Word32 where
-#if __GLASGOW_HASKELL__ >= 904
-    from = narrow . unZn64 where narrow (W64# w) = W32# (wordToWord32# (word64ToWord# (GHC.Prim.word64ToWord# w)))
-#else
-     from = narrow . unZn64 where narrow (W64# w) = W32# (wordToWord32# (word64ToWord# w))
-#endif
- instance From (Zn64 n) Word64 where
-     from = unZn64
- instance From (Zn64 n) Word128 where
-@@ -297,23 +285,11 @@ instance From (Zn64 n) Word256 where
-     from = from . unZn64
-
- instance (KnownNat n, NatWithinBound Word8 n) => From (Zn n) Word8 where
-#if __GLASGOW_HASKELL__ >= 904
-    from = narrow . naturalToWord64 . unZn where narrow (W64# w) = W8# (wordToWord8# (word64ToWord# (GHC.Prim.word64ToWord# w)))
-#else
-     from = narrow . naturalToWord64 . unZn where narrow (W64# w) = W8# (wordToWord8# (word64ToWord# w))
-#endif
- instance (KnownNat n, NatWithinBound Word16 n) => From (Zn n) Word16 where
-#if __GLASGOW_HASKELL__ >= 904
-    from = narrow . naturalToWord64 . unZn where narrow (W64# w) = W16# (wordToWord16# (word64ToWord# (GHC.Prim.word64ToWord# w)))
-#else
-     from = narrow . naturalToWord64 . unZn where narrow (W64# w) = W16# (wordToWord16# (word64ToWord# w))
-#endif
- instance (KnownNat n, NatWithinBound Word32 n) => From (Zn n) Word32 where
-#if __GLASGOW_HASKELL__ >= 904
-    from = narrow . naturalToWord64 . unZn where narrow (W64# w) = W32# (wordToWord32# (word64ToWord# (GHC.Prim.word64ToWord# w)))
-#else
-     from = narrow . naturalToWord64 . unZn where narrow (W64# w) = W32# (wordToWord32# (word64ToWord# w))
-#endif
- instance (KnownNat n, NatWithinBound Word64 n) => From (Zn n) Word64 where
-     from = naturalToWord64 . unZn
- instance (KnownNat n, NatWithinBound Word128 n) => From (Zn n) Word128 where
-diff --git a/Basement/Numerical/Additive.hs b/Basement/Numerical/Additive.hs
-index d0dfb973..8ab65aa0 100644
--- a/Basement/Numerical/Additive.hs
-+++ b/Basement/Numerical/Additive.hs
-@@ -30,8 +30,12 @@ import qualified Basement.Types.Word128 as Word128
- import qualified Basement.Types.Word256 as Word256
-
- #if WORD_SIZE_IN_BITS < 64
-+#if __GLASGOW_HASKELL__ >= 904
-+import           GHC.Exts
-+#else
- import           GHC.IntWord64
- #endif
-+#endif
-
- -- | Represent class of things that can be added together,
- -- contains a neutral element and is commutative.
-diff --git a/Basement/Numerical/Conversion.hs b/Basement/Numerical/Conversion.hs
-index db502c07..fddc8232 100644
--- a/Basement/Numerical/Conversion.hs
-+++ b/Basement/Numerical/Conversion.hs
-@@ -26,8 +26,12 @@ import GHC.Word
- import Basement.Compat.Primitive
-
- #if WORD_SIZE_IN_BITS < 64
-+#if __GLASGOW_HASKELL__ >= 904
-+import GHC.Exts
-+#else
- import GHC.IntWord64
- #endif
-+#endif
-
- intToInt64 :: Int -> Int64
- #if WORD_SIZE_IN_BITS == 64
-@@ -96,11 +100,22 @@ int64ToWord64 (I64# i) = W64# (int64ToWord64# i)
- #endif
-
- #if WORD_SIZE_IN_BITS == 64
-+#if __GLASGOW_HASKELL__ >= 904
-+word64ToWord# :: Word64# -> Word#
-+word64ToWord# i = word64ToWord# i
-+#else
- word64ToWord# :: Word# -> Word#
- word64ToWord# i = i
-+#endif
- {-# INLINE word64ToWord# #-}
- #endif
-
-+#if WORD_SIZE_IN_BITS < 64
-+word64ToWord32# :: Word64# -> Word32#
-+word64ToWord32# i = wordToWord32# (word64ToWord# i)
-+{-# INLINE word64ToWord32# #-}
-+#endif
-+
- -- | 2 Word32s
- data Word32x2 = Word32x2 {-# UNPACK #-} !Word32
-                          {-# UNPACK #-} !Word32
-@@ -113,9 +128,14 @@ word64ToWord32s (W64# w64) = Word32x2 (W32# (wordToWord32# (uncheckedShiftRL# (G
- word64ToWord32s (W64# w64) = Word32x2 (W32# (wordToWord32# (uncheckedShiftRL# w64 32#))) (W32# (wordToWord32# w64))
- #endif
- #else
-+#if __GLASGOW_HASKELL__ >= 904
-+word64ToWord32s :: Word64 -> Word32x2
-+word64ToWord32s (W64# w64) = Word32x2 (W32# (word64ToWord32# (uncheckedShiftRL64# w64 32#))) (W32# (word64ToWord32# w64))
-+#else
- word64ToWord32s :: Word64 -> Word32x2
- word64ToWord32s (W64# w64) = Word32x2 (W32# (word64ToWord# (uncheckedShiftRL64# w64 32#))) (W32# (word64ToWord# w64))
- #endif
-+#endif
-
- wordToChar :: Word -> Char
- wordToChar (W# word) = C# (chr# (word2Int# word))
-diff --git a/Basement/PrimType.hs b/Basement/PrimType.hs
-index f8ca2926..a888ec91 100644
--- a/Basement/PrimType.hs
-+++ b/Basement/PrimType.hs
-@@ -54,7 +54,11 @@ import           Basement.Nat
- import qualified Prelude (quot)
-
- #if WORD_SIZE_IN_BITS < 64
-import           GHC.IntWord64
-+#if __GLASGOW_HASKELL__ >= 904
-+import GHC.Exts
-+#else
-+import GHC.IntWord64
-+#endif
- #endif
-
- #ifdef FOUNDATION_BOUNDS_CHECK
-diff --git a/Basement/Types/OffsetSize.hs b/Basement/Types/OffsetSize.hs
-index cd944927..1ea80dad 100644
--- a/Basement/Types/OffsetSize.hs
-+++ b/Basement/Types/OffsetSize.hs
-@@ -70,8 +70,12 @@ import Data.List (foldl')
- import qualified Prelude
-
- #if WORD_SIZE_IN_BITS < 64
-+#if __GLASGOW_HASKELL__ >= 904
-+import GHC.Exts
-+#else
- import GHC.IntWord64
- #endif
-+#endif
-
- -- | File size in bytes
- newtype FileSize = FileSize Word64
-@@ -225,20 +229,26 @@ countOfRoundUp alignment (CountOf n) = CountOf ((n + (alignment-1)) .&. compleme
-
- csizeOfSize :: CountOf Word8 -> CSize
- #if WORD_SIZE_IN_BITS < 64
-+#if __GLASGOW_HASKELL__ >= 904
-+csizeOfSize (CountOf (I# sz)) = CSize (W32# (wordToWord32# (int2Word# sz)))
-+#else
- csizeOfSize (CountOf (I# sz)) = CSize (W32# (int2Word# sz))
-+#endif
- #else
- #if __GLASGOW_HASKELL__ >= 904
- csizeOfSize (CountOf (I# sz)) = CSize (W64# (wordToWord64# (int2Word# sz)))
-
- #else
- csizeOfSize (CountOf (I# sz)) = CSize (W64# (int2Word# sz))
-
- #endif
- #endif
-
- csizeOfOffset :: Offset8 -> CSize
- #if WORD_SIZE_IN_BITS < 64
-+#if __GLASGOW_HASKELL__ >= 904
-+csizeOfOffset (Offset (I# sz)) = CSize (W32# (wordToWord32# (int2Word# sz)))
-+#else
- csizeOfOffset (Offset (I# sz)) = CSize (W32# (int2Word# sz))
-+#endif
- #else
- #if __GLASGOW_HASKELL__ >= 904
- csizeOfOffset (Offset (I# sz)) = CSize (W64# (wordToWord64# (int2Word# sz)))
-@@ -250,7 +260,11 @@ csizeOfOffset (Offset (I# sz)) = CSize (W64# (int2Word# sz))
- sizeOfCSSize :: CSsize -> CountOf Word8
- sizeOfCSSize (CSsize (-1))      = error "invalid size: CSSize is -1"
- #if WORD_SIZE_IN_BITS < 64
-+#if __GLASGOW_HASKELL__ >= 904
-+sizeOfCSSize (CSsize (I32# sz)) = CountOf (I# (int32ToInt# sz))
-+#else
- sizeOfCSSize (CSsize (I32# sz)) = CountOf (I# sz)
-+#endif
- #else
- #if __GLASGOW_HASKELL__ >= 904
- sizeOfCSSize (CSsize (I64# sz)) = CountOf (I# (int64ToInt# sz))
-@@ -261,7 +275,11 @@ sizeOfCSSize (CSsize (I64# sz)) = CountOf (I# sz)
-
- sizeOfCSize :: CSize -> CountOf Word8
- #if WORD_SIZE_IN_BITS < 64
-+#if __GLASGOW_HASKELL__ >= 904
-+sizeOfCSize (CSize (W32# sz)) = CountOf (I# (word2Int# (word32ToWord# sz)))
-+#else
- sizeOfCSize (CSize (W32# sz)) = CountOf (I# (word2Int# sz))
-+#endif
- #else
- #if __GLASGOW_HASKELL__ >= 904
- sizeOfCSize (CSize (W64# sz)) = CountOf (I# (word2Int# (word64ToWord# sz)))
@@ -1,12 +0,0 @@
-diff --git a/direct-sqlcipher.cabal b/direct-sqlcipher.cabal
-index 728ba3e..c63745e 100644
--- a/direct-sqlcipher.cabal
-+++ b/direct-sqlcipher.cabal
-@@ -84,6 +84,8 @@ library
-       cc-options: -DSQLITE_TEMP_STORE=2
-                   -DSQLITE_HAS_CODEC
-
-+    extra-libraries: ws2_32
-+
-     if !os(windows) && !os(android)
-       extra-libraries: pthread
@@ -1,36 +0,0 @@
-From 2738929ce15b4c8704bbbac24a08539b5d4bf30e Mon Sep 17 00:00:00 2001
-From: sternenseemann <sternenseemann@systemli.org>
-Date: Mon, 14 Aug 2023 10:51:30 +0200
-Subject: [PATCH] Data.Memory.Internal.CompatPrim64: fix 32 bit with GHC >= 9.4
-
-Since 9.4, GHC.Prim exports Word64# operations like timesWord64# even on
-i686 whereas GHC.IntWord64 no longer exists. Therefore, we can just use
-the ready made solution.
-
-Closes #98, as it should be the better solution.
---
- Data/Memory/Internal/CompatPrim64.hs | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/Data/Memory/Internal/CompatPrim64.hs b/Data/Memory/Internal/CompatPrim64.hs
-index b9eef8a..a134c88 100644
--- a/Data/Memory/Internal/CompatPrim64.hs
-+++ b/Data/Memory/Internal/CompatPrim64.hs
-@@ -150,6 +150,7 @@ w64# :: Word# -> Word# -> Word# -> Word64#
- w64# w _ _ = w
- 
- #elif WORD_SIZE_IN_BITS == 32
-+#if __GLASGOW_HASKELL__ < 904
- import GHC.IntWord64
- import GHC.Prim (Word#)
- 
-@@ -158,6 +159,9 @@ timesWord64# a b =
-     let !ai = word64ToInt64# a
-         !bi = word64ToInt64# b
-      in int64ToWord64# (timesInt64# ai bi)
-+#else
-+import GHC.Prim
-+#endif
- 
- w64# :: Word# -> Word# -> Word# -> Word64#
- w64# _ hw lw =
@@ -155,7 +155,6 @@ library
      Simplex.Chat.Migrations.M20241125_indexes
      Simplex.Chat.Migrations.M20241128_business_chats
      Simplex.Chat.Migrations.M20241205_business_chat_members
-      Simplex.Chat.Migrations.M20241206_chat_tags
      Simplex.Chat.Mobile
      Simplex.Chat.Mobile.File
      Simplex.Chat.Mobile.Shared
@@ -848,9 +848,6 @@ processChatCommand' vr = \case
            . sortOn (timeAvg . snd)
            . M.assocs
            <$> withConnection st (readTVarIO . DB.slow)
-  APIGetChatTags userId -> withUserId' userId $ \user -> do
-    tags <- withFastStore' (`getUserChatTags` user)
-    pure $ CRChatTags user tags
  APIGetChats {userId, pendingConnections, pagination, query} -> withUserId' userId $ \user -> do
    (errs, previews) <- partitionEithers <$> withFastStore' (\db -> getChatPreviews db vr user pendingConnections pagination query)
    unless (null errs) $ toView $ CRChatErrors (Just user) (map ChatErrorStore errs)
@@ -898,32 +895,6 @@ processChatCommand' vr = \case
    CTLocal -> pure $ chatCmdError (Just user) "not supported"
    CTContactRequest -> pure $ chatCmdError (Just user) "not supported"
    CTContactConnection -> pure $ chatCmdError (Just user) "not supported"
-  APICreateChatTag (ChatRef cType chatId) (ChatTagData emoji text) -> withUser $ \user -> withFastStore $ \db -> case cType of
-    CTDirect -> do
-      tId <- liftIO $ createChatTag db user emoji text
-      liftIO $ tagDirectChat db chatId tId
-      CRTagsUpdated user <$> liftIO (getUserChatTags db user) <*> liftIO (getDirectChatTags db chatId)
-    CTGroup -> do
-      tId <- liftIO $ createChatTag db user emoji text
-      liftIO $ tagGroupChat db chatId tId
-      CRTagsUpdated user <$> liftIO (getUserChatTags db user) <*> liftIO (getGroupChatTags db chatId)
-    _ -> pure $ chatCmdError (Just user) "not supported"
-  APITagChat (ChatRef cType chatId) tId -> withUser $ \user -> withFastStore $ \db -> case cType of
-    CTDirect -> do
-      liftIO $ tagDirectChat db chatId tId
-      CRTagsUpdated user <$> liftIO (getUserChatTags db user) <*> liftIO (getDirectChatTags db chatId)
-    CTGroup -> do
-      liftIO $ tagGroupChat db chatId tId
-      CRTagsUpdated user <$> liftIO (getUserChatTags db user) <*> liftIO (getGroupChatTags db chatId)
-    _ -> pure $ chatCmdError (Just user) "not supported"
-  APIUntagChat (ChatRef cType chatId) tId -> withUser $ \user -> withFastStore $ \db -> case cType of
-    CTDirect -> do
-      liftIO $ untagDirectChat db user chatId tId
-      CRChatUntagged user <$> liftIO (getUserChatTags db user) <*> liftIO (getDirectChatTags db chatId)
-    CTGroup -> do
-      liftIO $ untagGroupChat db user chatId tId
-      CRChatUntagged user <$> liftIO (getUserChatTags db user) <*> liftIO (getGroupChatTags db chatId)
-    _ -> pure $ chatCmdError (Just user) "not supported"
  APICreateChatItems folderId cms -> withUser $ \user ->
    createNoteFolderContentItems user folderId (L.map (,Nothing) cms)
  APIUpdateChatItem (ChatRef cType chatId) itemId live mc -> withUser $ \user -> case cType of
@@ -8421,7 +8392,6 @@ chatCommandP =
      "/sql chat " *> (ExecChatStoreSQL <$> textP),
      "/sql agent " *> (ExecAgentStoreSQL <$> textP),
      "/sql slow" $> SlowSQLQueries,
-      "/_get tags " *> (APIGetChatTags <$> A.decimal),
      "/_get chats "
        *> ( APIGetChats
              <$> A.decimal
@@ -8433,9 +8403,6 @@ chatCommandP =
      "/_get items " *> (APIGetChatItems <$> chatPaginationP <*> optional (" search=" *> stringP)),
      "/_get item info " *> (APIGetChatItemInfo <$> chatRefP <* A.space <*> A.decimal),
      "/_send " *> (APISendMessages <$> chatRefP <*> liveMessageP <*> sendMessageTTLP <*> (" json " *> jsonP <|> " text " *> composedMessagesTextP)),
-      "/_create tag " *> (APICreateChatTag <$> chatRefP <* A.space <*> jsonP),
-      "/_tag " *> (APITagChat <$> chatRefP <* A.space <*> A.decimal),
-      "/_untag " *> (APIUntagChat <$> chatRefP <* A.space <*> A.decimal),
      "/_create *" *> (APICreateChatItems <$> A.decimal <*> (" json " *> jsonP <|> " text " *> composedMessagesTextP)),
      "/_update item " *> (APIUpdateChatItem <$> chatRefP <* A.space <*> A.decimal <*> liveMessageP <* A.space <*> msgContentP),
      "/_delete item " *> (APIDeleteChatItem <$> chatRefP <*> _strP <* A.space <*> ciDeleteMode),
@@ -294,15 +294,11 @@ data ChatCommand
  | ExecChatStoreSQL Text
  | ExecAgentStoreSQL Text
  | SlowSQLQueries
-  | APIGetChatTags UserId
  | APIGetChats {userId :: UserId, pendingConnections :: Bool, pagination :: PaginationByTime, query :: ChatListQuery}
  | APIGetChat ChatRef ChatPagination (Maybe String)
  | APIGetChatItems ChatPagination (Maybe String)
  | APIGetChatItemInfo ChatRef ChatItemId
  | APISendMessages {chatRef :: ChatRef, liveMessage :: Bool, ttl :: Maybe Int, composedMessages :: NonEmpty ComposedMessage}
-  | APICreateChatTag ChatRef ChatTagData
-  | APITagChat ChatRef ChatTagId
-  | APIUntagChat ChatRef ChatTagId
  | APICreateChatItems {noteFolderId :: NoteFolderId, composedMessages :: NonEmpty ComposedMessage}
  | APIUpdateChatItem {chatRef :: ChatRef, chatItemId :: ChatItemId, liveMessage :: Bool, msgContent :: MsgContent}
  | APIDeleteChatItem ChatRef (NonEmpty ChatItemId) CIDeleteMode
@@ -591,7 +587,6 @@ data ChatResponse
  | CRApiChats {user :: User, chats :: [AChat]}
  | CRChats {chats :: [AChat]}
  | CRApiChat {user :: User, chat :: AChat, navInfo :: Maybe NavigationInfo}
-  | CRChatTags {user :: User, userTags :: [ChatTag]}
  | CRChatItems {user :: User, chatName_ :: Maybe ChatName, chatItems :: [AChatItem]}
  | CRChatItemInfo {user :: User, chatItem :: AChatItem, chatItemInfo :: ChatItemInfo}
  | CRChatItemId User (Maybe ChatItemId)
@@ -622,8 +617,6 @@ data ChatResponse
  | CRContactCode {user :: User, contact :: Contact, connectionCode :: Text}
  | CRGroupMemberCode {user :: User, groupInfo :: GroupInfo, member :: GroupMember, connectionCode :: Text}
  | CRConnectionVerified {user :: User, verified :: Bool, expectedCode :: Text}
-  | CRTagsUpdated {user :: User, userTags :: [ChatTag], chatTags :: [ChatTagId]}
-  | CRChatUntagged {user :: User, userTags :: [ChatTag], chatTags :: [ChatTagId]}
  | CRNewChatItems {user :: User, chatItems :: [AChatItem]}
  | CRChatItemsStatusesUpdated {user :: User, chatItems :: [AChatItem]}
  | CRChatItemUpdated {user :: User, chatItem :: AChatItem}
@@ -1075,16 +1068,6 @@ instance FromJSON ComposedMessage where
  parseJSON invalid =
    JT.prependFailure "bad ComposedMessage, " (JT.typeMismatch "Object" invalid)

-data ChatTagData = ChatTagData
-  { emoji :: Text,
-    text :: Text
-  }
-  deriving (Show)
-
-instance FromJSON ChatTagData where
-  parseJSON (J.Object v) = ChatTagData <$> v .: "emoji" <*> v .: "text"
-  parseJSON invalid = JT.prependFailure "bad ChatTagData, " (JT.typeMismatch "Object" invalid)
-
 data NtfConn = NtfConn
  { user_ :: Maybe User,
    connEntity_ :: Maybe ConnectionEntity,
@@ -1620,5 +1603,3 @@ $(JQ.deriveFromJSON defaultJSON ''ArchiveConfig)
 $(JQ.deriveFromJSON defaultJSON ''DBEncryptionConfig)

 $(JQ.deriveToJSON defaultJSON ''ComposedMessage)
-
-$(JQ.deriveToJSON defaultJSON ''ChatTagData)
@@ -1,42 +0,0 @@
-{-# LANGUAGE QuasiQuotes #-}
-
-module Simplex.Chat.Migrations.M20241206_chat_tags where
-
-import Database.SQLite.Simple (Query)
-import Database.SQLite.Simple.QQ (sql)
-
-m20241206_chat_tags :: Query
-m20241206_chat_tags =
-  [sql|
-CREATE TABLE chat_tags (
-  chat_tag_id INTEGER PRIMARY KEY AUTOINCREMENT,
-  user_id INTEGER REFERENCES users,
-  chat_tag_text TEXT UNIQUE NOT NULL,
-  chat_tag_emoji TEXT UNIQUE NOT NULL
-);
-
-CREATE TABLE chat_tags_chats (
-  contact_id INTEGER REFERENCES contacts ON DELETE CASCADE, -- NULL for groups
-  group_id INTEGER REFERENCES groups ON DELETE CASCADE, -- NULL for contacts
-  chat_tag_id INTEGER NOT NULL REFERENCES chat_tags ON DELETE CASCADE,
-  UNIQUE(chat_tag_id, group_id),
-  UNIQUE(chat_tag_id, contact_id)
-);
-
-CREATE INDEX idx_chat_tags_user_id ON chat_tags(user_id);
-CREATE INDEX idx_chat_tags_chat_tag_id ON chat_tags(chat_tag_id);
-CREATE INDEX idx_chat_tags_chats_chat_tag_id ON chat_tags_chats(chat_tag_id);
-CREATE INDEX idx_chat_tags_user_id_chat_tag_id ON chat_tags(user_id, chat_tag_id);
-|]
-
-down_m20241206_chat_tags :: Query
-down_m20241206_chat_tags =
-  [sql|
-DROP INDEX idx_chat_tags_user_id;
-DROP INDEX idx_chat_tags_chat_tag_id;
-DROP INDEX idx_chat_tags_chats_chat_tag_id;
-DROP INDEX idx_chat_tags_user_id_chat_tag_id;
-
-DROP TABLE chat_tags_chats
-DROP TABLE chat_tags;
-|]
@@ -111,7 +111,7 @@ getConnectionEntity db vr user@User {userId, userContactId} agentConnId = do
          chatSettings = ChatSettings {enableNtfs = fromMaybe MFAll enableNtfs_, sendRcpts, favorite}
          mergedPreferences = contactUserPreferences user userPreferences preferences $ connIncognito conn
          activeConn = Just conn
-       in Right Contact {contactId, localDisplayName, profile, activeConn, viaGroup, contactUsed, contactStatus, chatSettings, userPreferences, mergedPreferences, createdAt, updatedAt, chatTs, contactGroupMemberId, contactGrpInvSent, chatTags = [], uiThemes, chatDeleted, customData}
+       in Right Contact {contactId, localDisplayName, profile, activeConn, viaGroup, contactUsed, contactStatus, chatSettings, userPreferences, mergedPreferences, createdAt, updatedAt, chatTs, contactGroupMemberId, contactGrpInvSent, uiThemes, chatDeleted, customData}
    toContact' _ _ _ = Left $ SEInternalError "referenced contact not found"
    getGroupAndMember_ :: Int64 -> Connection -> ExceptT StoreError IO (GroupInfo, GroupMember)
    getGroupAndMember_ groupMemberId c = ExceptT $ do
@@ -79,9 +79,6 @@ module Simplex.Chat.Store.Direct
    setContactCustomData,
    setContactUIThemes,
    setContactChatDeleted,
-    tagDirectChat,
-    untagDirectChat,
-    getDirectChatTags,
  )
 where

@@ -254,7 +251,6 @@ createDirectContact db user@User {userId} conn@Connection {connId, localAlias} p
        chatTs = Just currentTs,
        contactGroupMemberId = Nothing,
        contactGrpInvSent = False,
-        chatTags = [],
        uiThemes = Nothing,
        chatDeleted = False,
        customData = Nothing
@@ -823,7 +819,6 @@ createAcceptedContact db user@User {userId, profile = LocalProfile {preferences}
            chatTs = Just createdAt,
            contactGroupMemberId = Nothing,
            contactGrpInvSent = False,
-            chatTags = [],
            uiThemes = Nothing,
            chatDeleted = False,
            customData = Nothing
@@ -847,10 +842,7 @@ getContactIdByName db User {userId} cName =
    DB.query db "SELECT contact_id FROM contacts WHERE user_id = ? AND local_display_name = ? AND deleted = 0" (userId, cName)

 getContact :: DB.Connection -> VersionRangeChat -> User -> Int64 -> ExceptT StoreError IO Contact
-getContact db vr user contactId = do
-  ct <- getContact_ db vr user contactId False
-  chatTags <- liftIO $ getDirectChatTags db contactId
-  pure (ct :: Contact) {chatTags}
+getContact db vr user contactId = getContact_ db vr user contactId False

 getContact_ :: DB.Connection -> VersionRangeChat -> User -> Int64 -> Bool -> ExceptT StoreError IO Contact
 getContact_ db vr user@User {userId} contactId deleted =
@@ -1026,30 +1018,3 @@ setContactChatDeleted :: DB.Connection -> User -> Contact -> Bool -> IO ()
 setContactChatDeleted db User {userId} Contact {contactId} chatDeleted = do
  updatedAt <- getCurrentTime
  DB.execute db "UPDATE contacts SET chat_deleted = ?, updated_at = ? WHERE user_id = ? AND contact_id = ?" (chatDeleted, updatedAt, userId, contactId)
-
-tagDirectChat :: DB.Connection -> ContactId -> ChatTagId -> IO ()
-tagDirectChat db contactId tId =
-  DB.execute
-    db
-    [sql|
-      INSERT INTO chat_tags_chats (contact_id, chat_tag_id)
-      VALUES (?,?)
-    |]
-    (contactId, tId)
-
-untagDirectChat :: DB.Connection -> User -> ContactId -> ChatTagId -> IO ()
-untagDirectChat db user contactId tId = do
-  untagDirectChat' db contactId tId
-
-untagDirectChat' :: DB.Connection -> ContactId -> ChatTagId -> IO ()
-untagDirectChat' db contactId tId =
-  DB.execute
-    db
-    [sql|
-      DELETE FROM chat_tags_chats
-      WHERE contact_id = ? AND chat_tag_id = ?
-    |]
-    (contactId, tId)
-
-getDirectChatTags :: DB.Connection -> ContactId -> IO [ChatTagId]
-getDirectChatTags db contactId = map fromOnly <$> DB.query db "SELECT chat_tag_id FROM chat_tags_chats WHERE contact_id = ?" (Only contactId)
@@ -122,9 +122,6 @@ module Simplex.Chat.Store.Groups
    updateUserMemberProfileSentAt,
    setGroupCustomData,
    setGroupUIThemes,
-    tagGroupChat,
-    untagGroupChat,
-    getGroupChatTags,
  )
 where

@@ -336,7 +333,6 @@ createNewGroup db vr gVar user@User {userId} groupProfile incognitoProfile = Exc
          updatedAt = currentTs,
          chatTs = Just currentTs,
          userMemberProfileSentAt = Just currentTs,
-          chatTags = [],
          uiThemes = Nothing,
          customData = Nothing
        }
@@ -405,7 +401,6 @@ createGroupInvitation db vr user@User {userId} contact@Contact {contactId, activ
                  updatedAt = currentTs,
                  chatTs = Just currentTs,
                  userMemberProfileSentAt = Just currentTs,
-                  chatTags = [],
                  uiThemes = Nothing,
                  customData = Nothing
                },
@@ -1487,30 +1482,26 @@ updateGroupProfileFromMember db user g@GroupInfo {groupId} Profile {displayName
  updateGroupProfile db user g' p'
  where
    getGroupProfile =
-      ExceptT $
-        firstRow toGroupProfile (SEGroupNotFound groupId) $
-          DB.query
-            db
-            [sql|
+      ExceptT $ firstRow toGroupProfile (SEGroupNotFound groupId) $
+        DB.query
+          db
+          [sql|
            SELECT gp.display_name, gp.full_name, gp.description, gp.image, gp.preferences
            FROM group_profiles gp
            JOIN groups g ON gp.group_profile_id = g.group_profile_id
            WHERE g.group_id = ?
          |]
-            (Only groupId)
+          (Only groupId)
    toGroupProfile (displayName, fullName, description, image, groupPreferences) =
      GroupProfile {displayName, fullName, description, image, groupPreferences}

 getGroupInfo :: DB.Connection -> VersionRangeChat -> User -> Int64 -> ExceptT StoreError IO GroupInfo
-getGroupInfo db vr User {userId, userContactId} groupId = do
-  info <-
-    ExceptT . firstRow (toGroupInfo vr userContactId) (SEGroupNotFound groupId) $
-      DB.query
-        db
-        (groupInfoQuery <> " WHERE g.group_id = ? AND g.user_id = ? AND mu.contact_id = ?")
-        (groupId, userId, userContactId)
-  chatTags <- liftIO $ getGroupChatTags db groupId
-  pure (info :: GroupInfo) {chatTags}
+getGroupInfo db vr User {userId, userContactId} groupId =
+  ExceptT . firstRow (toGroupInfo vr userContactId) (SEGroupNotFound groupId) $
+    DB.query
+      db
+      (groupInfoQuery <> " WHERE g.group_id = ? AND g.user_id = ? AND mu.contact_id = ?")
+      (groupId, userId, userContactId)

 getGroupInfoByUserContactLinkConnReq :: DB.Connection -> VersionRangeChat -> User -> (ConnReqContact, ConnReqContact) -> IO (Maybe GroupInfo)
 getGroupInfoByUserContactLinkConnReq db vr user@User {userId} (cReqSchema1, cReqSchema2) = do
@@ -2062,7 +2053,7 @@ createMemberContact
              quotaErrCounter = 0
            }
        mergedPreferences = contactUserPreferences user userPreferences preferences $ connIncognito ctConn
-    pure Contact {contactId, localDisplayName, profile = memberProfile, activeConn = Just ctConn, viaGroup = Nothing, contactUsed = True, contactStatus = CSActive, chatSettings = defaultChatSettings, userPreferences, mergedPreferences, createdAt = currentTs, updatedAt = currentTs, chatTs = Just currentTs, contactGroupMemberId = Just groupMemberId, contactGrpInvSent = False, chatTags = [], uiThemes = Nothing, chatDeleted = False, customData = Nothing}
+    pure Contact {contactId, localDisplayName, profile = memberProfile, activeConn = Just ctConn, viaGroup = Nothing, contactUsed = True, contactStatus = CSActive, chatSettings = defaultChatSettings, userPreferences, mergedPreferences, createdAt = currentTs, updatedAt = currentTs, chatTs = Just currentTs, contactGroupMemberId = Just groupMemberId, contactGrpInvSent = False, uiThemes = Nothing, chatDeleted = False, customData = Nothing}

 getMemberContact :: DB.Connection -> VersionRangeChat -> User -> ContactId -> ExceptT StoreError IO (GroupInfo, GroupMember, Contact, ConnReqInvitation)
 getMemberContact db vr user contactId = do
@@ -2099,7 +2090,7 @@ createMemberContactInvited
    contactId <- createContactUpdateMember currentTs userPreferences
    ctConn <- createMemberContactConn_ db user connIds gInfo mConn contactId subMode
    let mergedPreferences = contactUserPreferences user userPreferences preferences $ connIncognito ctConn
-        mCt' = Contact {contactId, localDisplayName = memberLDN, profile = memberProfile, activeConn = Just ctConn, viaGroup = Nothing, contactUsed = True, contactStatus = CSActive, chatSettings = defaultChatSettings, userPreferences, mergedPreferences, createdAt = currentTs, updatedAt = currentTs, chatTs = Just currentTs, contactGroupMemberId = Nothing, contactGrpInvSent = False, chatTags = [], uiThemes = Nothing, chatDeleted = False, customData = Nothing}
+        mCt' = Contact {contactId, localDisplayName = memberLDN, profile = memberProfile, activeConn = Just ctConn, viaGroup = Nothing, contactUsed = True, contactStatus = CSActive, chatSettings = defaultChatSettings, userPreferences, mergedPreferences, createdAt = currentTs, updatedAt = currentTs, chatTs = Just currentTs, contactGroupMemberId = Nothing, contactGrpInvSent = False, uiThemes = Nothing, chatDeleted = False, customData = Nothing}
        m' = m {memberContactId = Just contactId}
    pure (mCt', m')
    where
@@ -2310,31 +2301,3 @@ setGroupUIThemes :: DB.Connection -> User -> GroupInfo -> Maybe UIThemeEntityOve
 setGroupUIThemes db User {userId} GroupInfo {groupId} uiThemes = do
  updatedAt <- getCurrentTime
  DB.execute db "UPDATE groups SET ui_themes = ?, updated_at = ? WHERE user_id = ? AND group_id = ?" (uiThemes, updatedAt, userId, groupId)
-
-tagGroupChat :: DB.Connection -> GroupId -> ChatTagId -> IO ()
-tagGroupChat db groupId tId =
-  DB.execute
-    db
-    [sql|
-      INSERT INTO chat_tags_chats (group_id, chat_tag_id)
-      VALUES (?,?)
-    |]
-    (groupId, tId)
-
-untagGroupChat :: DB.Connection -> User -> GroupId -> ChatTagId -> IO ()
-untagGroupChat db user gId tId = do
-  untagGroupChat' db gId tId
-
-untagGroupChat' :: DB.Connection -> GroupId -> ChatTagId -> IO ()
-untagGroupChat' db groupId tId =
-  DB.execute
-    db
-    [sql|
-      DELETE FROM chat_tags_chats
-      WHERE group_id = ? AND chat_tag_id = ?
-    |]
-    (groupId, tId)
-
-getGroupChatTags :: DB.Connection -> GroupId -> IO [ChatTagId]
-getGroupChatTags db groupId =
-  map fromOnly <$> DB.query db "SELECT chat_tag_id FROM chat_tags_chats WHERE group_id = ?" (Only groupId)
@@ -119,7 +119,6 @@ import Simplex.Chat.Migrations.M20241027_server_operators
 import Simplex.Chat.Migrations.M20241125_indexes
 import Simplex.Chat.Migrations.M20241128_business_chats
 import Simplex.Chat.Migrations.M20241205_business_chat_members
-import Simplex.Chat.Migrations.M20241206_chat_tags
 import Simplex.Messaging.Agent.Store.SQLite.Migrations (Migration (..))

 schemaMigrations :: [(String, Query, Maybe Query)]
@@ -238,8 +237,7 @@ schemaMigrations =
    ("20241027_server_operators", m20241027_server_operators, Just down_m20241027_server_operators),
    ("20241125_indexes", m20241125_indexes, Just down_m20241125_indexes),
    ("20241128_business_chats", m20241128_business_chats, Just down_m20241128_business_chats),
-    ("20241205_business_chat_members", m20241205_business_chat_members, Just down_m20241205_business_chat_members),
-    ("20241206_chat_tags", m20241206_chat_tags, Just down_m20241206_chat_tags)
+    ("20241205_business_chat_members", m20241205_business_chat_members, Just down_m20241205_business_chat_members)
  ]

 -- | The list of migrations in ascending order by date
@@ -398,7 +398,7 @@ toContact vr user ((Only contactId :. (profileId, localDisplayName, viaGroup, di
      chatSettings = ChatSettings {enableNtfs = fromMaybe MFAll enableNtfs_, sendRcpts, favorite}
      incognito = maybe False connIncognito activeConn
      mergedPreferences = contactUserPreferences user userPreferences preferences incognito
-   in Contact {contactId, localDisplayName, profile, activeConn, viaGroup, contactUsed, contactStatus, chatSettings, userPreferences, mergedPreferences, createdAt, updatedAt, chatTs, contactGroupMemberId, contactGrpInvSent, chatTags = [], uiThemes, chatDeleted, customData}
+   in Contact {contactId, localDisplayName, profile, activeConn, viaGroup, contactUsed, contactStatus, chatSettings, userPreferences, mergedPreferences, createdAt, updatedAt, chatTs, contactGroupMemberId, contactGrpInvSent, uiThemes, chatDeleted, customData}

 getProfileById :: DB.Connection -> UserId -> Int64 -> ExceptT StoreError IO LocalProfile
 getProfileById db userId profileId =
@@ -559,7 +559,7 @@ toGroupInfo vr userContactId ((groupId, localDisplayName, displayName, fullName,
      fullGroupPreferences = mergeGroupPreferences groupPreferences
      groupProfile = GroupProfile {displayName, fullName, description, image, groupPreferences}
      businessChat = toBusinessChatInfo businessRow
-   in GroupInfo {groupId, localDisplayName, groupProfile, businessChat, fullGroupPreferences, membership, hostConnCustomUserProfileId, chatSettings, createdAt, updatedAt, chatTs, userMemberProfileSentAt, chatTags = [], uiThemes, customData}
+   in GroupInfo {groupId, localDisplayName, groupProfile, businessChat, fullGroupPreferences, membership, hostConnCustomUserProfileId, chatSettings, createdAt, updatedAt, chatTs, userMemberProfileSentAt, uiThemes, customData}

 toGroupMember :: Int64 -> GroupMemberRow -> GroupMember
 toGroupMember userContactId ((groupMemberId, groupId, memberId, minVer, maxVer, memberRole, memberCategory, memberStatus, showMessages, memberRestriction_) :. (invitedById, invitedByGroupMemberId, localDisplayName, memberContactId, memberContactProfileId, profileId, displayName, fullName, image, contactLink, localAlias, preferences)) =
@@ -592,48 +592,3 @@ groupInfoQuery =
    JOIN group_members mu ON mu.group_id = g.group_id
    JOIN contact_profiles pu ON pu.contact_profile_id = COALESCE(mu.member_profile_id, mu.contact_profile_id)
  |]
-
-createChatTag :: DB.Connection -> User -> Text -> Text -> IO ChatTagId
-createChatTag db User {userId} emoji text = do
-  DB.execute
-    db
-    [sql|
-      INSERT INTO chat_tags (user_id, chat_tag_emoji, chat_tag_text)
-      VALUES (?,?,?)
-    |]
-    (userId, emoji, text)
-  insertedRowId db
-
-deleteChatTag :: DB.Connection -> User -> ChatTagId -> IO ()
-deleteChatTag db User {userId} tId =
-  DB.execute
-    db
-    [sql|
-      DELETE FROM chat_tags
-      WHERE user_id = ? AND chat_tag_id = ?
-    |]
-    (userId, tId)
-
-getTagChatsCount :: DB.Connection -> ChatTagId -> IO Int
-getTagChatsCount db tId =
-  fromOnly . head <$> DB.query db "SELECT COUNT(*) FROM chat_tags_chats WHERE chat_tag_id = ?" (Only tId)
-
-deleteChatTagIfEmpty :: DB.Connection -> User -> ChatTagId -> IO ()
-deleteChatTagIfEmpty db user ctId = do
-  tagChatsCount <- getTagChatsCount db ctId
-  when (tagChatsCount == 0) $ deleteChatTag db user ctId
-
-getUserChatTags :: DB.Connection -> User -> IO [ChatTag]
-getUserChatTags db User {userId} =
-  map toChatTag
-    <$> DB.query
-      db
-      [sql|
-        SELECT chat_tag_id, chat_tag_emoji, chat_tag_text
-        FROM chat_tags
-        WHERE user_id = ?
-      |]
-      (Only userId)
-  where
-    toChatTag :: (ChatTagId, Text, Text) -> ChatTag
-    toChatTag (chatTagId, chatTagEmoji, chatTagText) = ChatTag {chatTagId, chatTagEmoji, chatTagText}
@@ -160,8 +160,6 @@ type ContactId = Int64

 type ProfileId = Int64

-type ChatTagId = Int64
-
 data Contact = Contact
  { contactId :: ContactId,
    localDisplayName :: ContactName,
@@ -178,7 +176,6 @@ data Contact = Contact
    chatTs :: Maybe UTCTime,
    contactGroupMemberId :: Maybe GroupMemberId,
    contactGrpInvSent :: Bool,
-    chatTags :: [ChatTagId],
    uiThemes :: Maybe UIThemeEntityOverrides,
    chatDeleted :: Bool,
    customData :: Maybe CustomData
@@ -383,7 +380,6 @@ data GroupInfo = GroupInfo
    updatedAt :: UTCTime,
    chatTs :: Maybe UTCTime,
    userMemberProfileSentAt :: Maybe UTCTime,
-    chatTags :: [ChatTagId],
    uiThemes :: Maybe UIThemeEntityOverrides,
    customData :: Maybe CustomData
  }
@@ -1641,13 +1637,6 @@ data CommandData = CommandData
  }
  deriving (Show)

-data ChatTag = ChatTag
-  { chatTagId :: Int64,
-    chatTagText :: Text,
-    chatTagEmoji :: Text
-  }
-  deriving (Show)
-
 -- ad-hoc type for data required for XGrpMemIntro continuation
 data XGrpMemIntroCont = XGrpMemIntroCont
  { groupId :: GroupId,
@@ -1802,5 +1791,3 @@ $(JQ.deriveJSON defaultJSON ''Contact)
 $(JQ.deriveJSON defaultJSON ''ContactRef)

 $(JQ.deriveJSON defaultJSON ''NoteFolder)
-
-$(JQ.deriveJSON defaultJSON ''ChatTag)
@@ -96,7 +96,6 @@ responseToView hu@(currentRH, user_) ChatConfig {logLevel, showReactions, showRe
  CRApiChats u chats -> ttyUser u $ if testView then testViewChats chats else [viewJSON chats]
  CRChats chats -> viewChats ts tz chats
  CRApiChat u chat _ -> ttyUser u $ if testView then testViewChat chat else [viewJSON chat]
-  CRChatTags u tags -> ttyUser u $ [viewJSON tags]
  CRApiParsedMarkdown ft -> [viewJSON ft]
  CRServerTestResult u srv testFailure -> ttyUser u $ viewServerTestResult srv testFailure
  CRServerOperatorConditions (ServerOperatorConditions ops _ ca) -> viewServerOperators ops ca
@@ -150,8 +149,6 @@ responseToView hu@(currentRH, user_) ChatConfig {logLevel, showReactions, showRe
    | otherwise -> []
  CRChatItemUpdated u (AChatItem _ _ chat item) -> ttyUser u $ unmuted u chat item $ viewItemUpdate chat item liveItems ts tz
  CRChatItemNotChanged u ci -> ttyUser u $ viewItemNotChanged ci
-  CRTagsUpdated u _ _ -> ttyUser u ["chat tagged"]
-  CRChatUntagged u _ _ -> ttyUser u ["chat untagged"]
  CRChatItemsDeleted u deletions byUser timed -> case deletions of
    [ChatItemDeletion (AChatItem _ _ chat deletedItem) toItem] ->
      ttyUser u $ unmuted u chat deletedItem $ viewItemDelete chat deletedItem toItem byUser timed ts tz testView
Author	SHA1	Message	Date
Evgeny Poberezkin	f3e5ec8030	Merge branch 'stable' into stable-android	2024-12-13 09:37:44 +00:00
Evgeny Poberezkin	df21d11d33	Merge branch 'stable' into stable-android	2024-12-08 09:30:39 +00:00
Evgeny Poberezkin	1730c5136f	Merge branch 'stable' into stable-android	2024-10-18 19:20:22 +01:00
Evgeny Poberezkin	06bb29e87d	Merge branch 'stable' into stable-android	2024-10-12 12:33:16 +01:00
Evgeny Poberezkin	05cc300231	Merge tag 'v6.0.5' into stable-android	2024-10-09 08:28:29 +01:00
Evgeny Poberezkin	cd65e4dbb9	Merge branch 'stable' into stable-android	2024-09-24 12:42:55 +01:00
Evgeny Poberezkin	f5d5bd62ed	Merge branch 'stable' into stable-android	2024-08-30 20:00:44 +01:00
Evgeny Poberezkin	d2f9888195	Merge branch 'stable' into stable-android	2024-08-30 13:40:03 +01:00
Evgeny Poberezkin	5ec5826642	Merge branch 'stable' into stable-android	2024-08-24 16:49:03 +01:00
Evgeny Poberezkin	29155ab73a	Merge branch 'stable' into stable-android	2024-08-24 15:10:05 +01:00
Evgeny Poberezkin	31782600cb	Merge branch 'stable' into stable-android	2024-06-01 09:28:13 +01:00
Evgeny Poberezkin	db392037ea	Merge branch 'stable' into stable-android	2024-05-31 23:35:46 +01:00
Evgeny Poberezkin	6ad7189c53	Merge branch 'stable' into stable-android	2024-05-25 17:17:18 +01:00
Evgeny Poberezkin	15d8444c74	Merge branch 'stable' into stable-android	2024-05-25 11:19:14 +01:00
Evgeny Poberezkin	2d31b853ac	Merge branch 'stable' into stable-android	2024-05-22 20:30:46 +01:00
Evgeny Poberezkin	3af0108b0d	Merge branch 'stable' into stable-android	2024-04-13 11:59:14 +01:00
Evgeny Poberezkin	746dd33728	Merge branch 'stable' into stable-android	2024-03-22 21:21:10 +00:00
Evgeny Poberezkin	2fceecab37	Merge branch 'stable' into stable-android	2024-03-04 21:38:09 +00:00
Evgeny Poberezkin	e094ec5cf5	Merge branch 'stable' into stable-android	2024-02-27 07:19:21 +00:00
Evgeny Poberezkin	fbd6012611	Merge branch 'stable' into stable-android	2024-02-21 19:06:13 +00:00
Evgeny Poberezkin	913ce4ebfd	Merge branch 'stable' into stable-android	2024-02-21 14:30:35 +00:00
Evgeny Poberezkin	1e01a961fe	Merge branch 'stable' into stable-android	2024-02-21 08:43:40 +00:00
Evgeny Poberezkin	27f4a71146	Merge branch 'stable' into stable-android	2024-02-10 23:35:40 +00:00
Evgeny Poberezkin	282bca4d81	Merge branch 'stable' into stable-android	2024-02-03 18:45:28 +00:00
Evgeny Poberezkin	e5011ad150	Merge branch 'stable' into stable-android	2024-01-31 09:47:35 +00:00
Evgeny Poberezkin	0d4d08e52b	core: unify dependencies for GHC 8.10.7 and 9.6.3 (#3774 )	2024-01-30 23:18:37 +00:00
Evgeny Poberezkin	7f8c7b2d99	fix merge	2024-01-24 22:46:56 +00:00
Evgeny Poberezkin	f5b666ae6d	Merge branch 'stable' into stable-android	2024-01-24 22:42:04 +00:00
Evgeny Poberezkin	1cfe51af45	Merge branch 'stable' into stable-android	2024-01-18 20:58:52 +00:00
Evgeny Poberezkin	68af58bda1	Merge branch 'stable' into stable-android	2024-01-10 12:17:06 +00:00
Evgeny Poberezkin	f51796b81c	Merge branch 'stable' into stable-android	2024-01-09 20:20:37 +00:00
Evgeny Poberezkin	995618cf1c	Merge branch 'stable' into stable-android	2024-01-09 10:40:34 +00:00
Evgeny Poberezkin	68baa18af8	Merge branch 'stable' into stable-android	2024-01-06 11:48:49 +00:00
Evgeny Poberezkin	a4f1c9c915	Merge branch 'stable' into stable-android	2023-12-30 10:21:07 +00:00
Evgeny Poberezkin	b8141c3555	Merge branch 'master-android' into stable-android	2023-12-28 09:18:12 +00:00
Evgeny Poberezkin	47214e33ea	Merge branch 'master-ghc8107' into master-android	2023-12-27 21:02:49 +00:00
Evgeny Poberezkin	ff239d81e5	Merge branch 'master' into master-ghc8107	2023-12-27 21:02:11 +00:00
Evgeny Poberezkin	0a6e47dd61	Merge branch 'master' into master-ghc8107	2023-12-27 20:57:25 +00:00
Evgeny Poberezkin	ee75219ed3	core: 5.4.2.1 (simplexmq 5.5.0.2)	2023-12-27 20:57:05 +00:00
Evgeny Poberezkin	2e337a753f	Merge branch 'master-ghc8107' into master-android	2023-12-27 14:09:42 +00:00
Evgeny Poberezkin	9918d91def	Merge branch 'master' into master-ghc8107	2023-12-27 14:09:23 +00:00
Evgeny Poberezkin	82dd5751c1	Merge branch 'master-ghc8107' into master-android	2023-12-26 21:27:06 +00:00
Evgeny Poberezkin	de637fab50	Merge branch 'master' into master-ghc8107	2023-12-26 21:12:36 +00:00
Evgeny Poberezkin	cb49f6f01d	Merge branch 'master-ghc8107' into master-android	2023-12-23 19:57:27 +00:00
Evgeny Poberezkin	6d0a83aa58	Merge branch 'master' into master-ghc8107	2023-12-23 19:57:08 +00:00
Evgeny Poberezkin	05f57e98ad	Merge branch 'master-ghc8107' into master-android	2023-12-23 17:25:14 +00:00
Evgeny Poberezkin	6a66525927	Merge branch 'master' into master-ghc8107	2023-12-23 17:24:47 +00:00
Evgeny Poberezkin	9530a6055a	Merge branch 'master-ghc8107' into master-android	2023-12-23 15:12:49 +00:00
Evgeny Poberezkin	f5ed8debcc	Merge branch 'master' into master-ghc8107	2023-12-23 15:11:38 +00:00
Evgeny Poberezkin	355d2449c5	fix for GHC 8.10.7	2023-12-23 15:05:36 +00:00
Evgeny Poberezkin	f7382cdd6f	Merge branch 'master' into master-ghc8107	2023-12-23 13:52:44 +00:00
Evgeny Poberezkin	dc8d10d068	core: limit process package version to 1.6.17	2023-12-21 10:54:54 +00:00
Evgeny Poberezkin	951245d33f	Merge branch 'master-ghc8107' into master-android	2023-12-21 10:00:28 +00:00
Evgeny Poberezkin	521b901cc9	Merge branch 'master' into master-ghc8107 (without changes for iPhone7)	2023-12-21 09:59:25 +00:00
Evgeny Poberezkin	6311ba451b	Merge branch 'master-ghc8107' into master-android	2023-12-21 00:45:32 +00:00
Evgeny Poberezkin	754c76d6fd	Merge branch 'master' into master-ghc8107	2023-12-21 00:45:10 +00:00
Evgeny Poberezkin	545f110fb8	nix: fix direct-sqlcipher content hash	2023-12-13 20:29:36 +00:00
Evgeny Poberezkin	4c6387c854	nix: fix script	2023-12-13 20:28:32 +00:00
Evgeny Poberezkin	aea7ff1c89	nix: fix script	2023-12-13 20:27:58 +00:00
Evgeny Poberezkin	77ac972e09	Merge branch 'master-ghc8107' into master-android	2023-12-13 12:36:06 +00:00
Evgeny Poberezkin	256f85024f	Merge branch 'master' into master-ghc8107	2023-12-13 12:35:37 +00:00
Evgeny Poberezkin	870f9e42dd	Merge branch 'master' into master-ghc8107	2023-12-12 20:09:39 +00:00
Evgeny Poberezkin	b3544cfbc3	Merge branch 'stable' into stable-android	2023-12-12 10:12:42 +00:00
Evgeny Poberezkin	0a4a3a24e1	Merge branch 'master-ghc8107' into master-android	2023-12-11 17:36:51 +00:00
Evgeny Poberezkin	8a66390a78	fix for GHC 8.10.7	2023-12-11 16:14:56 +00:00
Evgeny Poberezkin	3d48eded3d	Merge branch 'master-ghc8107' into master-android	2023-12-11 14:56:47 +00:00
Evgeny Poberezkin	6546426ec0	Merge branch 'master' into master-ghc8107	2023-12-11 14:56:25 +00:00
spaced4ndy	4a7ceb00fb	Merge branch 'master-ghc8107' into master-android	2023-12-11 17:53:08 +04:00
spaced4ndy	53560378bb	Merge branch 'master' into master-ghc8107	2023-12-11 17:52:48 +04:00
Evgeny Poberezkin	bfa8717ed4	Merge branch 'master-android' into stable-android	2023-12-09 20:43:21 +00:00
Evgeny Poberezkin	cdb3b6aafd	Merge branch 'master-ghc8107' into master-android	2023-12-07 15:12:49 +00:00
Evgeny Poberezkin	9f3d3e8ba4	Merge branch 'master' into master-ghc8107	2023-12-07 15:00:23 +00:00
Evgeny Poberezkin	047aad592e	Merge branch 'master-ghc8107' into master-android	2023-12-04 12:32:05 +00:00
Evgeny Poberezkin	087acd9180	changes to support GHC 8.10.7 (#3512 ) * Revert "raise lower bound on mtl to a real version (#3499)" This reverts commit `f94c0311c1`. * Revert "core: expand ranges to fit ghc 8.10 & 9.6 (#3496)" This reverts commit `9a1c7f41f7`. * update simplexmq * remove netword-transport fork * compatibility with GHC 8.10.7 * simplexmq * fix test * simplexmq, deps * update sqlcipher deps in sha256nix * fix index-state in cabal.project * index-state * remove import * add cabal.project.freeze * simplexmq * remove freeze * simplexmq * bytestring,simplexmq * template-haskell, simplexmq * simplexmq * simplexmq * simplexmq * mtl * simplexmq * remove duplicate index-state	2023-12-04 12:29:49 +00:00
Evgeny Poberezkin	0b822e4a5c	Merge branch 'master' into master-ghc8107	2023-12-04 10:07:16 +00:00
Evgeny Poberezkin	f8a469488e	Merge branch 'master' into master-ghc8107	2023-12-02 12:30:36 +00:00
Evgeny Poberezkin	3b5e806418	Merge branch 'master' into master-ghc8107	2023-12-01 17:46:12 +00:00
spaced4ndy	79e208193a	Merge branch 'master-ghc8107' into master-android	2023-11-30 21:11:25 +04:00
spaced4ndy	ef5c13b1c1	Merge branch 'master' into master-ghc8107	2023-11-30 21:10:51 +04:00
spaced4ndy	38533213d2	Merge branch 'master' into master-ghc8107	2023-11-30 20:56:51 +04:00
spaced4ndy	5f1aa6fa9d	Merge branch 'master-ghc8107' into master-android	2023-11-27 19:18:22 +04:00
spaced4ndy	b0002fe07d	Merge branch 'master' into master-ghc8107	2023-11-27 19:17:39 +04:00
Evgeny Poberezkin	ef21fd1d26	Merge branch 'master-ghc8107' into master-android	2023-11-26 19:59:46 +00:00
Evgeny Poberezkin	4a311b9578	fix for ghc 8.10.7	2023-11-26 19:34:39 +00:00
Evgeny Poberezkin	b8da5e225b	Merge branch 'master' into master-ghc8107	2023-11-26 18:53:40 +00:00
Evgeny Poberezkin	8b3300e197	Merge branch 'master-android' into stable-android	2023-11-26 13:14:27 +00:00
Evgeny Poberezkin	f27de052cf	Merge branch 'master' into master-android	2023-11-26 11:51:16 +00:00
Evgeny Poberezkin	5cc537f14c	Merge branch 'master' into master-ghc8107	2023-11-26 11:50:50 +00:00
Evgeny Poberezkin	dc8ca4cf89	Merge tag 'v5.4.0' into master-android	2023-11-25 11:23:23 +00:00
Evgeny Poberezkin	b62dd801f1	Merge branch 'master-ghc8107' into master-android	2023-11-24 20:02:05 +00:00
Evgeny Poberezkin	0c096e2c89	Merge branch 'master' into master-ghc8107	2023-11-24 19:00:30 +00:00
Evgeny Poberezkin	cc127e56fe	Merge branch 'master' into master-android	2023-11-23 16:23:02 +00:00
Evgeny Poberezkin	1781495ee3	Merge branch 'master' into master-ghc8107	2023-11-23 16:22:46 +00:00
Evgeny Poberezkin	831231d8e6	Merge branch 'master-ghc8107' into master-android	2023-11-21 21:16:04 +00:00
Evgeny Poberezkin	45102442f4	Merge branch 'master' into master-ghc8107	2023-11-21 21:15:10 +00:00
spaced4ndy	f323c8e112	Merge branch 'master-ghc8107' into master-android	2023-11-21 19:42:28 +04:00
spaced4ndy	3bdc6b5e28	Merge branch 'master' into master-ghc8107	2023-11-21 19:41:06 +04:00
Evgeny Poberezkin	d8373262bc	Merge branch 'master-ghc8107' into master-android	2023-11-21 00:01:20 +00:00
Evgeny Poberezkin	3597d34716	Merge branch 'master' into master-ghc8107	2023-11-21 00:00:59 +00:00
Evgeny Poberezkin	bd4259e89e	update hpack	2023-11-20 14:43:20 +00:00
Evgeny Poberezkin	55ead740cc	update hpack	2023-11-20 14:43:05 +00:00
Evgeny Poberezkin	5ef0eda2d7	Merge branch 'master-ghc8107' into master-android	2023-11-20 14:30:27 +00:00
Evgeny Poberezkin	49a9b0e7d6	update hpack version	2023-11-20 14:30:10 +00:00
Evgeny Poberezkin	45ada450a2	Merge branch 'master-ghc8107' into master-android	2023-11-20 13:24:07 +00:00
Evgeny Poberezkin	307a1b3c5e	fix for ghc 8.10.7	2023-11-20 13:23:45 +00:00
Evgeny Poberezkin	ed6b3bbead	Merge branch 'master' into master-ghc8107	2023-11-20 13:01:22 +00:00
spaced4ndy	901610eec5	Merge branch 'master-ghc8107' into master-android	2023-11-20 14:08:10 +04:00
spaced4ndy	7d4127c51d	Merge branch 'master' into master-ghc8107	2023-11-20 14:07:08 +04:00
Evgeny Poberezkin	13215d91d7	Merge branch 'master-ghc8107' into master-android	2023-11-20 00:07:12 +00:00
Evgeny Poberezkin	e1a8099474	fix for GHC 8.10.7	2023-11-20 00:06:45 +00:00
Evgeny Poberezkin	daa8d9bb21	Merge branch 'master' into master-ghc8107	2023-11-19 23:42:13 +00:00
Evgeny Poberezkin	5fcbade1bc	Merge branch 'master-ghc8107' into master-android	2023-11-17 11:49:35 +00:00
Evgeny Poberezkin	3937ffa9a6	Merge branch 'master' into master-ghc8107	2023-11-17 11:47:52 +00:00
Evgeny Poberezkin	80ddb50e1c	Merge branch 'master-ghc8107' into master-android	2023-11-16 18:55:17 +00:00
Evgeny Poberezkin	f6e66f1c53	Merge branch 'master' into master-ghc8107	2023-11-16 18:13:02 +00:00
Evgeny Poberezkin	0c23ff9ae3	Merge branch 'master-ghc8107' into master-android	2023-11-11 13:57:32 +00:00
Evgeny Poberezkin	1570bc2b99	Merge branch 'master' into master-ghc8107	2023-11-11 13:56:53 +00:00
Evgeny Poberezkin	1e2104cabf	Merge branch 'master-ghc8107' into master-android	2023-11-11 09:52:07 +00:00
Evgeny Poberezkin	f3014f258d	Merge branch 'master' into master-ghc8107	2023-11-11 09:51:42 +00:00
Evgeny Poberezkin	f0991cc0ba	Merge branch 'master-ghc8107' into master-android	2023-11-10 21:22:19 +00:00
Evgeny Poberezkin	74b78a8d7b	Merge branch 'master' into master-ghc8107	2023-11-10 21:11:08 +00:00
Evgeny Poberezkin	82cd70a75c	Merge branch 'master-ghc8107' into master-android	2023-11-10 21:08:11 +00:00
Evgeny Poberezkin	fe4eb7b5af	Merge branch 'master' into master-ghc8107 without changes, to skip update for ghc 9.6.3	2023-11-10 21:04:20 +00:00
Evgeny Poberezkin	c459e71d02	Merge branch 'master-ghc8107' into master-android	2023-11-06 11:26:40 +00:00
Evgeny Poberezkin	2516d5a393	Merge branch 'master' into master-ghc8107	2023-11-06 11:26:22 +00:00
spaced4ndy	477d98d75a	Merge branch 'master-ghc8107' into master-android	2023-11-06 11:42:39 +04:00
spaced4ndy	4253cd7fb9	Merge branch 'master' into master-ghc8107	2023-11-06 11:41:55 +04:00
Evgeny Poberezkin	ca78958667	Merge branch 'master-ghc8107' into master-android	2023-11-04 13:39:35 +00:00
Evgeny Poberezkin	1f5b80d560	fix for ghc8107	2023-11-04 13:37:25 +00:00
Evgeny Poberezkin	2de111e76c	Merge branch 'master' into master-ghc8107	2023-11-04 13:02:08 +00:00
spaced4ndy	8343285d93	Merge branch 'master-ghc8107' into master-android	2023-10-30 21:01:16 +04:00
spaced4ndy	5dbe2b2745	Merge branch 'master' into master-ghc8107	2023-10-30 21:00:11 +04:00
Evgeny Poberezkin	fb9485190d	Merge branch 'master-ghc8107' into master-android	2023-10-29 18:27:00 +00:00
Evgeny Poberezkin	6881600e06	Merge branch 'master' into master-ghc8107	2023-10-29 18:24:13 +00:00
spaced4ndy	9ed723bafa	Merge branch 'master-ghc8107' into master-android	2023-10-25 10:48:37 +04:00
spaced4ndy	9ded1c9821	Merge branch 'master' into master-ghc8107	2023-10-25 10:47:35 +04:00
spaced4ndy	bb374c68b1	Merge branch 'master-ghc8107' into master-android	2023-10-24 18:14:22 +04:00
spaced4ndy	c3e82a6a4e	Merge branch 'master' into master-ghc8107	2023-10-24 18:13:56 +04:00
spaced4ndy	7c12e82042	Merge branch 'master-ghc8107' into master-android	2023-10-24 17:41:19 +04:00
spaced4ndy	e7e66ff873	Merge branch 'master' into master-ghc8107	2023-10-24 17:40:55 +04:00
Evgeny Poberezkin	c4d7e5307c	Merge branch 'master-ghc8107' into master-android	2023-10-22 15:35:55 +01:00
Evgeny Poberezkin	d6b9a45a39	Merge branch 'master' into master-ghc8107	2023-10-22 15:10:33 +01:00
Evgeny Poberezkin	7fd3b4d6ba	Merge branch 'master-ghc8107' into master-android	2023-10-18 22:45:11 +01:00
Evgeny Poberezkin	4004aafbc5	Merge branch 'master' into master-ghc8107	2023-10-18 22:44:27 +01:00
spaced4ndy	95008eeeaf	Merge branch 'master-ghc8107' into master-android	2023-10-16 20:05:49 +04:00
spaced4ndy	c7a8992043	core: fix compilation for ghc 8.10.7	2023-10-16 20:05:13 +04:00
spaced4ndy	ea2b5f2ccf	Merge branch 'master-ghc8107' into master-android	2023-10-16 19:28:48 +04:00
spaced4ndy	ed9f277421	Merge branch 'master' into master-ghc8107	2023-10-16 19:28:06 +04:00
Evgeny Poberezkin	5c14c3b349	Merge branch 'master-ghc8107' into master-android	2023-10-15 18:54:16 +01:00
Evgeny Poberezkin	d8fb31f167	Merge branch 'master' into master-ghc8107	2023-10-15 18:53:23 +01:00
Evgeny Poberezkin	02db38ffd3	Merge branch 'master-ghc8107' into master-android	2023-10-11 21:58:16 +01:00
Evgeny Poberezkin	7692195bfa	core: fix for ghc 8.10.7	2023-10-11 21:57:53 +01:00
Evgeny Poberezkin	c435cbdc7b	Merge branch 'master-ghc8107' into master-android	2023-10-11 21:28:43 +01:00
Evgeny Poberezkin	effc281271	Merge branch 'master' into master-ghc8107	2023-10-11 21:27:21 +01:00
spaced4ndy	41eb2e5689	Merge branch 'master-ghc8107' into master-android	2023-10-11 13:22:30 +04:00
spaced4ndy	67d74a0a27	Merge branch 'master' into master-ghc8107	2023-10-11 13:21:46 +04:00
Evgeny Poberezkin	c60af078d7	Merge branch 'stable' into stable-android	2023-10-09 19:55:51 +01:00
Evgeny Poberezkin	f66405e79b	Merge branch 'master-ghc8107' into master-android	2023-10-09 17:31:56 +01:00
Evgeny Poberezkin	74d186af16	Merge branch 'master' into master-ghc8107	2023-10-09 17:31:27 +01:00
Evgeny Poberezkin	e4fbe66d95	Merge branch 'stable' into stable-android	2023-10-09 14:36:03 +01:00
Evgeny Poberezkin	187fef0c5a	Merge branch 'master-ghc8107' into master-android	2023-10-09 14:05:21 +01:00
Evgeny Poberezkin	4782cab507	Merge branch 'master' into master-ghc8107	2023-10-09 14:05:04 +01:00
Evgeny Poberezkin	cb52d75ff0	Merge branch 'stable' into stable-android	2023-10-08 17:31:23 +01:00
Evgeny Poberezkin	bcbee67709	Merge branch 'master-ghc8107' into master-android	2023-10-08 08:38:40 +01:00
Evgeny Poberezkin	2501cbe55d	Merge branch 'master' into master-ghc8107	2023-10-08 08:38:02 +01:00
Evgeny Poberezkin	2bd049db87	Merge branch 'master-ghc8107' into master-android	2023-10-07 21:10:22 +01:00
Evgeny Poberezkin	6b8b9ab4fd	Merge branch 'master' into master-ghc8107	2023-10-07 19:06:38 +01:00
Evgeny Poberezkin	30db24265e	Merge branch 'master-ghc8107' into master-android	2023-10-02 23:04:44 +01:00
Evgeny Poberezkin	316d605899	Merge branch 'master' into master-ghc8107	2023-10-02 23:04:13 +01:00
Evgeny Poberezkin	b4257f7767	Merge branch 'master-ghc8107' into master-android	2023-10-01 13:21:50 +01:00
Evgeny Poberezkin	a3f2d5c919	Merge branch 'master' into master-ghc8107	2023-10-01 13:20:06 +01:00
Evgeny Poberezkin	cf46469cd5	Merge branch 'master-ghc8107' into master-android	2023-10-01 11:19:50 +01:00
Evgeny Poberezkin	0312fde818	Merge branch 'master' into master-ghc8107	2023-10-01 11:19:27 +01:00
Evgeny Poberezkin	9defa44f0c	Merge branch 'master-ghc8107' into master-android	2023-09-29 13:15:23 +01:00
Evgeny Poberezkin	915b53054c	Merge branch 'master' into master-ghc8107	2023-09-29 13:14:57 +01:00
Evgeny Poberezkin	f81557b4fd	Merge branch 'master-ghc8107' into master-android	2023-09-27 22:10:06 +01:00
Evgeny Poberezkin	e273bd1239	Merge branch 'master' into master-ghc8107	2023-09-27 22:04:00 +01:00
spaced4ndy	a63caf4640	Merge branch 'master-ghc8107' into master-android	2023-09-27 20:38:36 +04:00
spaced4ndy	e7f0234134	Merge branch 'master' into master-ghc8107	2023-09-27 20:11:39 +04:00
Evgeny Poberezkin	340552321e	Merge branch 'master-ghc8107' into master-android	2023-09-27 16:07:24 +01:00
Evgeny Poberezkin	98a3fc214d	Merge branch 'master' into master-ghc8107	2023-09-27 16:04:25 +01:00
Evgeny Poberezkin	6a578cfe3c	Merge branch 'master-ghc8107' into master-android	2023-09-25 16:53:04 +01:00
Evgeny Poberezkin	dacc075fe8	Merge branch 'master' into master-ghc8107	2023-09-25 16:52:33 +01:00
spaced4ndy	55418e2bc0	Merge branch 'master-ghc8107' into master-android	2023-09-25 17:43:59 +04:00
spaced4ndy	f2b5c0f3a8	Merge branch 'master' into master-ghc8107	2023-09-25 17:43:37 +04:00
spaced4ndy	5ebdf5dba9	Merge branch 'master-ghc8107' into master-android	2023-09-25 17:07:14 +04:00
spaced4ndy	8e045764df	Merge branch 'master' into master-ghc8107	2023-09-25 16:40:08 +04:00
Evgeny Poberezkin	503d3d77e6	Merge branch 'master' into master-ghc8107	2023-09-23 08:47:28 +01:00
Evgeny Poberezkin	81bd7d97c5	Merge branch 'master' into master-ghc8107	2023-09-22 17:21:54 +01:00
Evgeny Poberezkin	8f57925067	compatibility with GHC 8.10.7	2023-09-22 14:01:25 +01:00
Evgeny Poberezkin	9bf99db82e	Merge branch 'master' into master-ghc8107	2023-09-22 13:46:50 +01:00
Evgeny Poberezkin	5615cdbf1a	Merge branch 'master' into master-android	2023-09-21 17:04:47 +01:00
Evgeny Poberezkin	d802ae0058	Merge branch 'master' into master-android	2023-09-21 12:06:10 +01:00
Evgeny Poberezkin	8f2278198c	Merge branch 'master' into master-android	2023-09-20 14:55:25 +01:00
spaced4ndy	10937a5a4e	Merge branch 'master' into master-android	2023-09-20 17:36:53 +04:00
Evgeny Poberezkin	6aff6e9804	Merge branch 'master-ghc9' into master-ghc8107	2023-09-18 21:56:35 +01:00
Evgeny Poberezkin	95477cae7e	core: use commit from simplexmq branch master-ghc8107	2023-09-18 21:45:50 +01:00