rfc: paginated chat previews

2024-12-17 17:20:21 +01:00 · 2023-12-01 23:00:41 +02:00
76 changed files with 1650 additions and 1618 deletions
@@ -79,10 +79,10 @@ jobs:
        uses: actions/checkout@v3

      - name: Setup Haskell
-        uses: haskell/actions/setup@v2
+        uses: haskell-actions/setup@v2
        with:
-          ghc-version: "8.10.7"
-          cabal-version: "latest"
+          ghc-version: "9.6.3"
+          cabal-version: "3.10.1.0"

      - name: Cache dependencies
        uses: actions/cache@v3
@@ -188,7 +188,7 @@ jobs:
          APPLE_SIMPLEX_NOTARIZATION_APPLE_ID: ${{ secrets.APPLE_SIMPLEX_NOTARIZATION_APPLE_ID }}
          APPLE_SIMPLEX_NOTARIZATION_PASSWORD: ${{ secrets.APPLE_SIMPLEX_NOTARIZATION_PASSWORD }}
        run: |
-          scripts/build-desktop-mac.sh
+          scripts/ci/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
@@ -259,12 +259,10 @@ jobs:
      # Unix /

      # / Windows
-
-      # * 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
+      # rm -rf dist-newstyle/src/direct-sq* is here because of the bug in cabal's dependency which prevents second build from finishing

      - name: 'Setup MSYS2'
-        if: matrix.os == 'windows-latest'
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'windows-latest'
        uses: msys2/setup-msys2@v2
        with:
          msystem: ucrt64
@@ -26,10 +26,10 @@ struct SimpleXApp: App {
    @State private var showInitializationView = false

    init() {
-//        DispatchQueue.global(qos: .background).sync {
+        DispatchQueue.global(qos: .background).sync {
            haskell_init()
 //            hs_init(0, nil)
-//        }
+        }
        UserDefaults.standard.register(defaults: appDefaults)
        setGroupDefaults()
        registerGroupDefaults()
@@ -11,12 +11,20 @@ import CoreImage.CIFilterBuiltins

 struct MutableQRCode: View {
    @Binding var uri: String
-    var withLogo: Bool = true
-    var tintColor = UIColor(red: 0.023, green: 0.176, blue: 0.337, alpha: 1)
+    @State private var image: UIImage?

    var body: some View {
-        QRCode(uri: uri, withLogo: withLogo, tintColor: tintColor)
-            .id("simplex-qrcode-view-for-\(uri)")
+        ZStack {
+            if let image = image {
+                qrCodeImage(image)
+            }
+        }
+        .onAppear {
+            image = generateImage(uri)
+        }
+        .onChange(of: uri) { _ in
+            image = generateImage(uri)
+        }
    }
 }

@@ -41,7 +49,7 @@ struct QRCode: View {
    var withLogo: Bool = true
    var tintColor = UIColor(red: 0.023, green: 0.176, blue: 0.337, alpha: 1)
    @State private var image: UIImage? = nil
-    @State private var makeScreenshotFunc: () -> Void = {}
+    @State private var makeScreenshotBinding: () -> Void = {}

    var body: some View {
        ZStack {
@@ -62,18 +70,18 @@ struct QRCode: View {
                    }
                }
                .onAppear {
-                    makeScreenshotFunc = {
+                    makeScreenshotBinding = {
                        let size = CGSizeMake(1024 / UIScreen.main.scale, 1024 / UIScreen.main.scale)
-                        showShareSheet(items: [makeScreenshot(geo.frame(in: .local).origin, size)])
-                    }
+                        showShareSheet(items: [makeScreenshot(geo.frame(in: .local).origin, size)])}
                }
                .frame(width: geo.size.width, height: geo.size.height)
            }
        }
-        .onTapGesture(perform: makeScreenshotFunc)
+        .onTapGesture(perform: makeScreenshotBinding)
        .onAppear {
-            image = image ?? generateImage(uri, tintColor: tintColor)
+            image = image ?? generateImage(uri)?.replaceColor(UIColor.black, tintColor)
        }
+
    }
 }

@@ -85,13 +93,13 @@ private func qrCodeImage(_ image: UIImage) -> some View {
        .textSelection(.enabled)
 }

-private func generateImage(_ uri: String, tintColor: UIColor) -> UIImage? {
+private func generateImage(_ uri: String) -> UIImage? {
    let context = CIContext()
    let filter = CIFilter.qrCodeGenerator()
    filter.message = Data(uri.utf8)
    if let outputImage = filter.outputImage,
       let cgImage = context.createCGImage(outputImage, from: outputImage.extent) {
-        return UIImage(cgImage: cgImage).replaceColor(UIColor.black, tintColor)
+        return UIImage(cgImage: cgImage)
    }
    return nil
 }
@@ -190,8 +190,7 @@ struct UserAddressView: View {

    @ViewBuilder private func existingAddressView(_ userAddress: UserContactLink) -> some View {
        Section {
-            SimpleXLinkQRCode(uri: userAddress.connReqContact)
-                .id("simplex-contact-address-qrcode-\(userAddress.connReqContact)")
+            MutableQRCode(uri: Binding.constant(simplexChatLink(userAddress.connReqContact)))
            shareQRCodeButton(userAddress)
            if MFMailComposeViewController.canSendMail() {
                shareViaEmailButton(userAddress)
@@ -120,6 +120,11 @@
 		5CCD403727A5F9A200368C90 /* ScanToConnectView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CCD403627A5F9A200368C90 /* ScanToConnectView.swift */; };
 		5CD67B8F2B0E858A00C510B1 /* hs_init.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CD67B8D2B0E858A00C510B1 /* hs_init.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		5CD67B902B0E858A00C510B1 /* hs_init.c in Sources */ = {isa = PBXBuildFile; fileRef = 5CD67B8E2B0E858A00C510B1 /* hs_init.c */; };
+		5CD67BA02B120ADF00C510B1 /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CD67B9B2B120ADF00C510B1 /* libgmp.a */; };
+		5CD67BA12B120ADF00C510B1 /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CD67B9C2B120ADF00C510B1 /* libgmpxx.a */; };
+		5CD67BA22B120ADF00C510B1 /* libHSsimplex-chat-5.4.0.6-9DfazyElTA72omjHp0C93u.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CD67B9D2B120ADF00C510B1 /* libHSsimplex-chat-5.4.0.6-9DfazyElTA72omjHp0C93u.a */; };
+		5CD67BA32B120ADF00C510B1 /* libHSsimplex-chat-5.4.0.6-9DfazyElTA72omjHp0C93u-ghc8.10.7.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CD67B9E2B120ADF00C510B1 /* libHSsimplex-chat-5.4.0.6-9DfazyElTA72omjHp0C93u-ghc8.10.7.a */; };
+		5CD67BA42B120ADF00C510B1 /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CD67B9F2B120ADF00C510B1 /* libffi.a */; };
 		5CDCAD482818589900503DA2 /* NotificationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CDCAD472818589900503DA2 /* NotificationService.swift */; };
 		5CE2BA702845308900EC33A6 /* SimpleXChat.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CE2BA682845308900EC33A6 /* SimpleXChat.framework */; };
 		5CE2BA712845308900EC33A6 /* SimpleXChat.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 5CE2BA682845308900EC33A6 /* SimpleXChat.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -145,11 +150,6 @@
 		5CEACCED27DEA495000BD591 /* MsgContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CEACCEC27DEA495000BD591 /* MsgContentView.swift */; };
 		5CEBD7462A5C0A8F00665FE2 /* KeyboardPadding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CEBD7452A5C0A8F00665FE2 /* KeyboardPadding.swift */; };
 		5CEBD7482A5F115D00665FE2 /* SetDeliveryReceiptsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CEBD7472A5F115D00665FE2 /* SetDeliveryReceiptsView.swift */; };
-		5CF937182B22552700E1D781 /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CF937132B22552700E1D781 /* libffi.a */; };
-		5CF937192B22552700E1D781 /* libHSsimplex-chat-5.4.0.7-EoJ0xKOyE47DlSpHXf0V4-ghc8.10.7.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CF937142B22552700E1D781 /* libHSsimplex-chat-5.4.0.7-EoJ0xKOyE47DlSpHXf0V4-ghc8.10.7.a */; };
-		5CF9371A2B22552700E1D781 /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CF937152B22552700E1D781 /* libgmp.a */; };
-		5CF9371B2B22552700E1D781 /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CF937162B22552700E1D781 /* libgmpxx.a */; };
-		5CF9371C2B22552700E1D781 /* libHSsimplex-chat-5.4.0.7-EoJ0xKOyE47DlSpHXf0V4.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CF937172B22552700E1D781 /* libHSsimplex-chat-5.4.0.7-EoJ0xKOyE47DlSpHXf0V4.a */; };
 		5CFA59C42860BC6200863A68 /* MigrateToAppGroupView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CFA59C32860BC6200863A68 /* MigrateToAppGroupView.swift */; };
 		5CFA59D12864782E00863A68 /* ChatArchiveView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CFA59CF286477B400863A68 /* ChatArchiveView.swift */; };
 		5CFE0921282EEAF60002594B /* ZoomableScrollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CFE0920282EEAF60002594B /* ZoomableScrollView.swift */; };
@@ -165,11 +165,6 @@
 		64466DC829FC2B3B00E3D48D /* CreateSimpleXAddress.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64466DC729FC2B3B00E3D48D /* CreateSimpleXAddress.swift */; };
 		64466DCC29FFE3E800E3D48D /* MailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64466DCB29FFE3E800E3D48D /* MailView.swift */; };
 		6448BBB628FA9D56000D2AB9 /* GroupLinkView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6448BBB528FA9D56000D2AB9 /* GroupLinkView.swift */; };
-		6449333A2AF8E51000AC506E /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 644933352AF8E51000AC506E /* libgmpxx.a */; };
-		6449333B2AF8E51000AC506E /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 644933362AF8E51000AC506E /* libgmp.a */; };
-		6449333C2AF8E51000AC506E /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 644933372AF8E51000AC506E /* libffi.a */; };
-		6449333D2AF8E51000AC506E /* libHSsimplex-chat-5.4.0.3-EnhmkSQK6HvJ11g1uZERg8-ghc9.6.3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 644933382AF8E51000AC506E /* libHSsimplex-chat-5.4.0.3-EnhmkSQK6HvJ11g1uZERg8-ghc9.6.3.a */; };
-		6449333E2AF8E51000AC506E /* libHSsimplex-chat-5.4.0.3-EnhmkSQK6HvJ11g1uZERg8.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 644933392AF8E51000AC506E /* libHSsimplex-chat-5.4.0.3-EnhmkSQK6HvJ11g1uZERg8.a */; };
 		644EFFDE292BCD9D00525D5B /* ComposeVoiceView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 644EFFDD292BCD9D00525D5B /* ComposeVoiceView.swift */; };
 		644EFFE0292CFD7F00525D5B /* CIVoiceView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 644EFFDF292CFD7F00525D5B /* CIVoiceView.swift */; };
 		644EFFE2292D089800525D5B /* FramedCIVoiceView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 644EFFE1292D089800525D5B /* FramedCIVoiceView.swift */; };
@@ -408,6 +403,11 @@
 		5CCD403627A5F9A200368C90 /* ScanToConnectView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScanToConnectView.swift; sourceTree = "<group>"; };
 		5CD67B8D2B0E858A00C510B1 /* hs_init.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = hs_init.h; sourceTree = "<group>"; };
 		5CD67B8E2B0E858A00C510B1 /* hs_init.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = hs_init.c; sourceTree = "<group>"; };
+		5CD67B9B2B120ADF00C510B1 /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
+		5CD67B9C2B120ADF00C510B1 /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
+		5CD67B9D2B120ADF00C510B1 /* libHSsimplex-chat-5.4.0.6-9DfazyElTA72omjHp0C93u.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.4.0.6-9DfazyElTA72omjHp0C93u.a"; sourceTree = "<group>"; };
+		5CD67B9E2B120ADF00C510B1 /* libHSsimplex-chat-5.4.0.6-9DfazyElTA72omjHp0C93u-ghc8.10.7.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.4.0.6-9DfazyElTA72omjHp0C93u-ghc8.10.7.a"; sourceTree = "<group>"; };
+		5CD67B9F2B120ADF00C510B1 /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
 		5CDCAD452818589900503DA2 /* SimpleX NSE.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = "SimpleX NSE.appex"; sourceTree = BUILT_PRODUCTS_DIR; };
 		5CDCAD472818589900503DA2 /* NotificationService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationService.swift; sourceTree = "<group>"; };
 		5CDCAD492818589900503DA2 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -434,11 +434,6 @@
 		5CEACCEC27DEA495000BD591 /* MsgContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MsgContentView.swift; sourceTree = "<group>"; };
 		5CEBD7452A5C0A8F00665FE2 /* KeyboardPadding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyboardPadding.swift; sourceTree = "<group>"; };
 		5CEBD7472A5F115D00665FE2 /* SetDeliveryReceiptsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SetDeliveryReceiptsView.swift; sourceTree = "<group>"; };
-		5CF937132B22552700E1D781 /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
-		5CF937142B22552700E1D781 /* libHSsimplex-chat-5.4.0.7-EoJ0xKOyE47DlSpHXf0V4-ghc8.10.7.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.4.0.7-EoJ0xKOyE47DlSpHXf0V4-ghc8.10.7.a"; sourceTree = "<group>"; };
-		5CF937152B22552700E1D781 /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
-		5CF937162B22552700E1D781 /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
-		5CF937172B22552700E1D781 /* libHSsimplex-chat-5.4.0.7-EoJ0xKOyE47DlSpHXf0V4.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.4.0.7-EoJ0xKOyE47DlSpHXf0V4.a"; sourceTree = "<group>"; };
 		5CFA59C32860BC6200863A68 /* MigrateToAppGroupView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MigrateToAppGroupView.swift; sourceTree = "<group>"; };
 		5CFA59CF286477B400863A68 /* ChatArchiveView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatArchiveView.swift; sourceTree = "<group>"; };
 		5CFE0920282EEAF60002594B /* ZoomableScrollView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = ZoomableScrollView.swift; path = Shared/Views/ZoomableScrollView.swift; sourceTree = SOURCE_ROOT; };
@@ -453,11 +448,6 @@
 		64466DC729FC2B3B00E3D48D /* CreateSimpleXAddress.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateSimpleXAddress.swift; sourceTree = "<group>"; };
 		64466DCB29FFE3E800E3D48D /* MailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MailView.swift; sourceTree = "<group>"; };
 		6448BBB528FA9D56000D2AB9 /* GroupLinkView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupLinkView.swift; sourceTree = "<group>"; };
-		644933352AF8E51000AC506E /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
-		644933362AF8E51000AC506E /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
-		644933372AF8E51000AC506E /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
-		644933382AF8E51000AC506E /* libHSsimplex-chat-5.4.0.3-EnhmkSQK6HvJ11g1uZERg8-ghc9.6.3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.4.0.3-EnhmkSQK6HvJ11g1uZERg8-ghc9.6.3.a"; sourceTree = "<group>"; };
-		644933392AF8E51000AC506E /* libHSsimplex-chat-5.4.0.3-EnhmkSQK6HvJ11g1uZERg8.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.4.0.3-EnhmkSQK6HvJ11g1uZERg8.a"; sourceTree = "<group>"; };
 		644EFFDD292BCD9D00525D5B /* ComposeVoiceView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeVoiceView.swift; sourceTree = "<group>"; };
 		644EFFDF292CFD7F00525D5B /* CIVoiceView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CIVoiceView.swift; sourceTree = "<group>"; };
 		644EFFE1292D089800525D5B /* FramedCIVoiceView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FramedCIVoiceView.swift; sourceTree = "<group>"; };
@@ -521,12 +511,12 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				5CF9371C2B22552700E1D781 /* libHSsimplex-chat-5.4.0.7-EoJ0xKOyE47DlSpHXf0V4.a in Frameworks */,
-				5CF9371B2B22552700E1D781 /* libgmpxx.a in Frameworks */,
+				5CD67BA12B120ADF00C510B1 /* libgmpxx.a in Frameworks */,
+				5CD67BA22B120ADF00C510B1 /* libHSsimplex-chat-5.4.0.6-9DfazyElTA72omjHp0C93u.a in Frameworks */,
 				5CE2BA93284534B000EC33A6 /* libiconv.tbd in Frameworks */,
-				5CF9371A2B22552700E1D781 /* libgmp.a in Frameworks */,
-				5CF937182B22552700E1D781 /* libffi.a in Frameworks */,
-				5CF937192B22552700E1D781 /* libHSsimplex-chat-5.4.0.7-EoJ0xKOyE47DlSpHXf0V4-ghc8.10.7.a in Frameworks */,
+				5CD67BA02B120ADF00C510B1 /* libgmp.a in Frameworks */,
+				5CD67BA42B120ADF00C510B1 /* libffi.a in Frameworks */,
+				5CD67BA32B120ADF00C510B1 /* libHSsimplex-chat-5.4.0.6-9DfazyElTA72omjHp0C93u-ghc8.10.7.a in Frameworks */,
 				5CE2BA94284534BB00EC33A6 /* libz.tbd in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -589,11 +579,11 @@
 		5C764E5C279C70B7000C6508 /* Libraries */ = {
 			isa = PBXGroup;
 			children = (
-				5CF937132B22552700E1D781 /* libffi.a */,
-				5CF937152B22552700E1D781 /* libgmp.a */,
-				5CF937162B22552700E1D781 /* libgmpxx.a */,
-				5CF937142B22552700E1D781 /* libHSsimplex-chat-5.4.0.7-EoJ0xKOyE47DlSpHXf0V4-ghc8.10.7.a */,
-				5CF937172B22552700E1D781 /* libHSsimplex-chat-5.4.0.7-EoJ0xKOyE47DlSpHXf0V4.a */,
+				5CD67B9F2B120ADF00C510B1 /* libffi.a */,
+				5CD67B9B2B120ADF00C510B1 /* libgmp.a */,
+				5CD67B9C2B120ADF00C510B1 /* libgmpxx.a */,
+				5CD67B9E2B120ADF00C510B1 /* libHSsimplex-chat-5.4.0.6-9DfazyElTA72omjHp0C93u-ghc8.10.7.a */,
+				5CD67B9D2B120ADF00C510B1 /* libHSsimplex-chat-5.4.0.6-9DfazyElTA72omjHp0C93u.a */,
 			);
 			path = Libraries;
 			sourceTree = "<group>";
@@ -1512,7 +1502,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 185;
+				CURRENT_PROJECT_VERSION = 184;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				ENABLE_PREVIEWS = YES;
@@ -1534,7 +1524,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 5.4.1;
+				MARKETING_VERSION = 5.4;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.app;
 				PRODUCT_NAME = SimpleX;
 				SDKROOT = iphoneos;
@@ -1555,7 +1545,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 185;
+				CURRENT_PROJECT_VERSION = 184;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				ENABLE_PREVIEWS = YES;
@@ -1577,7 +1567,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 5.4.1;
+				MARKETING_VERSION = 5.4;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.app;
 				PRODUCT_NAME = SimpleX;
 				SDKROOT = iphoneos;
@@ -1636,7 +1626,7 @@
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 185;
+				CURRENT_PROJECT_VERSION = 184;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1649,7 +1639,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 5.4.1;
+				MARKETING_VERSION = 5.4;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-NSE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1668,7 +1658,7 @@
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 185;
+				CURRENT_PROJECT_VERSION = 184;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1681,7 +1671,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 5.4.1;
+				MARKETING_VERSION = 5.4;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-NSE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1700,7 +1690,7 @@
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 185;
+				CURRENT_PROJECT_VERSION = 184;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1724,7 +1714,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Libraries/sim",
 				);
-				MARKETING_VERSION = 5.4.1;
+				MARKETING_VERSION = 5.4;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.SimpleXChat;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
@@ -1746,7 +1736,7 @@
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 185;
+				CURRENT_PROJECT_VERSION = 184;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1770,7 +1760,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Libraries/sim",
 				);
-				MARKETING_VERSION = 5.4.1;
+				MARKETING_VERSION = 5.4;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.SimpleXChat;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
@@ -12,7 +12,7 @@ android {

    defaultConfig {
        applicationId = "chat.simplex.app"
-        minSdkVersion(28)
+        minSdkVersion(26)
        targetSdkVersion(33)
        // !!!
        // skip version code after release to F-Droid, as it uses two version codes
@@ -41,7 +41,9 @@ class MainActivity: FragmentActivity() {
      )
    }
    setContent {
-      AppScreen()
+      SimpleXTheme {
+        AppScreen()
+      }
    }
    SimplexApp.context.schedulePeriodicServiceRestartWorker()
    SimplexApp.context.schedulePeriodicWakeUp()
@@ -32,9 +32,7 @@ class SimplexApp: Application(), LifecycleEventObserver {
  override fun onCreate() {
    super.onCreate()
    if (ProcessPhoenix.isPhoenixProcess(this)) {
-      return
-    } else {
-      registerGlobalErrorHandler()
+      return;
    }
    context = this
    initHaskell()
@@ -110,7 +110,7 @@ android {
  compileSdkVersion(34)
  sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
  defaultConfig {
-    minSdkVersion(28)
+    minSdkVersion(26)
    targetSdkVersion(33)
  }
  compileOptions {
@@ -8,14 +8,10 @@ import android.os.Build
 import android.view.*
 import android.view.inputmethod.InputMethodManager
 import android.widget.Toast
-import androidx.activity.compose.setContent
 import androidx.compose.runtime.*
 import androidx.compose.ui.platform.LocalView
-import chat.simplex.common.AppScreen
-import chat.simplex.common.ui.theme.SimpleXTheme
-import chat.simplex.common.views.helpers.*
+import chat.simplex.common.views.helpers.KeyboardState
 import androidx.compose.ui.platform.LocalContext as LocalContext1
-import chat.simplex.res.MR

 actual fun showToast(text: String, timeout: Long) = Toast.makeText(androidAppContext, text, Toast.LENGTH_SHORT).show()

@@ -75,37 +71,3 @@ actual fun hideKeyboard(view: Any?) {
 }

 actual fun androidIsFinishingMainActivity(): Boolean = (mainActivity.get()?.isFinishing == true)
-
-actual class GlobalExceptionsHandler: Thread.UncaughtExceptionHandler {
-  actual override fun uncaughtException(thread: Thread, e: Throwable) {
-    Log.e(TAG, "App crashed, thread name: " + thread.name + ", exception: " + e.stackTraceToString())
-    if (ModalManager.start.hasModalsOpen()) {
-      ModalManager.start.closeModal()
-    } else if (chatModel.chatId.value != null) {
-      // Since no modals are open, the problem is probably in ChatView
-      chatModel.chatId.value = null
-      chatModel.chatItems.clear()
-    } else {
-      // ChatList, nothing to do. Maybe to show other view except ChatList
-    }
-    chatModel.activeCall.value?.let {
-      withBGApi {
-        chatModel.callManager.endCall(it)
-      }
-    }
-    AlertManager.shared.showAlertMsg(
-      title = generalGetString(MR.strings.app_was_crashed),
-      text = e.stackTraceToString()
-    )
-    //mainActivity.get()?.recreate()
-    mainActivity.get()?.apply {
-      window
-        ?.decorView
-        ?.findViewById<ViewGroup>(android.R.id.content)
-        ?.removeViewAt(0)
-      setContent {
-        AppScreen()
-      }
-    }
-  }
-}
@@ -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}/deps/libHSrts*_thr-*.${OS_LIB_EXT})
+	FILE(GLOB RTSLIB ${CMAKE_SOURCE_DIR}/libs/${OS_LIB_PATH}-${OS_LIB_ARCH}/libHSrts*_thr-*.${OS_LIB_EXT})
 	set_target_properties( rts PROPERTIES IMPORTED_LOCATION ${RTSLIB})

 	target_link_libraries(app-lib rts simplex)
@@ -42,11 +42,9 @@ data class SettingsViewState(

@Composable
 fun AppScreen() {
-  SimpleXTheme {
-    ProvideWindowInsets(windowInsetsAnimationsEnabled = true) {
-      Surface(color = MaterialTheme.colors.background) {
-        MainScreen()
-      }
+  ProvideWindowInsets(windowInsetsAnimationsEnabled = true) {
+    Surface(color = MaterialTheme.colors.background) {
+      MainScreen()
    }
  }
 }
@@ -2,6 +2,7 @@ package chat.simplex.common.model

 import androidx.compose.material.*
 import androidx.compose.runtime.*
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.snapshots.SnapshotStateMap
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.SpanStyle
@@ -67,9 +68,6 @@ object ChatModel {
  // set when app opened from external intent
  val clearOverlays = mutableStateOf<Boolean>(false)

-  // Only needed during onboarding when user skipped password setup (left as random password)
-  val desktopOnboardingRandomPassword = mutableStateOf(false)
-
  // set when app is opened via contact or invitation URI
  val appOpenUrl = mutableStateOf<URI?>(null)

@@ -1426,9 +1426,9 @@ object ChatController {
    chatModel.remoteHosts.addAll(hosts)
  }

-  suspend fun startRemoteHost(rhId: Long?, multicast: Boolean = true, address: RemoteCtrlAddress?, port: Int?): CR.RemoteHostStarted? {
-    val r = sendCmd(null, CC.StartRemoteHost(rhId, multicast, address, port))
-    if (r is CR.RemoteHostStarted) return r
+  suspend fun startRemoteHost(rhId: Long?, multicast: Boolean = true): Triple<RemoteHostInfo?, String, String>? {
+    val r = sendCmd(null, CC.StartRemoteHost(rhId, multicast))
+    if (r is CR.RemoteHostStarted) return Triple(r.remoteHost_, r.invitation, r.ctrlPort)
    apiErrorAlert("startRemoteHost", generalGetString(MR.strings.error_alert_title), r)
    return null
  }
@@ -2248,7 +2248,7 @@ sealed class CC {
  // Remote control
  class SetLocalDeviceName(val displayName: String): CC()
  class ListRemoteHosts(): CC()
-  class StartRemoteHost(val remoteHostId: Long?, val multicast: Boolean, val address: RemoteCtrlAddress?, val port: Int?): CC()
+  class StartRemoteHost(val remoteHostId: Long?, val multicast: Boolean): CC()
  class SwitchRemoteHost (val remoteHostId: Long?): CC()
  class StopRemoteHost(val remoteHostKey: Long?): CC()
  class DeleteRemoteHost(val remoteHostId: Long): CC()
@@ -2384,7 +2384,7 @@ sealed class CC {
    is CancelFile -> "/fcancel $fileId"
    is SetLocalDeviceName -> "/set device name $displayName"
    is ListRemoteHosts -> "/list remote hosts"
-    is StartRemoteHost -> "/start remote host " + (if (remoteHostId == null) "new" else "$remoteHostId multicast=${onOff(multicast)}") + (if (address != null) " addr=${address.address} iface=${address.`interface`}" else "") + (if (port != null) " port=$port" else "")
+    is StartRemoteHost -> "/start remote host " + if (remoteHostId == null) "new" else "$remoteHostId multicast=${onOff(multicast)}"
    is SwitchRemoteHost -> "/switch remote host " + if (remoteHostId == null) "local" else "$remoteHostId"
    is StopRemoteHost -> "/stop remote host " + if (remoteHostKey == null) "new" else "$remoteHostKey"
    is DeleteRemoteHost -> "/delete remote host $remoteHostId"
@@ -3606,8 +3606,6 @@ data class RemoteHostInfo(
  val remoteHostId: Long,
  val hostDeviceName: String,
  val storePath: String,
-  val bindAddress_: RemoteCtrlAddress?,
-  val bindPort_: Int?,
  val sessionState: RemoteHostSessionState?
 ) {
  val activeHost: Boolean
@@ -3616,12 +3614,6 @@ data class RemoteHostInfo(
  fun activeHost(): Boolean = chatModel.currentRemoteHost.value?.remoteHostId == remoteHostId
 }

-@Serializable
-data class RemoteCtrlAddress(
-  val address: String,
-  val `interface`: String
-)
-
@Serializable
 sealed class RemoteHostSessionState {
  @Serializable @SerialName("starting") object Starting: RemoteHostSessionState()
@@ -3856,7 +3848,7 @@ sealed class CR {
  // remote events (desktop)
  @Serializable @SerialName("remoteHostList") class RemoteHostList(val remoteHosts: List<RemoteHostInfo>): CR()
  @Serializable @SerialName("currentRemoteHost") class CurrentRemoteHost(val remoteHost_: RemoteHostInfo?): CR()
-  @Serializable @SerialName("remoteHostStarted") class RemoteHostStarted(val remoteHost_: RemoteHostInfo?, val invitation: String, val localAddrs: List<RemoteCtrlAddress>, val ctrlPort: String): CR()
+  @Serializable @SerialName("remoteHostStarted") class RemoteHostStarted(val remoteHost_: RemoteHostInfo?, val invitation: String, val ctrlPort: String): CR()
  @Serializable @SerialName("remoteHostSessionCode") class RemoteHostSessionCode(val remoteHost_: RemoteHostInfo?, val sessionCode: String): CR()
  @Serializable @SerialName("newRemoteHost") class NewRemoteHost(val remoteHost: RemoteHostInfo): CR()
  @Serializable @SerialName("remoteHostConnected") class RemoteHostConnected(val remoteHost: RemoteHostInfo): CR()
@@ -16,11 +16,3 @@ expect fun getKeyboardState(): State<KeyboardState>
 expect fun hideKeyboard(view: Any?)

 expect fun androidIsFinishingMainActivity(): Boolean
-
-fun registerGlobalErrorHandler() {
-  Thread.setDefaultUncaughtExceptionHandler(GlobalExceptionsHandler())
-}
-
-expect class GlobalExceptionsHandler(): Thread.UncaughtExceptionHandler {
-  override fun uncaughtException(thread: Thread, e: Throwable)
-}
@@ -207,12 +207,12 @@ fun createProfileInProfiles(chatModel: ChatModel, displayName: String, close: ()

 fun createProfileOnboarding(chatModel: ChatModel, displayName: String, close: () -> Unit) {
  withApi {
-    chatModel.currentUser.value = chatModel.controller.apiCreateActiveUser(
+    chatModel.controller.apiCreateActiveUser(
      null, Profile(displayName.trim(), "", null)
    ) ?: return@withApi
    val onboardingStage = chatModel.controller.appPrefs.onboardingStage
    if (chatModel.users.isEmpty()) {
-      onboardingStage.set(if (appPlatform.isDesktop && chatModel.controller.appPrefs.initialRandomDBPassphrase.get() && !chatModel.desktopOnboardingRandomPassword.value) {
+      onboardingStage.set(if (appPlatform.isDesktop && chatModel.controller.appPrefs.initialRandomDBPassphrase.get()) {
        OnboardingStage.Step2_5_SetupDatabasePassphrase
      } else {
        OnboardingStage.Step3_CreateSimpleXAddress
@@ -164,12 +164,6 @@ fun CIImageView(
          }
        }
      }
-    } else {
-      KeyChangeEffect(file) {
-        if (res.value == null) {
-          res.value = imageAndFilePath(file)
-        }
-      }
    }
    val loaded = res.value
    if (loaded != null) {
@@ -1,11 +1,8 @@
 package chat.simplex.common.views.helpers

 import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.CornerSize
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.text.selection.SelectionContainer
-import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
@@ -236,71 +233,53 @@ private fun alertTitle(title: String): (@Composable () -> Unit)? {

@Composable
 private fun AlertContent(text: String?, hostDevice: Pair<Long?, String>?, extraPadding: Boolean = false, content: @Composable (() -> Unit)) {
-  BoxWithConstraints {
-    Column(
-      Modifier
-        .padding(bottom = if (appPlatform.isDesktop) DEFAULT_PADDING else DEFAULT_PADDING_HALF)
-    ) {
-      if (appPlatform.isDesktop) {
-        HostDeviceTitle(hostDevice, extraPadding = extraPadding)
-      } else {
-        Spacer(Modifier.size(DEFAULT_PADDING_HALF))
-      }
-      CompositionLocalProvider(LocalContentAlpha provides ContentAlpha.high) {
-        if (text != null) {
-          Column(Modifier.heightIn(max = this@BoxWithConstraints.maxHeight * 0.7f)
-            .verticalScroll(rememberScrollState())
-          ) {
-            SelectionContainer {
-              Text(
-                escapedHtmlToAnnotatedString(text, LocalDensity.current),
-                Modifier.fillMaxWidth().padding(start = DEFAULT_PADDING, end = DEFAULT_PADDING, bottom = DEFAULT_PADDING * 1.5f),
-                fontSize = 16.sp,
-                textAlign = TextAlign.Center,
-                color = MaterialTheme.colors.secondary
-              )
-            }
-          }
-        }
-      }
-      content()
+  Column(
+    Modifier
+      .padding(bottom = if (appPlatform.isDesktop) DEFAULT_PADDING else DEFAULT_PADDING_HALF)
+  ) {
+    if (appPlatform.isDesktop) {
+      HostDeviceTitle(hostDevice, extraPadding = extraPadding)
+    } else {
+      Spacer(Modifier.size(DEFAULT_PADDING_HALF))
    }
+    CompositionLocalProvider(LocalContentAlpha provides ContentAlpha.high) {
+      if (text != null) {
+        Text(
+          escapedHtmlToAnnotatedString(text, LocalDensity.current),
+          Modifier.fillMaxWidth().padding(start = DEFAULT_PADDING, end = DEFAULT_PADDING, bottom = DEFAULT_PADDING * 1.5f),
+          fontSize = 16.sp,
+          textAlign = TextAlign.Center,
+          color = MaterialTheme.colors.secondary
+        )
+      }
+    }
+    content()
  }
 }

@Composable
 private fun AlertContent(text: AnnotatedString?, hostDevice: Pair<Long?, String>?, extraPadding: Boolean = false, content: @Composable (() -> Unit)) {
-  BoxWithConstraints {
-    Column(
-      Modifier
-        .verticalScroll(rememberScrollState())
-        .padding(bottom = if (appPlatform.isDesktop) DEFAULT_PADDING else DEFAULT_PADDING_HALF)
-    ) {
-      if (appPlatform.isDesktop) {
-        HostDeviceTitle(hostDevice, extraPadding = extraPadding)
-      } else {
-        Spacer(Modifier.size(DEFAULT_PADDING_HALF))
-      }
-      CompositionLocalProvider(LocalContentAlpha provides ContentAlpha.high) {
-        if (text != null) {
-          Column(
-            Modifier.heightIn(max = this@BoxWithConstraints.maxHeight * 0.7f)
-              .verticalScroll(rememberScrollState())
-          ) {
-            SelectionContainer {
-              Text(
-                text,
-                Modifier.fillMaxWidth().padding(start = DEFAULT_PADDING, end = DEFAULT_PADDING, bottom = DEFAULT_PADDING * 1.5f),
-                fontSize = 16.sp,
-                textAlign = TextAlign.Center,
-                color = MaterialTheme.colors.secondary
-              )
-            }
-          }
-        }
-      }
-      content()
+  Column(
+    Modifier
+      .padding(bottom = if (appPlatform.isDesktop) DEFAULT_PADDING else DEFAULT_PADDING_HALF)
+  ) {
+    if (appPlatform.isDesktop) {
+      HostDeviceTitle(hostDevice, extraPadding = extraPadding)
+    } else {
+      Spacer(Modifier.size(DEFAULT_PADDING_HALF))
    }
+    CompositionLocalProvider(LocalContentAlpha provides ContentAlpha.high) {
+      if (text != null) {
+        Text(
+          text,
+          Modifier.fillMaxWidth().padding(start = DEFAULT_PADDING, end = DEFAULT_PADDING, bottom = DEFAULT_PADDING * 1.5f),
+          fontSize = 16.sp,
+          textAlign = TextAlign.Center,
+          color = MaterialTheme.colors.secondary
+        )
+      }
+    }
+    content()
  }
 }

@@ -19,8 +19,8 @@ import dev.icerock.moko.resources.compose.painterResource
 import androidx.compose.ui.text.*
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.*
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.*
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import chat.simplex.common.views.database.PassphraseStrength
 import chat.simplex.common.views.database.validKey
 import chat.simplex.res.MR
@@ -123,7 +123,6 @@ fun DefaultConfigurableTextField(
  isValid: (String) -> Boolean,
  keyboardActions: KeyboardActions = KeyboardActions(),
  keyboardType: KeyboardType = KeyboardType.Text,
-  fontSize: TextUnit = 16.sp,
  dependsOn: State<Any?>? = null,
 ) {
  var valid by remember { mutableStateOf(isValid(state.value.text)) }
@@ -153,6 +152,7 @@ fun DefaultConfigurableTextField(
  BasicTextField(
    value = state.value,
    modifier = modifier
+      .fillMaxWidth()
      .background(colors.backgroundColor(enabled).value, shape)
      .indicatorLine(enabled, false, interactionSource, colors)
      .defaultMinSize(
@@ -176,14 +176,14 @@ fun DefaultConfigurableTextField(
    textStyle = TextStyle.Default.copy(
      color = color,
      fontWeight = FontWeight.Normal,
-      fontSize = fontSize
+      fontSize = 16.sp
    ),
    interactionSource = interactionSource,
    decorationBox = @Composable { innerTextField ->
      TextFieldDefaults.TextFieldDecorationBox(
        value = state.value.text,
        innerTextField = innerTextField,
-        placeholder = { Text(placeholder, color = MaterialTheme.colors.secondary, fontSize = fontSize, maxLines = 1, overflow = TextOverflow.Ellipsis) },
+        placeholder = { Text(placeholder, color = MaterialTheme.colors.secondary) },
        singleLine = true,
        enabled = enabled,
        isError = !valid,
@@ -10,90 +10,72 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.*
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import chat.simplex.res.MR
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.usersettings.SettingsActionItemWithContent

-@Composable
-fun <T> ExposedDropDownSetting(
-  values: List<Pair<T, String>>,
-  selection: State<T>,
-  textColor: Color = MaterialTheme.colors.secondary,
-  fontSize: TextUnit = 16.sp,
-  label: String? = null,
-  enabled: State<Boolean> = mutableStateOf(true),
-  minWidth: Dp = 200.dp,
-  maxWidth: Dp = with(LocalDensity.current) { 180.sp.toDp() },
-  onSelected: (T) -> Unit
-) {
-  val expanded = remember { mutableStateOf(false) }
-  ExposedDropdownMenuBox(
-    expanded = expanded.value,
-    onExpandedChange = {
-      expanded.value = !expanded.value && enabled.value
-    }
-  ) {
-    Row(
-      Modifier.padding(start = 10.dp),
-      verticalAlignment = Alignment.CenterVertically,
-      horizontalArrangement = Arrangement.End
-    ) {
-      Text(
-        values.first { it.first == selection.value }.second + (if (label != null) " $label" else ""),
-        Modifier.widthIn(max = maxWidth),
-        maxLines = 1,
-        overflow = TextOverflow.Ellipsis,
-        color = textColor,
-        fontSize = fontSize,
-      )
-      Spacer(Modifier.size(12.dp))
-      Icon(
-        if (!expanded.value) painterResource(MR.images.ic_expand_more) else painterResource(MR.images.ic_expand_less),
-        generalGetString(MR.strings.icon_descr_more_button),
-        tint = MaterialTheme.colors.secondary
-      )
-    }
-    DefaultExposedDropdownMenu(
-      modifier = Modifier.widthIn(min = minWidth),
-      expanded = expanded,
-    ) {
-      values.forEach { selectionOption ->
-        DropdownMenuItem(
-          onClick = {
-            onSelected(selectionOption.first)
-            expanded.value = false
-          },
-          contentPadding = PaddingValues(horizontal = DEFAULT_PADDING * 1.5f)
-        ) {
-          Text(
-            selectionOption.second + (if (label != null) " $label" else ""),
-            maxLines = 1,
-            overflow = TextOverflow.Ellipsis,
-            color = if (isInDarkTheme()) MenuTextColorDark else Color.Black,
-            fontSize = fontSize,
-          )
-        }
-      }
-    }
-  }
-}
-
@Composable
 fun <T> ExposedDropDownSettingRow(
  title: String,
  values: List<Pair<T, String>>,
  selection: State<T>,
-  textColor: Color = MaterialTheme.colors.secondary,
  label: String? = null,
  icon: Painter? = null,
  iconTint: Color = MaterialTheme.colors.secondary,
  enabled: State<Boolean> = mutableStateOf(true),
-  minWidth: Dp = 200.dp,
-  maxWidth: Dp = with(LocalDensity.current) { 180.sp.toDp() },
  onSelected: (T) -> Unit
 ) {
  SettingsActionItemWithContent(icon, title, iconColor = iconTint, disabled = !enabled.value) {
-    ExposedDropDownSetting(values, selection ,textColor, label = label, enabled = enabled, minWidth = minWidth, maxWidth = maxWidth, onSelected = onSelected)
+    val expanded = remember { mutableStateOf(false) }
+    ExposedDropdownMenuBox(
+      expanded = expanded.value,
+      onExpandedChange = {
+        expanded.value = !expanded.value && enabled.value
+      }
+    ) {
+      Row(
+        Modifier.padding(start = 10.dp),
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.End
+      ) {
+        val maxWidth = with(LocalDensity.current) { 180.sp.toDp() }
+        Text(
+          values.first { it.first == selection.value }.second + (if (label != null) " $label" else ""),
+          Modifier.widthIn(max = maxWidth),
+          maxLines = 1,
+          overflow = TextOverflow.Ellipsis,
+          color = MaterialTheme.colors.secondary
+        )
+        Spacer(Modifier.size(12.dp))
+        Icon(
+          if (!expanded.value) painterResource(MR.images.ic_expand_more) else painterResource(MR.images.ic_expand_less),
+          generalGetString(MR.strings.icon_descr_more_button),
+          tint = MaterialTheme.colors.secondary
+        )
+      }
+      DefaultExposedDropdownMenu(
+        modifier = Modifier.widthIn(min = 200.dp),
+        expanded = expanded,
+      ) {
+        values.forEach { selectionOption ->
+          DropdownMenuItem(
+            onClick = {
+              onSelected(selectionOption.first)
+              expanded.value = false
+            },
+            contentPadding = PaddingValues(horizontal = DEFAULT_PADDING * 1.5f)
+          ) {
+            Text(
+              selectionOption.second + (if (label != null) " $label" else ""),
+              maxLines = 1,
+              overflow = TextOverflow.Ellipsis,
+              color = if (isInDarkTheme()) MenuTextColorDark else Color.Black,
+            )
+          }
+        }
+      }
+    }
  }
 }
@@ -55,7 +55,7 @@ fun annotatedStringResource(id: StringResource): AnnotatedString {
@Composable
 fun annotatedStringResource(id: StringResource, vararg args: Any?): AnnotatedString {
  val density = LocalDensity.current
-  return remember(id, args) {
+  return remember(id) {
    escapedHtmlToAnnotatedString(id.localized().format(args = args), density)
  }
 }
@@ -73,8 +73,7 @@ private fun LinkAMobileLayout(
      }
      Box(Modifier.weight(0.7f)) {
        AddingMobileDevice(false, staleQrCode, connecting) {
-          // currentRemoteHost will be set instantly but remoteHosts may be delayed
-          if (chatModel.remoteHosts.isEmpty() && chatModel.currentRemoteHost.value == null) {
+          if (chatModel.remoteHosts.isEmpty()) {
            chatModel.controller.appPrefs.onboardingStage.set(OnboardingStage.Step1_SimpleXInfo)
          } else {
            chatModel.controller.appPrefs.onboardingStage.set(OnboardingStage.OnboardingComplete)
@@ -1,7 +1,10 @@
 package chat.simplex.common.views.onboarding

 import SectionBottomSpacer
+import SectionItemView
+import SectionItemViewSpaceBetween
 import SectionTextFooter
+import SectionView
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.KeyboardActions
@@ -12,12 +15,14 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.*
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.input.key.*
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.text.input.ImeAction
 import dev.icerock.moko.resources.compose.painterResource
 import dev.icerock.moko.resources.compose.stringResource
 import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import chat.simplex.common.model.*
 import chat.simplex.common.platform.*
@@ -172,10 +177,7 @@ private fun SetupDatabasePassphraseLayout(
    }

    Spacer(Modifier.weight(1f))
-    SkipButton(progressIndicator.value) {
-      chatModel.desktopOnboardingRandomPassword.value = true
-      nextStep()
-    }
+    SkipButton(progressIndicator.value, nextStep)

    SectionBottomSpacer()
  }
@@ -9,7 +9,6 @@ import SectionView
 import TextIconSpaced
 import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.selection.SelectionContainer
 import androidx.compose.material.*
 import androidx.compose.runtime.*
@@ -18,7 +17,6 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalClipboardManager
-import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.*
 import androidx.compose.ui.text.input.*
@@ -34,11 +32,11 @@ import chat.simplex.common.views.chat.item.ItemAction
 import chat.simplex.common.views.chatlist.*
 import chat.simplex.common.views.helpers.*
 import chat.simplex.common.views.newchat.QRCode
-import chat.simplex.common.views.usersettings.*
+import chat.simplex.common.views.usersettings.PreferenceToggle
+import chat.simplex.common.views.usersettings.SettingsActionItemWithContent
 import chat.simplex.res.MR
 import dev.icerock.moko.resources.compose.painterResource
 import dev.icerock.moko.resources.compose.stringResource
-import kotlinx.coroutines.flow.distinctUntilChanged

@Composable
 fun ConnectMobileView() {
@@ -158,7 +156,7 @@ fun DeviceNameField(
  DefaultConfigurableTextField(
    state = state,
    placeholder = generalGetString(MR.strings.enter_this_device_name),
-    modifier = Modifier.fillMaxWidth().padding(start = DEFAULT_PADDING),
+    modifier = Modifier.padding(start = DEFAULT_PADDING),
    isValid = { true },
  )
  KeyChangeEffect(state.value) {
@@ -174,8 +172,7 @@ private fun ConnectMobileViewLayout(
  sessionCode: String?,
  port: String?,
  staleQrCode: Boolean = false,
-  refreshQrCode: () -> Unit = {},
-  UnderQrLayout: @Composable () -> Unit = {},
+  refreshQrCode: () -> Unit = {}
 ) {
  Column(
    Modifier.fillMaxWidth().verticalScroll(rememberScrollState()),
@@ -199,9 +196,7 @@ private fun ConnectMobileViewLayout(
          }
        }
        SectionTextFooter(annotatedStringResource(MR.strings.open_on_mobile_and_scan_qr_code), textAlign = TextAlign.Center)
-        SectionTextFooter(annotatedStringResource(MR.strings.waiting_for_mobile_to_connect), textAlign = TextAlign.Center)
-
-        UnderQrLayout()
+        SectionTextFooter(annotatedStringResource(MR.strings.waiting_for_mobile_to_connect_on_port, port), textAlign = TextAlign.Center)

        if (remember { controller.appPrefs.developerTools.state }.value) {
          val clipboard = LocalClipboardManager.current
@@ -238,9 +233,7 @@ private fun ConnectMobileViewLayout(
        }
      }
    }
-    if (invitation != null) {
-      SectionBottomSpacer()
-    }
+    SectionBottomSpacer()
  }
 }

@@ -266,21 +259,14 @@ private fun showAddingMobileDevice(connecting: MutableState<Boolean>) {

@Composable
 fun AddingMobileDevice(showTitle: Boolean, staleQrCode: MutableState<Boolean>, connecting: MutableState<Boolean>, close: () -> Unit) {
-  var cachedR by remember { mutableStateOf<CR.RemoteHostStarted?>(null) }
-  val customAddress = rememberSaveable { mutableStateOf<RemoteCtrlAddress?>(null) }
-  val customPort = rememberSaveable { mutableStateOf<Int?>(null) }
+  val invitation = rememberSaveable { mutableStateOf<String?>(null) }
+  val port = rememberSaveable { mutableStateOf<String?>(null) }
  val startRemoteHost = suspend {
-    val r = chatModel.controller.startRemoteHost(
-      rhId = null,
-      multicast = controller.appPrefs.offerRemoteMulticast.get(),
-      address = if (customAddress.value?.address != cachedR.address?.address) customAddress.value else cachedR.rh?.bindAddress_,
-      port = if (customPort.value != cachedR.port) customPort.value else cachedR.rh?.bindPort_
-    )
+    val r = chatModel.controller.startRemoteHost(null, controller.appPrefs.offerRemoteMulticast.get())
    if (r != null) {
-      cachedR = r
      connecting.value = true
-      customAddress.value = cachedR.addresses.firstOrNull()
-      customPort.value = cachedR.port
+      invitation.value = r.second
+      port.value = r.third
      chatModel.remoteHostPairing.value = null to RemoteHostSessionState.Starting
    }
  }
@@ -297,11 +283,11 @@ fun AddingMobileDevice(showTitle: Boolean, staleQrCode: MutableState<Boolean>, c
  val remoteDeviceName = pairing.value?.first?.hostDeviceName
  ConnectMobileViewLayout(
    title = if (!showTitle) null else if (cachedSessionCode == null) stringResource(MR.strings.link_a_mobile) else stringResource(MR.strings.verify_connection),
-    invitation = cachedR?.invitation,
+    invitation = invitation.value,
    deviceName = remoteDeviceName,
    sessionCode = cachedSessionCode,
-    port = cachedR?.ctrlPort,
-    staleQrCode = staleQrCode.value || (cachedR.address != customAddress.value && customAddress.value != null) || cachedR.port != customPort.value,
+    port = port.value,
+    staleQrCode = staleQrCode.value,
    refreshQrCode = {
      withBGApi {
        if (chatController.stopRemoteHost(null)) {
@@ -310,7 +296,6 @@ fun AddingMobileDevice(showTitle: Boolean, staleQrCode: MutableState<Boolean>, c
        }
      }
    },
-    UnderQrLayout = { UnderQrLayout(cachedR, customAddress, customPort) }
  )
  val oldRemoteHostId by remember { mutableStateOf(chatModel.currentRemoteHost.value?.remoteHostId) }
  LaunchedEffect(remember { chatModel.currentRemoteHost }.value) {
@@ -340,25 +325,9 @@ fun AddingMobileDevice(showTitle: Boolean, staleQrCode: MutableState<Boolean>, c

 private fun showConnectMobileDevice(rh: RemoteHostInfo, connecting: MutableState<Boolean>) {
  ModalManager.start.showModalCloseable { close ->
-    var cachedR by remember { mutableStateOf<CR.RemoteHostStarted?>(null) }
-    val customAddress = rememberSaveable { mutableStateOf<RemoteCtrlAddress?>(null) }
-    val customPort = rememberSaveable { mutableStateOf<Int?>(null) }
-    val startRemoteHost = suspend {
-      val r = chatModel.controller.startRemoteHost(
-        rhId = rh.remoteHostId,
-        multicast = controller.appPrefs.offerRemoteMulticast.get(),
-        address = if (customAddress.value?.address != cachedR.address?.address) customAddress.value else cachedR.rh?.bindAddress_ ?: rh.bindAddress_,
-        port = if (customPort.value != cachedR.port) customPort.value else cachedR.rh?.bindPort_ ?: rh.bindPort_
-      )
-      if (r != null) {
-        cachedR = r
-        connecting.value = true
-        customAddress.value = cachedR.addresses.firstOrNull()
-        customPort.value = cachedR.port
-        chatModel.remoteHostPairing.value = null to RemoteHostSessionState.Starting
-      }
-    }
    val pairing = remember { chatModel.remoteHostPairing }
+    val invitation = rememberSaveable { mutableStateOf<String?>(null) }
+    val port = rememberSaveable { mutableStateOf<String?>(null) }
    val sessionCode = when (val state = pairing.value?.second) {
      is RemoteHostSessionState.PendingConfirmation -> state.sessionCode
      else -> null
@@ -370,22 +339,25 @@ private fun showConnectMobileDevice(rh: RemoteHostInfo, connecting: MutableState
    }
    ConnectMobileViewLayout(
      title = if (cachedSessionCode == null) stringResource(MR.strings.scan_from_mobile) else stringResource(MR.strings.verify_connection),
-      invitation = cachedR?.invitation,
+      invitation = invitation.value,
      deviceName = pairing.value?.first?.hostDeviceName ?: rh.hostDeviceName,
      sessionCode = cachedSessionCode,
-      port = cachedR?.ctrlPort,
-      staleQrCode = (cachedR.address != customAddress.value && customAddress.value != null) || cachedR.port != customPort.value,
-      refreshQrCode = {
-        withBGApi {
-          if (chatController.stopRemoteHost(rh.remoteHostId)) {
-            startRemoteHost()
-          }
-        }
-      },
-      UnderQrLayout = { UnderQrLayout(cachedR, customAddress, customPort) }
+      port = port.value
    )
+    var remoteHostId by rememberSaveable { mutableStateOf<Long?>(null) }
+    LaunchedEffect(Unit) {
+      val r = chatModel.controller.startRemoteHost(rh.remoteHostId, controller.appPrefs.offerRemoteMulticast.get())
+      if (r != null) {
+        val (rh_, inv) = r
+        connecting.value = true
+        remoteHostId = rh_?.remoteHostId
+        invitation.value = inv
+        port.value = r.third
+        chatModel.remoteHostPairing.value = null to RemoteHostSessionState.Starting
+      }
+    }
    LaunchedEffect(remember { chatModel.currentRemoteHost }.value) {
-      if (cachedR.remoteHostId != null && chatModel.currentRemoteHost.value?.remoteHostId == cachedR.remoteHostId) {
+      if (remoteHostId != null && chatModel.currentRemoteHost.value?.remoteHostId == remoteHostId) {
        close()
      }
    }
@@ -395,13 +367,10 @@ private fun showConnectMobileDevice(rh: RemoteHostInfo, connecting: MutableState
      }
    }
    DisposableEffect(Unit) {
-      withBGApi {
-        startRemoteHost()
-      }
      onDispose {
-        if (cachedR.remoteHostId != null && chatModel.currentRemoteHost.value?.remoteHostId != cachedR.remoteHostId) {
+        if (remoteHostId != null && chatModel.currentRemoteHost.value?.remoteHostId != remoteHostId) {
          withBGApi {
-            chatController.stopRemoteHost(cachedR.remoteHostId)
+            chatController.stopRemoteHost(remoteHostId)
          }
        }
        chatModel.remoteHostPairing.value = null
@@ -434,77 +403,3 @@ private fun showConnectedMobileDevice(rh: RemoteHostInfo, disconnectHost: () ->
    }
  }
 }
-
-@Composable
-private fun UnderQrLayout(cachedR: CR.RemoteHostStarted?, customAddress: MutableState<RemoteCtrlAddress?>, customPort: MutableState<Int?>) {
-  Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.Center) {
-    if (cachedR.addresses.size > 1) {
-      ExposedDropDownSetting(
-        cachedR.addresses.map { it to it.address + " (${it.`interface`})" },
-        customAddress,
-        textColor = MaterialTheme.colors.onBackground,
-        fontSize = 14.sp,
-        minWidth = 250.dp,
-        maxWidth = with(LocalDensity.current) { 250.sp.toDp() },
-        enabled = remember { mutableStateOf(cachedR.addresses.size > 1) },
-        onSelected = {
-          customAddress.value = it
-        }
-      )
-    } else {
-      Spacer(Modifier.width(10.dp))
-      Text(customAddress.value?.address + " (${customAddress.value?.`interface`})", fontSize = 14.sp, color = MaterialTheme.colors.onBackground)
-    }
-    val portUnsaved = rememberSaveable(stateSaver = TextFieldValue.Saver) {
-      mutableStateOf(TextFieldValue((customPort.value ?: cachedR.port!!).toString()))
-    }
-    Spacer(Modifier.width(DEFAULT_PADDING))
-    Box {
-      DefaultConfigurableTextField(
-        portUnsaved,
-        stringResource(MR.strings.random_port),
-        modifier = Modifier.widthIn(max = 132.dp),
-        isValid = { (validPort(it) && it.toInt() > 1023) || it.isBlank() },
-        keyboardActions = KeyboardActions(onDone = { defaultKeyboardAction(ImeAction.Done) }),
-        keyboardType = KeyboardType.Number,
-        fontSize = 14.sp,
-      )
-      if (validPort(portUnsaved.value.text) && portUnsaved.value.text.toInt() > 1023) {
-        Icon(painterResource(MR.images.ic_edit), stringResource(MR.strings.edit_verb), Modifier.padding(end = 56.dp).size(16.dp).align(Alignment.CenterEnd), tint = MaterialTheme.colors.secondary)
-        IconButton(::showOpenPortAlert, Modifier.align(Alignment.TopEnd).padding(top = 2.dp)) {
-          Icon(painterResource(MR.images.ic_info), null, tint = MaterialTheme.colors.primary)
-        }
-      }
-    }
-    LaunchedEffect(Unit) {
-      snapshotFlow { portUnsaved.value.text }
-        .distinctUntilChanged()
-        .collect {
-          if (validPort(it) && it.toInt() > 1023) {
-            customPort.value = it.toInt()
-          } else {
-            customPort.value = null
-          }
-        }
-    }
-    KeyChangeEffect(customPort.value) {
-      if (customPort.value != null) {
-        portUnsaved.value = portUnsaved.value.copy(text = customPort.value.toString())
-      }
-    }
-  }
-}
-
-private fun showOpenPortAlert() {
-  AlertManager.shared.showAlertMsg(
-    title = generalGetString(MR.strings.open_port_in_firewall_title),
-    text = generalGetString(MR.strings.open_port_in_firewall_desc),
-  )
-}
-
-private val CR.RemoteHostStarted?.rh: RemoteHostInfo? get() = this?.remoteHost_
-private val CR.RemoteHostStarted?.remoteHostId: Long? get() = this?.remoteHost_?.remoteHostId
-private val CR.RemoteHostStarted?.address: RemoteCtrlAddress? get() = this?.localAddrs?.firstOrNull()
-private val CR.RemoteHostStarted?.addresses: List<RemoteCtrlAddress> get() =
-  (if (controller.appPrefs.developerTools.get() || this?.localAddrs?.indexOfFirst { it.address == "127.0.0.1" } == 0) this?.localAddrs else this?.localAddrs?.filterNot { it.address == "127.0.0.1" }) ?: emptyList()
-private val CR.RemoteHostStarted?.port: Int? get() = this?.ctrlPort?.toIntOrNull()
@@ -305,7 +305,7 @@ fun SockProxySettings(m: ChatModel) {
        DefaultConfigurableTextField(
          hostUnsaved,
          stringResource(MR.strings.host_verb),
-          modifier = Modifier.fillMaxWidth(),
+          modifier = Modifier,
          isValid = ::validHost,
          keyboardActions = KeyboardActions(onNext = { defaultKeyboardAction(ImeAction.Next) }),
          keyboardType = KeyboardType.Text,
@@ -315,7 +315,7 @@ fun SockProxySettings(m: ChatModel) {
        DefaultConfigurableTextField(
          portUnsaved,
          stringResource(MR.strings.port_verb),
-          modifier = Modifier.fillMaxWidth(),
+          modifier = Modifier,
          isValid = ::validPort,
          keyboardActions = KeyboardActions(onDone = { defaultKeyboardAction(ImeAction.Done); save() }),
          keyboardType = KeyboardType.Number,
@@ -428,7 +428,7 @@ private fun validHost(s: String): Boolean {
 }

 // https://ihateregex.io/expr/port/
-fun validPort(s: String): Boolean {
+private fun validPort(s: String): Boolean {
  val validPort = Regex("^(6553[0-5])|(655[0-2][0-9])|(65[0-4][0-9]{2})|(6[0-4][0-9]{3})|([1-5][0-9]{4})|([0-5]{0,5})|([0-9]{1,4})$")
  return s.isNotBlank() && s.matches(validPort)
 }
@@ -18,7 +18,6 @@
  <string name="opening_database">Opening database…</string>
  <string name="non_content_uri_alert_title">Invalid file path</string>
  <string name="non_content_uri_alert_text">You shared an invalid file path. Report the issue to the app developers.</string>
-  <string name="app_was_crashed">View crashed</string>

  <!-- Server info - ChatModel.kt -->
  <string name="server_connected">connected</string>
@@ -1666,7 +1665,7 @@
  <string name="disconnect_desktop_question">Disconnect desktop?</string>
  <string name="only_one_device_can_work_at_the_same_time">Only one device can work at the same time</string>
  <string name="open_on_mobile_and_scan_qr_code"><![CDATA[Open <i>Use from desktop</i> in mobile app and scan QR code.]]></string>
-  <string name="waiting_for_mobile_to_connect">Waiting for mobile to connect:</string>
+  <string name="waiting_for_mobile_to_connect_on_port"><![CDATA[Waiting for mobile to connect on port <i>%s</i>]]></string>
  <string name="bad_desktop_address">Bad desktop address</string>
  <string name="desktop_incompatible_version">Incompatible version</string>
  <string name="desktop_app_version_is_incompatible">Desktop app version %s is not compatible with this app.</string>
@@ -1694,9 +1693,6 @@
  <string name="not_compatible">Not compatible!</string>
  <string name="refresh_qr_code">Refresh</string>
  <string name="no_connected_mobile">No connected mobile</string>
-  <string name="random_port">Random</string>
-  <string name="open_port_in_firewall_title">Open port in firewall</string>
-  <string name="open_port_in_firewall_desc">To allow a mobile app to connect to the desktop, open this port in your firewall, if you have it enabled</string>

  <!-- Under development -->
  <string name="in_developing_title">Coming soon!</string>
@@ -1581,7 +1581,7 @@
    <string name="v5_4_better_groups_descr">Schnellerer Gruppenbeitritt und zuverlässigere Nachrichtenzustellung.</string>
    <string name="linked_mobiles">Verknüpfte Mobiltelefone</string>
    <string name="this_device_name">Dieser Gerätename</string>
-    <string name="waiting_for_mobile_to_connect">Auf die Mobiltelefonverbindung warten:</string>
+    <string name="waiting_for_mobile_to_connect_on_port"><![CDATA[Auf die Mobiltelefonverbindung über Port <i>%s</i> warten]]></string>
    <string name="loading_remote_file_title">Laden der Datei</string>
    <string name="link_a_mobile">Zu einem Mobiltelefon verbinden</string>
    <string name="settings_section_title_use_from_desktop">Vom Desktop aus nutzen</string>
@@ -1486,7 +1486,7 @@
    <string name="desktop_device">Bureau</string>
    <string name="connected_to_desktop">Connecté au bureau</string>
    <string name="this_device_name">Ce nom d\'appareil</string>
-    <string name="waiting_for_mobile_to_connect">En attente d\'une connexion mobile:</string>
+    <string name="waiting_for_mobile_to_connect_on_port"><![CDATA[En attente d\'une connexion mobile sur le port <i>%s</i>]]></string>
    <string name="loading_remote_file_title">Chargement du fichier</string>
    <string name="connecting_to_desktop">Connexion au bureau</string>
    <string name="desktop_devices">Appareils de bureau</string>
@@ -1517,6 +1517,6 @@
    <string name="v5_4_more_things_descr">- avvisa facoltativamente i contatti eliminati.
 \n- nomi del profilo con spazi.
 \n- e molto altro!</string>
-    <string name="waiting_for_mobile_to_connect">In attesa che il cellulare si connette:</string>
+    <string name="waiting_for_mobile_to_connect_on_port"><![CDATA[In attesa che il cellulare si connetta alla porta <i>%s</i>]]></string>
    <string name="group_member_role_author">autore</string>
 </resources>
@@ -1516,7 +1516,7 @@
 \n- en meer!</string>
    <string name="remote_host_was_disconnected_toast"><![CDATA[Mobiele verbinding <b>%s</b> is verbroken]]></string>
    <string name="group_member_role_author">auteur</string>
-    <string name="waiting_for_mobile_to_connect">Wachten tot mobiel verbinding maakt:</string>
+    <string name="waiting_for_mobile_to_connect_on_port"><![CDATA[Wachten tot mobiel verbinding maakt op poort <i>%s</i>]]></string>
    <string name="multicast_connect_automatically">Automatisch verbinden</string>
    <string name="waiting_for_desktop">Wachten op desktop…</string>
    <string name="found_desktop">Desktop gevonden</string>
@@ -1496,7 +1496,7 @@
    <string name="v5_4_better_groups_descr">Szybsze dołączenie i bardziej niezawodne wiadomości.</string>
    <string name="linked_mobiles">Połączone telefony</string>
    <string name="this_device_name">Nazwa tego urządzenia</string>
-    <string name="waiting_for_mobile_to_connect">Oczekiwanie na połączenie telefonu:</string>
+    <string name="waiting_for_mobile_to_connect_on_port"><![CDATA[Oczekiwanie na połączenie telefonu na port <i>%s</i>]]></string>
    <string name="loading_remote_file_title">Ładowanie pliku</string>
    <string name="found_desktop">Znaleziono komputer</string>
    <string name="desktop_devices">Urządzenia komputerowe</string>
@@ -1601,7 +1601,7 @@
    <string name="verify_connection">Проверить соединение</string>
    <string name="multicast_connect_automatically">Соединяться автоматически</string>
    <string name="waiting_for_desktop">Ожидается подключение…</string>
-    <string name="waiting_for_mobile_to_connect">Ожидается подключение мобильного:</string>
+    <string name="waiting_for_mobile_to_connect_on_port"><![CDATA[Ожидается подключение мобильного через порт <i>%s</i>]]></string>
    <string name="found_desktop">Компьютер найден</string>
    <string name="not_compatible">Несовместимая версия!</string>
    <string name="group_member_role_author">автор</string>
@@ -1517,7 +1517,7 @@
    <string name="v5_4_more_things_descr">- 可选择通知已删除的联系人。
 \n- 带空格的个人资料名称。
 \n- 以及更多！</string>
-    <string name="waiting_for_mobile_to_connect">正等待移动设备 进行连接:</string>
+    <string name="waiting_for_mobile_to_connect_on_port"><![CDATA[正等待移动设备在端口 <i>%s</i> 进行连接]]></string>
    <string name="group_member_role_author">作者</string>
    <string name="multicast_connect_automatically">自动连接</string>
    <string name="waiting_for_desktop">等待桌面中…</string>
@@ -9,73 +9,30 @@ import androidx.compose.material.Text
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.awt.ComposeWindow
 import androidx.compose.ui.input.key.*
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.*
 import chat.simplex.common.model.ChatController
 import chat.simplex.common.model.ChatModel
-import chat.simplex.common.platform.*
 import chat.simplex.common.ui.theme.DEFAULT_START_MODAL_WIDTH
 import chat.simplex.common.ui.theme.SimpleXTheme
 import chat.simplex.common.views.TerminalView
-import chat.simplex.common.views.helpers.*
+import chat.simplex.common.views.helpers.FileDialogChooser
+import chat.simplex.common.views.helpers.escapedHtmlToAnnotatedString
 import chat.simplex.res.MR
 import dev.icerock.moko.resources.compose.stringResource
 import kotlinx.coroutines.*
 import java.awt.event.WindowEvent
 import java.awt.event.WindowFocusListener
 import java.io.File
-import kotlin.system.exitProcess

 val simplexWindowState = SimplexWindowState()

-fun showApp() {
-  val closedByError = mutableStateOf(true)
-  while (closedByError.value) {
-    application(exitProcessOnExit = false) {
-      CompositionLocalProvider(
-        LocalWindowExceptionHandlerFactory provides WindowExceptionHandlerFactory { window ->
-          WindowExceptionHandler { e ->
-            AlertManager.shared.showAlertMsg(
-              title = generalGetString(MR.strings.app_was_crashed),
-              text = e.stackTraceToString()
-            )
-            Log.e(TAG, "App crashed, thread name: " + Thread.currentThread().name + ", exception: " + e.stackTraceToString())
-            window.dispatchEvent(WindowEvent(window, WindowEvent.WINDOW_CLOSING))
-            closedByError.value = true
-            // If the left side of screen has open modal, it's probably caused the crash
-            if (ModalManager.start.hasModalsOpen()) {
-              ModalManager.start.closeModal()
-            } else if (ModalManager.center.hasModalsOpen() || ModalManager.end.hasModalsOpen()) {
-              ModalManager.center.closeModal()
-              ModalManager.end.closeModal()
-              // Better to not close fullscreen since it can contain passcode
-            } else {
-              // The last possible cause that can be closed
-              chatModel.chatId.value = null
-              chatModel.chatItems.clear()
-            }
-            chatModel.activeCall.value?.let {
-              withBGApi {
-                chatModel.callManager.endCall(it)
-              }
-            }
-          }
-        }
-      ) {
-        AppWindow(closedByError)
-      }
-    }
-  }
-  exitProcess(0)
-}
-
-@Composable
-private fun ApplicationScope.AppWindow(closedByError: MutableState<Boolean>) {
+fun showApp() = application {
  // Creates file if not exists; comes with proper defaults
  val state = getStoredWindowState()
+
  val windowState: WindowState = rememberWindowState(
    placement = WindowPlacement.Floating,
    width = state.width.dp,
@@ -89,62 +46,59 @@ private fun ApplicationScope.AppWindow(closedByError: MutableState<Boolean>) {
    windowState.size.width.value,
    windowState.size.height.value
  ) {
-    storeWindowState(
-      WindowPositionSize(
-        x = windowState.position.x.value.toInt(),
-        y = windowState.position.y.value.toInt(),
-        width = windowState.size.width.value.toInt(),
-        height = windowState.size.height.value.toInt()
-      )
-    )
+    storeWindowState(WindowPositionSize(
+      x = windowState.position.x.value.toInt(),
+      y = windowState.position.y.value.toInt(),
+      width = windowState.size.width.value.toInt(),
+      height = windowState.size.height.value.toInt()
+    ))
  }

  simplexWindowState.windowState = windowState
  // Reload all strings in all @Composable's after language change at runtime
  if (remember { ChatController.appPrefs.appLanguage.state }.value != "") {
-    Window(state = windowState, onCloseRequest = { closedByError.value = false; exitApplication() }, onKeyEvent = {
+    Window(state = windowState, onCloseRequest = ::exitApplication, onKeyEvent = {
      if (it.key == Key.Escape && it.type == KeyEventType.KeyUp) {
        simplexWindowState.backstack.lastOrNull()?.invoke() != null
      } else {
        false
      }
    }, title = "SimpleX") {
-      simplexWindowState.window = window
-      AppScreen()
-      if (simplexWindowState.openDialog.isAwaiting) {
-        FileDialogChooser(
-          title = "SimpleX",
-          isLoad = true,
-          params = simplexWindowState.openDialog.params,
-          onResult = {
-            simplexWindowState.openDialog.onResult(it.firstOrNull())
-          }
-        )
-      }
+      SimpleXTheme {
+        AppScreen()
+        if (simplexWindowState.openDialog.isAwaiting) {
+          FileDialogChooser(
+            title = "SimpleX",
+            isLoad = true,
+            params = simplexWindowState.openDialog.params,
+            onResult = {
+              simplexWindowState.openDialog.onResult(it.firstOrNull())
+            }
+          )
+        }

-      if (simplexWindowState.openMultipleDialog.isAwaiting) {
-        FileDialogChooser(
-          title = "SimpleX",
-          isLoad = true,
-          params = simplexWindowState.openMultipleDialog.params,
-          onResult = {
-            simplexWindowState.openMultipleDialog.onResult(it)
-          }
-        )
-      }
+        if (simplexWindowState.openMultipleDialog.isAwaiting) {
+          FileDialogChooser(
+            title = "SimpleX",
+            isLoad = true,
+            params = simplexWindowState.openMultipleDialog.params,
+            onResult = {
+              simplexWindowState.openMultipleDialog.onResult(it)
+            }
+          )
+        }

-      if (simplexWindowState.saveDialog.isAwaiting) {
-        FileDialogChooser(
-          title = "SimpleX",
-          isLoad = false,
-          params = simplexWindowState.saveDialog.params,
-          onResult = { simplexWindowState.saveDialog.onResult(it.firstOrNull()) }
-        )
-      }
-      val toasts = remember { simplexWindowState.toasts }
-      val toast = toasts.firstOrNull()
-      if (toast != null) {
-        SimpleXTheme {
+        if (simplexWindowState.saveDialog.isAwaiting) {
+          FileDialogChooser(
+            title = "SimpleX",
+            isLoad = false,
+            params = simplexWindowState.saveDialog.params,
+            onResult = { simplexWindowState.saveDialog.onResult(it.firstOrNull()) }
+          )
+        }
+        val toasts = remember { simplexWindowState.toasts }
+        val toast = toasts.firstOrNull()
+        if (toast != null) {
          Box(Modifier.fillMaxSize().padding(bottom = 20.dp), contentAlignment = Alignment.BottomCenter) {
            Text(
              escapedHtmlToAnnotatedString(toast.first, LocalDensity.current),
@@ -153,11 +107,11 @@ private fun ApplicationScope.AppWindow(closedByError: MutableState<Boolean>) {
              style = MaterialTheme.typography.body1
            )
          }
-        }
-        // Shows toast in insertion order with preferred delay per toast. New one will be shown once previous one expires
-        LaunchedEffect(toast, toasts.size) {
-          delay(toast.second)
-          simplexWindowState.toasts.removeFirst()
+          // Shows toast in insertion order with preferred delay per toast. New one will be shown once previous one expires
+          LaunchedEffect(toast, toasts.size) {
+            delay(toast.second)
+            simplexWindowState.toasts.removeFirst()
+          }
        }
      }
      var windowFocused by remember { simplexWindowState.windowFocused }
@@ -206,7 +160,6 @@ class SimplexWindowState {
  val saveDialog = DialogState<File?>()
  val toasts = mutableStateListOf<Pair<String, Long>>()
  var windowFocused = mutableStateOf(true)
-  var window: ComposeWindow? = null
 }

 data class DialogParams(
@@ -235,5 +188,7 @@ class DialogState<T> {
@Preview
@Composable
 fun AppPreview() {
-  AppScreen()
+  SimpleXTheme {
+    AppScreen()
+  }
 }
@@ -19,9 +19,3 @@ actual fun getKeyboardState(): State<KeyboardState> = remember { mutableStateOf(
 actual fun hideKeyboard(view: Any?) {}

 actual fun androidIsFinishingMainActivity(): Boolean = false
-
-actual class GlobalExceptionsHandler: Thread.UncaughtExceptionHandler {
-  actual override fun uncaughtException(thread: Thread, e: Throwable) {
-    Log.e(TAG, "App crashed, thread name: " + thread.name + ", exception: " + e.stackTraceToString())
-  }
-}
@@ -6,7 +6,6 @@ import androidx.compose.runtime.Composable
 import chat.simplex.common.model.ChatModel.controller
 import chat.simplex.common.model.SharedPreference
 import chat.simplex.common.model.User
-import chat.simplex.common.platform.chatModel
 import chat.simplex.common.ui.theme.DEFAULT_PADDING
 import chat.simplex.res.MR
 import dev.icerock.moko.resources.compose.painterResource
@@ -15,7 +14,7 @@ import dev.icerock.moko.resources.compose.painterResource
 actual fun OnboardingActionButton(user: User?, onboardingStage: SharedPreference<OnboardingStage>, onclick: (() -> Unit)?) {
  if (user == null) {
    Row(horizontalArrangement = Arrangement.spacedBy(DEFAULT_PADDING * 2.5f)) {
-      OnboardingActionButton(MR.strings.link_a_mobile, onboarding = if (controller.appPrefs.initialRandomDBPassphrase.get() && !chatModel.desktopOnboardingRandomPassword.value) OnboardingStage.Step2_5_SetupDatabasePassphrase else OnboardingStage.LinkAMobile, true, icon = painterResource(MR.images.ic_smartphone_300), onclick = onclick)
+      OnboardingActionButton(MR.strings.link_a_mobile, onboarding = if (controller.appPrefs.initialRandomDBPassphrase.get()) OnboardingStage.Step2_5_SetupDatabasePassphrase else OnboardingStage.LinkAMobile, true, icon = painterResource(MR.images.ic_smartphone_300), onclick = onclick)
      OnboardingActionButton(MR.strings.create_your_profile, onboarding = OnboardingStage.Step2_CreateProfile, true, icon = painterResource(MR.images.ic_desktop), onclick = onclick)
    }
  } else {
@@ -3,6 +3,10 @@ package chat.simplex.desktop
 import chat.simplex.common.platform.*
 import chat.simplex.common.showApp
 import java.io.File
+import java.nio.file.*
+import java.nio.file.attribute.BasicFileAttributes
+import java.nio.file.attribute.FileTime
+import kotlin.io.path.setLastModifiedTime

 fun main() {
  initHaskell()
@@ -25,11 +25,11 @@ android.nonTransitiveRClass=true
 android.enableJetifier=true
 kotlin.mpp.androidSourceSetLayoutVersion=2

-android.version_name=5.4.1
-android.version_code=164
+android.version_name=5.4
+android.version_code=162

-desktop.version_name=5.4.1
-desktop.version_code=19
+desktop.version_name=5.4
+desktop.version_code=18

 kotlin.version=1.8.20
 gradle.plugin.version=7.4.2
@@ -83,6 +83,5 @@ mkChatOpts BroadcastBotOpts {coreOptions} =
      allowInstantFiles = True,
      autoAcceptFileSize = 0,
      muteNotifications = True,
-      markRead = False,
      maintenance = False
    }
@@ -5,10 +5,10 @@
 {-# LANGUAGE ScopedTypeVariables #-}

 module Directory.Options
-  ( DirectoryOpts (..),
-    getDirectoryOpts,
-    mkChatOpts,
-  )
+ ( DirectoryOpts (..),
+   getDirectoryOpts,
+   mkChatOpts,
+ )
 where

 import Options.Applicative
@@ -35,8 +35,8 @@ directoryOpts appDir defaultDbFileName = do
          <> help "Comma-separated list of super-users in the format CONTACT_ID:DISPLAY_NAME who will be allowed to manage the directory"
      )
  directoryLog <-
-    Just
-      <$> strOption
+    Just <$>
+      strOption
        ( long "directory-file"
            <> metavar "DIRECTORY_FILE"
            <> help "Append only log for directory state"
@@ -81,6 +81,5 @@ mkChatOpts DirectoryOpts {coreOptions} =
      allowInstantFiles = True,
      autoAcceptFileSize = 0,
      muteNotifications = True,
-      markRead = False,
      maintenance = False
    }
@@ -2,16 +2,14 @@ packages: .
 -- packages: . ../simplexmq
 -- packages: . ../simplexmq ../direct-sqlcipher ../sqlcipher-simple

-with-compiler: ghc-8.10.7
-
-index-state: 2023-10-06T00:00:00Z
+with-compiler: ghc-9.6.3

 constraints: zip +disable-bzip2 +disable-zstd

 source-repository-package
    type: git
    location: https://github.com/simplex-chat/simplexmq.git
-    tag: a860936072172e261480fa6bdd95203976e366b2
+    tag: 90a8fc91d35c578c3b52ad296a6f1df715da2278

 source-repository-package
    type: git
@@ -47,9 +45,3 @@ source-repository-package
    type: git
    location: https://github.com/simplex-chat/android-support.git
    tag: 9aa09f148089d6752ce563b14c2df1895718d806
-
-- TODO this fork is only needed to compile with GHC 8.10.7 - it allows previous base version
-source-repository-package
-    type: git
-    location: https://github.com/simplex-chat/zip.git
-    tag: bd421c6b19cc4c465cd7af1f6f26169fb8ee1ebc
@@ -45,8 +45,6 @@ When people connect to you via this address, you will receive a connection reque

 If you start receiving too many requests via this address it is always safe to remove it – all the connections you created via this address will remain active, as this address is not used to deliver the messages.

-See the comparison with [1-time invitation links](./making-connections.md#comparison-of-1-time-invitation-links-and-simplex-contact-addresses).
-
 Read more in [this post](../../blog/20221108-simplex-chat-v4.2-security-audit-new-website.md#auto-accept-contact-requests).

 ### Chat preferences
@@ -13,71 +13,6 @@ Private Connection — connect using an invitation link or QR code via video or

 Group Chat — Users have the option to create a secret group, share their contact link [which can be deleted later on], or generate a one-time invitation link.

-## Your SimpleX contact address
-
-You can [create an optional long term address](./app-settings.md#your-simplex-contact-address) for other people to connect with you. Unlike 1-time invitation links, these addresses can be used many times, that makes them good to share online, e.g. on social media platforms, or in email signatures. That helps more people discover SimpleX Chat, so please do it!
-
-When people connect to you via this address, you will receive a connection request that you can accept or reject. You can configure an automatic acceptance of connection request and an automatic welcome message that will be sent to the new contacts. You can also share this address as part of your SimpleX profile, so group members can connect to you, and your contacts can share it with others - if this is something that you want.
-
-If you start receiving too many requests via this address it is always safe to remove it – all the connections you created via this address will remain active, as this address is not used to deliver the messages.
-
-### Comparison of 1-time invitation links and SimpleX Contact addresses
-
-<table>
-  <tr>
-    <th></th>
-    <th>1-time invitation link</th>
-    <th>SimpleX contact address</th>
-  </tr>
-  <tr>
-    <td>Can be used many times?</td>
-    <td>No</td>
-    <td>Yes</td>
-  </tr>
-  <tr>
-    <td>Can be included in user profile?</td>
-    <td>No, as it can only be used once.</td>
-    <td>Yes, to allow group members to connect directly, and your contacts to pass it on to their contacts.</td>
-  </tr>
-  <tr>
-    <td>When to use it?</td>
-    <td>With somebody you know, via another communication channel or QR code (in person or during a video call)</td>
-    <td>Where many people can see and connect via it, e.g. in email signature, website, social media or group chat.</td>
-  </tr>
-  <tr>
-    <td>Security</td>
-    <td>More secure, as can only be used once, and the initial connection request (including profile) is encrypted with double ratchet.</td>
-    <td>Initial connection request is also e2e encrypted, but without double ratchet (it is initialized when request is accepted).</td>
-  </tr>
-  <tr>
-    <td>Identification</td>
-    <td>Both sides know who they connect to, as they know with whom and by who the link was shared. You can attach alias to this invitation as soon as you share it or use it, to identify the other person when connection is established.</td>
-    <td>Only the person using the address knows who they connect to, via the channel where they found the address (email, social media, etc.). The address owner can only see the user profile of the request, and has no proof of identity from the person sending the request<sup>*</sup>.</td>
-  </tr>
-  <tr>
-    <td>Advantages over other platforms</td>
-    <td>There is no direct analogy, other platforms don’t offer one-time invitations without any fixed part identifying the user.</td>
-    <td>Unlike addresses in other platforms, SimpleX addresses are not used to deliver the messages &mdash; only the initial connection requests.<br>It means that removing this address will not break the contacts made via it (like changing an email address would), it would only prevent new connections, which makes it a good solution against spam and abuse.</td>
-  </tr>
-  <tr>
-    <td>Vulnerability to attacks</td>
-    <td>Until the connection is established, anybody who intercepts this link can connect to it, so it has to be verified with the original contact that the connection succeeded.</td>
-    <td>These addresses are vulnerable to connection request spam. Unlike other platforms, you can delete or change the address, without losing any contacts (see above).</td>
-  </tr>
-  <tr>
-    <td>Passive attacks on connection links</td>
-    <td colspan="2">Both types of links are not vulnerable if simply observed &mdash; they only contain public keys. So they can be safely shared via insecure or public channels, as long as you can confirm that you connected to the intended person.</td>
-  </tr>
-  <tr>
-    <td>Active attacks on connection links</td>
-    <td colspan="2">If the link is substituted via the attack on the channel used to share it, the connection security can be compromised, and the original messages monitored (man-in-the-middle attack). If it is a real risk then security code should be verified to mitigate it - doing so proves<sup>**</sup> that the link and keys were not substituted, and that the end-to-end encryption is secure.</td>
-  </tr>
-</table>
-
-<sup>*</sup> Adding optional verified identities that we plan in the future will change it &mdash; the address owner will have an option to request identity verification before accepting the connection.
-
-<sup>**</sup> Connection security code is the cryptographic hash (SHA256) of combined public keys of both sides &mdash; there are 2<sup>256</sup> possible security codes (1 with 77 zeros – about [1000 times smaller](https://www.wolframalpha.com/input?i=2%5E256) than the estimated number of atoms in the visible universe).
-
 ## Conversation preferences

 Tap on one of your conversations to open conversation preferences.
@@ -0,0 +1,35 @@
+# Paginated chat list
+
+## Problem
+
+The UI is requesting a fresh chat list when switching profiles.
+The `getChatPreviews` operation consists of a multiple DB queries fetching everything to show every item in the chat list.
+Together, they produce quite a bit of data for every contact the user ever had.
+This induces heavy load to bring up the data, marshall everything to UI and present it.
+The cost grows with time, starting from negligible, but becoming a massive drain and producing a noticable latency spike.
+Users who have many active profiles with constant traffic in all of them have their experience worsening despite having only a portion of contacts active in the momemnt.
+
+A simple "give next N after M" pagination is not enough here as chat list elements may break order by jumping to top when an `newChatItem` or alike message arrives.
+
+## Solution
+
+UI should turn to lazy list containers and pagination to delay loading yet invisible elements.
+To operate in this mode it needs to know a total amount of elements and the elements should have persistent IDs, unified across all chat types.
+
+A proposed API prepares a "spine" of such a list, to be paginated and loaded lazilly.
+Then, an item loader can request individual list elements that happen to enter the view.
+
+The current API element (of type `Chat`) contains a triple of `ChatInfo c`/`[CChatItem c]`/`ChatStats`.
+For lazy loading only a chat reference (composed from the `chatInfo.type` and an appropriate numeric ID) is needed.
+This is enough to populate list element with item proxies and inflate visible elements to a full `Chat` object.
+Incoming update events then can trigger their usual re-ordering, which may in turn trigger element update, if it comes into view.
+
+> `CRNewChatItem` only has `AChatItem` data, so it can resolve a proxy partially.
+> A call for item details may bring in missing data like `ChatInfo` and `ChatStats` later or immediately.
+
+So, the new API is two commands and no new types.
+
+- `APIGetChatList -> CRChatList [ChatRef]`
+- `APIGetChatDetails ChatRef -> CRChatDetails Chat`
+
+The UI should distinguish proxy elements containing only references from full elements and use platform APIs to request details when a proxy comes into view.
@@ -16,21 +16,6 @@
        "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": {
@@ -98,64 +83,6 @@
        "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": {
@@ -173,19 +100,21 @@
        "type": "github"
      }
    },
-    "flake-compat_2": {
-      "flake": false,
+    "flake-parts": {
+      "inputs": {
+        "nixpkgs-lib": "nixpkgs-lib"
+      },
      "locked": {
-        "lastModified": 1650374568,
-        "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "b4a34015c698c7793d592d66adbab377907a2be8",
+        "lastModified": 1698579227,
+        "narHash": "sha256-KVWjFZky+gRuWennKsbo6cWyo7c/z/VgCte5pR9pEKg=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "f76e870d64779109e41370848074ac4eaa1606ec",
        "type": "github"
      },
      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
        "type": "github"
      }
    },
@@ -204,51 +133,6 @@
        "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": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
    "ghc-8.6.5-iohk": {
      "flake": false,
      "locked": {
@@ -266,33 +150,51 @@
        "type": "github"
      }
    },
-    "gomod2nix": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_2",
-        "utils": "utils"
-      },
+    "ghc98X": {
+      "flake": false,
      "locked": {
-        "lastModified": 1655245309,
-        "narHash": "sha256-d/YPoQ/vFn1+GTmSdvbSBSTOai61FONxB4+Lt6w/IVI=",
-        "owner": "tweag",
-        "repo": "gomod2nix",
-        "rev": "40d32f82fc60d66402eb0972e6e368aeab3faf58",
-        "type": "github"
+        "lastModified": 1696643148,
+        "narHash": "sha256-E02DfgISH7EvvNAu0BHiPvl1E5FGMDi0pWdNZtIBC9I=",
+        "ref": "ghc-9.8",
+        "rev": "443e870d977b1ab6fc05f47a9a17bc49296adbd6",
+        "revCount": 61642,
+        "submodules": true,
+        "type": "git",
+        "url": "https://gitlab.haskell.org/ghc/ghc"
      },
      "original": {
-        "owner": "tweag",
-        "repo": "gomod2nix",
-        "type": "github"
+        "ref": "ghc-9.8",
+        "submodules": true,
+        "type": "git",
+        "url": "https://gitlab.haskell.org/ghc/ghc"
+      }
+    },
+    "ghc99": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1697054644,
+        "narHash": "sha256-kKarOuXUaAH3QWv7ASx+gGFMHaHKe0pK5Zu37ky2AL4=",
+        "ref": "refs/heads/master",
+        "rev": "f383a242c76f90bcca8a4d7ee001dcb49c172a9a",
+        "revCount": 62040,
+        "submodules": true,
+        "type": "git",
+        "url": "https://gitlab.haskell.org/ghc/ghc"
+      },
+      "original": {
+        "submodules": true,
+        "type": "git",
+        "url": "https://gitlab.haskell.org/ghc/ghc"
      }
    },
    "hackage": {
      "flake": false,
      "locked": {
-        "lastModified": 1696724662,
-        "narHash": "sha256-jV2ugSjZE0FjMYR2YIx0p2cDBqd+xxhZrRxp5BmieYk=",
+        "lastModified": 1699834964,
+        "narHash": "sha256-733KT+G0c1euCeb60/u1qbX22Kvu9lNnIDfAmk6Jxq0=",
        "owner": "input-output-hk",
        "repo": "hackage.nix",
-        "rev": "df603bff8606d8653a0876ae0c3fd1f9014882f2",
+        "rev": "2e891e530400187ea1083ffef15adf259061be41",
        "type": "github"
      },
      "original": {
@@ -309,33 +211,40 @@
        "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",
        "hpc-coveralls": "hpc-coveralls",
        "hydra": "hydra",
        "iserv-proxy": "iserv-proxy",
        "nixpkgs": [
-          "nixpkgs"
+          "haskellNix",
+          "nixpkgs-unstable"
        ],
        "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-unstable": "nixpkgs-unstable",
        "old-ghc-nix": "old-ghc-nix",
-        "stackage": "stackage",
-        "tullia": "tullia"
+        "stackage": "stackage"
      },
      "locked": {
-        "lastModified": 1677975916,
-        "narHash": "sha256-dbe8lEEPyfzjdRwpePClv7J9p9lQg7BwbBqAMCw4RLw=",
+        "lastModified": 1700119633,
+        "narHash": "sha256-nZY2eIo8TkRbXgJXEWMm9zor330GuUtcNzvUN9tN64U=",
        "owner": "input-output-hk",
        "repo": "haskell.nix",
-        "rev": "ab5efd87ce3fd8ade38a01d97693d29a4f1ae7e4",
+        "rev": "1fe47a3d52e1ecd6247c8ab83811a21de2e2f074",
        "type": "github"
      },
      "original": {
@@ -345,6 +254,91 @@
        "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": 1696939266,
+        "narHash": "sha256-VOMf5+kyOeOmfXTHlv4LNFJuDGa7G3pDnOxtzYR40IU=",
+        "owner": "haskell",
+        "repo": "haskell-language-server",
+        "rev": "362fdd1293efb4b82410b676ab1273479f6d17ee",
+        "type": "github"
+      },
+      "original": {
+        "owner": "haskell",
+        "ref": "2.4.0.0",
+        "repo": "haskell-language-server",
+        "type": "github"
+      }
+    },
    "hpc-coveralls": {
      "flake": false,
      "locked": {
@@ -384,37 +378,14 @@
        "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": 1670983692,
-        "narHash": "sha256-avLo34JnI9HNyOuauK5R69usJm+GfW3MlyGlYxZhTgY=",
+        "lastModified": 1691634696,
+        "narHash": "sha256-MZH2NznKC/gbgBu8NgIibtSUZeJ00HTLJ0PlWKCBHb0=",
        "ref": "hkm/remote-iserv",
-        "rev": "50d0abb3317ac439a4e7495b185a64af9b7b9300",
-        "revCount": 10,
+        "rev": "43a979272d9addc29fbffc2e8542c5d96e993d73",
+        "revCount": 14,
        "type": "git",
        "url": "https://gitlab.haskell.org/hamishmack/iserv-proxy.git"
      },
@@ -440,32 +411,22 @@
        "type": "github"
      }
    },
-    "n2c": {
+    "mac2ios": {
      "inputs": {
-        "flake-utils": [
-          "haskellNix",
-          "tullia",
-          "std",
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "haskellNix",
-          "tullia",
-          "std",
-          "nixpkgs"
-        ]
+        "flake-parts": "flake-parts",
+        "nixpkgs": "nixpkgs_2"
      },
      "locked": {
-        "lastModified": 1665039323,
-        "narHash": "sha256-SAh3ZjFGsaCI8FRzXQyp56qcGdAqgKEfJWPCQ0Sr7tQ=",
-        "owner": "nlewo",
-        "repo": "nix2container",
-        "rev": "b008fe329ffb59b67bf9e7b08ede6ee792f2741a",
+        "lastModified": 1699767871,
+        "narHash": "sha256-kxeCUfwC/Vgh2FvVMlBUq0eVx1JvfHyN+5MPKUik9mE=",
+        "owner": "zw3rk",
+        "repo": "mobile-core-tools",
+        "rev": "4dcb77d5ea896d749381806dfab5358851b08951",
        "type": "github"
      },
      "original": {
-        "owner": "nlewo",
-        "repo": "nix2container",
+        "owner": "zw3rk",
+        "repo": "mobile-core-tools",
        "type": "github"
      }
    },
@@ -490,95 +451,6 @@
        "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,
@@ -645,11 +517,11 @@
    },
    "nixpkgs-2205": {
      "locked": {
-        "lastModified": 1672580127,
-        "narHash": "sha256-3lW3xZslREhJogoOkjeZtlBtvFMyxHku7I/9IVehhT8=",
+        "lastModified": 1685573264,
+        "narHash": "sha256-Zffu01pONhs/pqH07cjlF10NnMDLok8ix5Uk4rhOnZQ=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "0874168639713f547c05947c76124f78441ea46c",
+        "rev": "380be19fbd2d9079f677978361792cb25e8a3635",
        "type": "github"
      },
      "original": {
@@ -661,11 +533,11 @@
    },
    "nixpkgs-2211": {
      "locked": {
-        "lastModified": 1675730325,
-        "narHash": "sha256-uNvD7fzO5hNlltNQUAFBPlcEjNG5Gkbhl/ROiX+GZU4=",
+        "lastModified": 1688392541,
+        "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "b7ce17b1ebf600a72178f6302c77b6382d09323f",
+        "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b",
        "type": "github"
      },
      "original": {
@@ -675,6 +547,40 @@
        "type": "github"
      }
    },
+    "nixpkgs-2305": {
+      "locked": {
+        "lastModified": 1695416179,
+        "narHash": "sha256-610o1+pwbSu+QuF3GE0NU5xQdTHM3t9wyYhB9l94Cd8=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "715d72e967ec1dd5ecc71290ee072bcaf5181ed6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-23.05-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,
@@ -693,11 +599,11 @@
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1675758091,
-        "narHash": "sha256-7gFSQbSVAFUHtGCNHPF7mPc5CcqDk9M2+inlVPZSneg=",
+        "lastModified": 1695318763,
+        "narHash": "sha256-FHVPDRP2AfvsxAdc+AsgFJevMz5VBmnZglFUMlxBkcY=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "747927516efcb5e31ba03b7ff32f61f6d47e7d87",
+        "rev": "e12483116b3b51a185a33a272bf351e357ba9a99",
        "type": "github"
      },
      "original": {
@@ -709,82 +615,20 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1653581809,
-        "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=",
+        "lastModified": 1698434055,
+        "narHash": "sha256-Phxi5mUKSoL7A0IYUiYtkI9e8NcGaaV5PJEaJApU1Ko=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "83658b28fe638a170a19b8933aa008b30640fbd1",
+        "rev": "1a3c95e3b23b3cdb26750621c08cc2f1560cb883",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
-        "ref": "nixos-unstable",
+        "ref": "nixos-23.05",
        "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": {
@@ -807,17 +651,21 @@
        "flake-utils": "flake-utils",
        "hackage": "hackage",
        "haskellNix": "haskellNix",
-        "nixpkgs": "nixpkgs_5"
+        "mac2ios": "mac2ios",
+        "nixpkgs": [
+          "haskellNix",
+          "nixpkgs-2305"
+        ]
      }
    },
    "stackage": {
      "flake": false,
      "locked": {
-        "lastModified": 1677888571,
-        "narHash": "sha256-YkhRNOaN6QVagZo1cfykYV8KqkI8/q6r2F5+jypOma4=",
+        "lastModified": 1699834215,
+        "narHash": "sha256-g/JKy0BCvJaxPuYDl3QVc4OY8cFEomgG+hW/eEV470M=",
        "owner": "input-output-hk",
        "repo": "stackage.nix",
-        "rev": "cb50e6fabdfb2d7e655059039012ad0623f06a27",
+        "rev": "47aacd04abcce6bad57f43cbbbd133538380248e",
        "type": "github"
      },
      "original": {
@@ -825,113 +673,6 @@
        "repo": "stackage.nix",
        "type": "github"
      }
-    },
-    "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": 1674526466,
-        "narHash": "sha256-tMTaS0bqLx6VJ+K+ZT6xqsXNpzvSXJTmogkraBGzymg=",
-        "owner": "divnix",
-        "repo": "std",
-        "rev": "516387e3d8d059b50e742a2ff1909ed3c8f82826",
-        "type": "github"
-      },
-      "original": {
-        "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"
-      }
    }
  },
  "root": "root",
@@ -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.haskellNix.inputs.nixpkgs.follows = "nixpkgs";
+  inputs.nixpkgs.follows = "haskellNix/nixpkgs-2305";
+  inputs.mac2ios.url = "github:zw3rk/mobile-core-tools";
  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, ... }:
+  outputs = { self, haskellNix, nixpkgs, flake-utils, mac2ios, ... }:
    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,8 +30,8 @@
      # `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 = "ghc8107";
-        index-state = "2023-10-06T00:00:00Z";
+        compiler-nix-name = "ghc963";
+        index-state = "2023-10-20T00:00:00Z";
        # We need this, to specify we want the cabal project.
        # If the stack.yaml was dropped, this would not be necessary.
        projectFileName = "cabal.project";
@@ -40,9 +40,12 @@
          src = ./.;
        };
        sha256map = import ./scripts/nix/sha256map.nix;
-        modules = [{
+        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(
          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;
@@ -74,6 +77,11 @@
        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
        (cd $out/_pkg; ${pkgs.zip}/bin/zip -r -9 $out/${bundleName}.zip *)
        rm -fR $out/_pkg
        mkdir -p $out/nix-support
@@ -119,13 +127,149 @@
                      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;
-              "${pkgs.pkgsCross.musl32.hostPlatform.system}-static:exe:simplex-chat" = (drv pkgs.pkgsCross.musl32).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.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.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 {
-                smallAddressSpace = true; enableShared = false;
-                setupBuildFlags = map (x: "--ghc-option=${x}") [ "-shared" "-o" "libsupport.so" ];
+              "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
+                '';
+
                postInstall = ''

                  mkdir -p $out/_pkg
@@ -138,14 +282,29 @@
                  echo "file binary-dist \"$(echo $out/*.zip)\"" \
                        > $out/nix-support/hydra-build-products
                '';
-              };
-              "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" ];
+              });
+              # 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
+                '';
+
                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
@@ -154,10 +313,11 @@
                  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; })
@@ -168,13 +328,55 @@
                  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 {
-                smallAddressSpace = true; enableShared = false;
+              }).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;
                # 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 = map (x: "--ghc-option=${x}") [ "-shared" "-o" "libsimplex.so" "-optl-lHSrts_thr" "-optl-lffi"];
+                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_write_file"
+                ];
                postInstall = ''
                  set -x
                  ${pkgs.tree}/bin/tree $out
@@ -218,10 +420,11 @@
                  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; })
@@ -233,12 +436,49 @@
                    (androidPkgs.openssl.override { static = true; })
                  ];
                }];
-              }).simplex-chat.components.library.override {
-                smallAddressSpace = true; enableShared = false;
+              }).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;
                # 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 = map (x: "--ghc-option=${x}") [ "-shared" "-o" "libsimplex.so" "-optl-lHSrts_thr" "-optl-lffi"];
+                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_write_file"
+                ];
                postInstall = ''
                  set -x
                  ${pkgs.tree}/bin/tree $out
@@ -282,7 +522,7 @@
                  echo "file binary-dist \"$(echo $out/*.zip)\"" \
                      > $out/nix-support/hydra-build-products
                '';
-              };
+              });
            };

            # builds for iOS and iOS simulator
@@ -1,5 +1,5 @@
 name: simplex-chat
-version: 5.4.0.7
+version: 5.4.0.6
 #synopsis:
 #description:
 homepage: https://github.com/simplex-chat/simplex-chat#readme
@@ -19,6 +19,7 @@ dependencies:
  - attoparsec == 0.14.*
  - base >= 4.7 && < 5
  - base64-bytestring >= 1.0 && < 1.3
+  - bytestring == 0.11.*
  - composition == 1.0.*
  - constraints >= 0.12 && < 0.14
  - containers == 0.6.*
@@ -31,10 +32,10 @@ dependencies:
  - filepath == 1.4.*
  - http-types == 0.12.*
  - http2 >= 4.2.2 && < 4.3
-  - memory == 0.18.*
-  - mtl >= 2.3.1 && < 3.0
+  - memory >= 0.15 && < 0.19
+  - mtl >= 2.2 && < 3
  - network >= 3.1.2.7 && < 3.2
-  - network-transport == 0.5.6
+  - network-transport >= 0.5.6 && < 0.6
  - optparse-applicative >= 0.15 && < 0.17
  - process == 1.6.*
  - random >= 1.1 && < 1.3
@@ -44,12 +45,14 @@ dependencies:
  - socks == 0.6.*
  - sqlcipher-simple == 0.4.*
  - stm == 2.5.*
+  - template-haskell >= 2.16 && < 2.21
  - terminal == 0.2.*
+  - text >= 2.0 && < 3
  - time == 1.9.*
  - tls >= 1.6.0 && < 1.7
  - unliftio == 0.2.*
  - unliftio-core == 0.2.*
-  - zip == 2.0.*
+  - zip >= 1.7 && < 2.1

 flags:
  swift:
@@ -61,16 +64,6 @@ when:
  - condition: flag(swift)
    cpp-options:
      - -DswiftJSON
-  - condition: impl(ghc >= 9.6.2)
-    dependencies:
-      - bytestring == 0.11.*
-      - template-haskell == 2.20.*
-      - text >= 2.0.1 && < 2.2
-  - condition: impl(ghc < 9.6.2)
-    dependencies:
-      - bytestring == 0.10.*
-      - template-haskell == 2.16.*
-      - text >= 1.2.3.0 && < 1.3

 library:
  source-dirs: src
@@ -131,7 +124,7 @@ tests:
      - async == 2.2.*
      - deepseq == 1.4.*
      - generic-random == 1.5.*
-      - hspec == 2.7.*
+      - hspec == 2.11.*
      - network == 3.1.*
      - silently == 1.2.*
      - stm == 2.5.*
@@ -2,7 +2,7 @@

 set -e

-trap "rm apps/multiplatform/local.properties || true; rm local.properties || true; rm /tmp/simplex.keychain || true" EXIT
+trap "rm apps/multiplatform/local.properties 2> /dev/null || true; rm local.properties 2> /dev/null || true; rm /tmp/simplex.keychain" 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,6 +10,10 @@ 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 - > /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
@@ -0,0 +1,10 @@
+#!/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
@@ -8,7 +8,7 @@ function readlink() {

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

 if [ "$ARCH" == "aarch64" ]; then
    COMPOSE_ARCH=arm64
@@ -21,7 +21,7 @@ cd $root_dir
 BUILD_DIR=dist-newstyle/build/$ARCH-$OS/ghc-${GHC_VERSION}/simplex-chat-*

 rm -rf $BUILD_DIR
-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"
+cabal build lib:simplex-chat --ghc-options='-optl-Wl,-rpath,$ORIGIN -flink-rts -threaded'
 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,13 +5,14 @@ set -e
 OS=mac
 ARCH="${1:-`uname -a | rev | cut -d' ' -f1 | rev`}"
 COMPOSE_ARCH=$ARCH
-GHC_VERSION=8.10.7
+GHC_VERSION=9.6.3

 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)
@@ -19,13 +20,26 @@ GHC_LIBS_DIR=$(ghc --print-libdir)
 BUILD_DIR=dist-newstyle/build/$ARCH-*/ghc-*/simplex-chat-*

 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/rts -optl-lHSrts_thr-ghc8.10.7 -optl-lffi"
+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"

 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/rts/libffi.dylib ./deps
+#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 "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 \
+    )
+)

 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`
@@ -66,6 +80,8 @@ 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 -
@@ -0,0 +1,242 @@
+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)))
@@ -0,0 +1,12 @@
+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
@@ -0,0 +1,36 @@
+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 =
@@ -1,5 +1,5 @@
 {
-  "https://github.com/simplex-chat/simplexmq.git"."a860936072172e261480fa6bdd95203976e366b2" = "16rwnh5zzphmw8d8ypvps6xjvzbmf5ljr6zzy15gz2g0jyh7hd91";
+  "https://github.com/simplex-chat/simplexmq.git"."90a8fc91d35c578c3b52ad296a6f1df715da2278" = "1yjixh6b2s1law3kh885fsbr1inv1r7iy4g9g2bn6j4ygdn8vlzy";
  "https://github.com/simplex-chat/hs-socks.git"."a30cc7a79a08d8108316094f8f2f82a0c5e1ac51" = "0yasvnr7g91k76mjkamvzab2kvlb1g5pspjyjn2fr6v83swjhj38";
  "https://github.com/kazu-yamamoto/http2.git"."f5525b755ff2418e6e6ecc69e877363b0d0bcaeb" = "0fyx0047gvhm99ilp212mmz37j84cwrfnpmssib5dw363fyb88b6";
  "https://github.com/simplex-chat/direct-sqlcipher.git"."f814ee68b16a9447fbb467ccc8f29bdd3546bfd9" = "1ql13f4kfwkbaq7nygkxgw84213i0zm7c1a8hwvramayxl38dq5d";
@@ -7,5 +7,4 @@
  "https://github.com/simplex-chat/aeson.git"."aab7b5a14d6c5ea64c64dcaee418de1bb00dcc2b" = "0jz7kda8gai893vyvj96fy962ncv8dcsx71fbddyy8zrvc88jfrr";
  "https://github.com/simplex-chat/haskell-terminal.git"."f708b00009b54890172068f168bf98508ffcd495" = "0zmq7lmfsk8m340g47g5963yba7i88n4afa6z93sg9px5jv1mijj";
  "https://github.com/simplex-chat/android-support.git"."9aa09f148089d6752ce563b14c2df1895718d806" = "0pbf2pf13v2kjzi397nr13f1h3jv0imvsq8rpiyy2qyx5vd50pqn";
-  "https://github.com/simplex-chat/zip.git"."bd421c6b19cc4c465cd7af1f6f26169fb8ee1ebc" = "1csqfjhvc8wb5h4kxxndmb6iw7b4ib9ff2n81hrizsmnf45a6gg0";
 }
@@ -1,11 +1,11 @@
 cabal-version: 1.12

-- This file has been generated from package.yaml by hpack version 0.35.0.
+-- This file has been generated from package.yaml by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack

 name:           simplex-chat
-version:        5.4.0.7
+version:        5.4.0.6
 category:       Web, System, Services, Cryptography
 homepage:       https://github.com/simplex-chat/simplex-chat#readme
 author:         simplex.chat
@@ -171,6 +171,7 @@ library
    , attoparsec ==0.14.*
    , base >=4.7 && <5
    , base64-bytestring >=1.0 && <1.3
+    , bytestring ==0.11.*
    , composition ==1.0.*
    , constraints >=0.12 && <0.14
    , containers ==0.6.*
@@ -183,10 +184,10 @@ library
    , filepath ==1.4.*
    , http-types ==0.12.*
    , http2 >=4.2.2 && <4.3
-    , memory ==0.18.*
-    , mtl >=2.3.1 && <3.0
+    , memory >=0.15 && <0.19
+    , mtl >=2.2 && <3
    , network >=3.1.2.7 && <3.2
-    , network-transport ==0.5.6
+    , network-transport >=0.5.6 && <0.6
    , optparse-applicative >=0.15 && <0.17
    , process ==1.6.*
    , random >=1.1 && <1.3
@@ -196,25 +197,17 @@ library
    , socks ==0.6.*
    , sqlcipher-simple ==0.4.*
    , stm ==2.5.*
+    , template-haskell >=2.16 && <2.21
    , terminal ==0.2.*
+    , text >=2.0 && <3
    , time ==1.9.*
    , tls >=1.6.0 && <1.7
    , unliftio ==0.2.*
    , unliftio-core ==0.2.*
-    , zip ==2.0.*
+    , zip >=1.7 && <2.1
  default-language: Haskell2010
  if flag(swift)
    cpp-options: -DswiftJSON
-  if impl(ghc >= 9.6.2)
-    build-depends:
-        bytestring ==0.11.*
-      , template-haskell ==2.20.*
-      , text >=2.0.1 && <2.2
-  if impl(ghc < 9.6.2)
-    build-depends:
-        bytestring ==0.10.*
-      , template-haskell ==2.16.*
-      , text >=1.2.3.0 && <1.3

 executable simplex-bot
  main-is: Main.hs
@@ -230,6 +223,7 @@ executable simplex-bot
    , attoparsec ==0.14.*
    , base >=4.7 && <5
    , base64-bytestring >=1.0 && <1.3
+    , bytestring ==0.11.*
    , composition ==1.0.*
    , constraints >=0.12 && <0.14
    , containers ==0.6.*
@@ -242,10 +236,10 @@ executable simplex-bot
    , filepath ==1.4.*
    , http-types ==0.12.*
    , http2 >=4.2.2 && <4.3
-    , memory ==0.18.*
-    , mtl >=2.3.1 && <3.0
+    , memory >=0.15 && <0.19
+    , mtl >=2.2 && <3
    , network >=3.1.2.7 && <3.2
-    , network-transport ==0.5.6
+    , network-transport >=0.5.6 && <0.6
    , optparse-applicative >=0.15 && <0.17
    , process ==1.6.*
    , random >=1.1 && <1.3
@@ -256,25 +250,17 @@ executable simplex-bot
    , socks ==0.6.*
    , sqlcipher-simple ==0.4.*
    , stm ==2.5.*
+    , template-haskell >=2.16 && <2.21
    , terminal ==0.2.*
+    , text >=2.0 && <3
    , time ==1.9.*
    , tls >=1.6.0 && <1.7
    , unliftio ==0.2.*
    , unliftio-core ==0.2.*
-    , zip ==2.0.*
+    , zip >=1.7 && <2.1
  default-language: Haskell2010
  if flag(swift)
    cpp-options: -DswiftJSON
-  if impl(ghc >= 9.6.2)
-    build-depends:
-        bytestring ==0.11.*
-      , template-haskell ==2.20.*
-      , text >=2.0.1 && <2.2
-  if impl(ghc < 9.6.2)
-    build-depends:
-        bytestring ==0.10.*
-      , template-haskell ==2.16.*
-      , text >=1.2.3.0 && <1.3

 executable simplex-bot-advanced
  main-is: Main.hs
@@ -290,6 +276,7 @@ executable simplex-bot-advanced
    , attoparsec ==0.14.*
    , base >=4.7 && <5
    , base64-bytestring >=1.0 && <1.3
+    , bytestring ==0.11.*
    , composition ==1.0.*
    , constraints >=0.12 && <0.14
    , containers ==0.6.*
@@ -302,10 +289,10 @@ executable simplex-bot-advanced
    , filepath ==1.4.*
    , http-types ==0.12.*
    , http2 >=4.2.2 && <4.3
-    , memory ==0.18.*
-    , mtl >=2.3.1 && <3.0
+    , memory >=0.15 && <0.19
+    , mtl >=2.2 && <3
    , network >=3.1.2.7 && <3.2
-    , network-transport ==0.5.6
+    , network-transport >=0.5.6 && <0.6
    , optparse-applicative >=0.15 && <0.17
    , process ==1.6.*
    , random >=1.1 && <1.3
@@ -316,25 +303,17 @@ executable simplex-bot-advanced
    , socks ==0.6.*
    , sqlcipher-simple ==0.4.*
    , stm ==2.5.*
+    , template-haskell >=2.16 && <2.21
    , terminal ==0.2.*
+    , text >=2.0 && <3
    , time ==1.9.*
    , tls >=1.6.0 && <1.7
    , unliftio ==0.2.*
    , unliftio-core ==0.2.*
-    , zip ==2.0.*
+    , zip >=1.7 && <2.1
  default-language: Haskell2010
  if flag(swift)
    cpp-options: -DswiftJSON
-  if impl(ghc >= 9.6.2)
-    build-depends:
-        bytestring ==0.11.*
-      , template-haskell ==2.20.*
-      , text >=2.0.1 && <2.2
-  if impl(ghc < 9.6.2)
-    build-depends:
-        bytestring ==0.10.*
-      , template-haskell ==2.16.*
-      , text >=1.2.3.0 && <1.3

 executable simplex-broadcast-bot
  main-is: ../Main.hs
@@ -352,6 +331,7 @@ executable simplex-broadcast-bot
    , attoparsec ==0.14.*
    , base >=4.7 && <5
    , base64-bytestring >=1.0 && <1.3
+    , bytestring ==0.11.*
    , composition ==1.0.*
    , constraints >=0.12 && <0.14
    , containers ==0.6.*
@@ -364,10 +344,10 @@ executable simplex-broadcast-bot
    , filepath ==1.4.*
    , http-types ==0.12.*
    , http2 >=4.2.2 && <4.3
-    , memory ==0.18.*
-    , mtl >=2.3.1 && <3.0
+    , memory >=0.15 && <0.19
+    , mtl >=2.2 && <3
    , network >=3.1.2.7 && <3.2
-    , network-transport ==0.5.6
+    , network-transport >=0.5.6 && <0.6
    , optparse-applicative >=0.15 && <0.17
    , process ==1.6.*
    , random >=1.1 && <1.3
@@ -378,25 +358,17 @@ executable simplex-broadcast-bot
    , socks ==0.6.*
    , sqlcipher-simple ==0.4.*
    , stm ==2.5.*
+    , template-haskell >=2.16 && <2.21
    , terminal ==0.2.*
+    , text >=2.0 && <3
    , time ==1.9.*
    , tls >=1.6.0 && <1.7
    , unliftio ==0.2.*
    , unliftio-core ==0.2.*
-    , zip ==2.0.*
+    , zip >=1.7 && <2.1
  default-language: Haskell2010
  if flag(swift)
    cpp-options: -DswiftJSON
-  if impl(ghc >= 9.6.2)
-    build-depends:
-        bytestring ==0.11.*
-      , template-haskell ==2.20.*
-      , text >=2.0.1 && <2.2
-  if impl(ghc < 9.6.2)
-    build-depends:
-        bytestring ==0.10.*
-      , template-haskell ==2.16.*
-      , text >=1.2.3.0 && <1.3

 executable simplex-chat
  main-is: Main.hs
@@ -413,6 +385,7 @@ executable simplex-chat
    , attoparsec ==0.14.*
    , base >=4.7 && <5
    , base64-bytestring >=1.0 && <1.3
+    , bytestring ==0.11.*
    , composition ==1.0.*
    , constraints >=0.12 && <0.14
    , containers ==0.6.*
@@ -425,10 +398,10 @@ executable simplex-chat
    , filepath ==1.4.*
    , http-types ==0.12.*
    , http2 >=4.2.2 && <4.3
-    , memory ==0.18.*
-    , mtl >=2.3.1 && <3.0
+    , memory >=0.15 && <0.19
+    , mtl >=2.2 && <3
    , network ==3.1.*
-    , network-transport ==0.5.6
+    , network-transport >=0.5.6 && <0.6
    , optparse-applicative >=0.15 && <0.17
    , process ==1.6.*
    , random >=1.1 && <1.3
@@ -439,26 +412,18 @@ executable simplex-chat
    , socks ==0.6.*
    , sqlcipher-simple ==0.4.*
    , stm ==2.5.*
+    , template-haskell >=2.16 && <2.21
    , terminal ==0.2.*
+    , text >=2.0 && <3
    , time ==1.9.*
    , tls >=1.6.0 && <1.7
    , unliftio ==0.2.*
    , unliftio-core ==0.2.*
    , websockets ==0.12.*
-    , zip ==2.0.*
+    , zip >=1.7 && <2.1
  default-language: Haskell2010
  if flag(swift)
    cpp-options: -DswiftJSON
-  if impl(ghc >= 9.6.2)
-    build-depends:
-        bytestring ==0.11.*
-      , template-haskell ==2.20.*
-      , text >=2.0.1 && <2.2
-  if impl(ghc < 9.6.2)
-    build-depends:
-        bytestring ==0.10.*
-      , template-haskell ==2.16.*
-      , text >=1.2.3.0 && <1.3

 executable simplex-directory-service
  main-is: ../Main.hs
@@ -478,6 +443,7 @@ executable simplex-directory-service
    , attoparsec ==0.14.*
    , base >=4.7 && <5
    , base64-bytestring >=1.0 && <1.3
+    , bytestring ==0.11.*
    , composition ==1.0.*
    , constraints >=0.12 && <0.14
    , containers ==0.6.*
@@ -490,10 +456,10 @@ executable simplex-directory-service
    , filepath ==1.4.*
    , http-types ==0.12.*
    , http2 >=4.2.2 && <4.3
-    , memory ==0.18.*
-    , mtl >=2.3.1 && <3.0
+    , memory >=0.15 && <0.19
+    , mtl >=2.2 && <3
    , network >=3.1.2.7 && <3.2
-    , network-transport ==0.5.6
+    , network-transport >=0.5.6 && <0.6
    , optparse-applicative >=0.15 && <0.17
    , process ==1.6.*
    , random >=1.1 && <1.3
@@ -504,25 +470,17 @@ executable simplex-directory-service
    , socks ==0.6.*
    , sqlcipher-simple ==0.4.*
    , stm ==2.5.*
+    , template-haskell >=2.16 && <2.21
    , terminal ==0.2.*
+    , text >=2.0 && <3
    , time ==1.9.*
    , tls >=1.6.0 && <1.7
    , unliftio ==0.2.*
    , unliftio-core ==0.2.*
-    , zip ==2.0.*
+    , zip >=1.7 && <2.1
  default-language: Haskell2010
  if flag(swift)
    cpp-options: -DswiftJSON
-  if impl(ghc >= 9.6.2)
-    build-depends:
-        bytestring ==0.11.*
-      , template-haskell ==2.20.*
-      , text >=2.0.1 && <2.2
-  if impl(ghc < 9.6.2)
-    build-depends:
-        bytestring ==0.10.*
-      , template-haskell ==2.16.*
-      , text >=1.2.3.0 && <1.3

 test-suite simplex-chat-test
  type: exitcode-stdio-1.0
@@ -566,6 +524,7 @@ test-suite simplex-chat-test
    , attoparsec ==0.14.*
    , base >=4.7 && <5
    , base64-bytestring >=1.0 && <1.3
+    , bytestring ==0.11.*
    , composition ==1.0.*
    , constraints >=0.12 && <0.14
    , containers ==0.6.*
@@ -578,13 +537,13 @@ test-suite simplex-chat-test
    , exceptions ==0.10.*
    , filepath ==1.4.*
    , generic-random ==1.5.*
-    , hspec ==2.7.*
+    , hspec ==2.11.*
    , http-types ==0.12.*
    , http2 >=4.2.2 && <4.3
-    , memory ==0.18.*
-    , mtl >=2.3.1 && <3.0
+    , memory >=0.15 && <0.19
+    , mtl >=2.2 && <3
    , network ==3.1.*
-    , network-transport ==0.5.6
+    , network-transport >=0.5.6 && <0.6
    , optparse-applicative >=0.15 && <0.17
    , process ==1.6.*
    , random >=1.1 && <1.3
@@ -596,22 +555,14 @@ test-suite simplex-chat-test
    , socks ==0.6.*
    , sqlcipher-simple ==0.4.*
    , stm ==2.5.*
+    , template-haskell >=2.16 && <2.21
    , terminal ==0.2.*
+    , text >=2.0 && <3
    , time ==1.9.*
    , tls >=1.6.0 && <1.7
    , unliftio ==0.2.*
    , unliftio-core ==0.2.*
-    , zip ==2.0.*
+    , zip >=1.7 && <2.1
  default-language: Haskell2010
  if flag(swift)
    cpp-options: -DswiftJSON
-  if impl(ghc >= 9.6.2)
-    build-depends:
-        bytestring ==0.11.*
-      , template-haskell ==2.20.*
-      , text >=2.0.1 && <2.2
-  if impl(ghc < 9.6.2)
-    build-depends:
-        bytestring ==0.10.*
-      , template-haskell ==2.16.*
-      , text >=1.2.3.0 && <1.3
@@ -5,6 +5,7 @@
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE MultiWayIf #-}
 {-# LANGUAGE NamedFieldPuns #-}
+{-# LANGUAGE OverloadedRecordDot #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE ScopedTypeVariables #-}
@@ -272,8 +273,8 @@ newChatController ChatDatabase {chatStore, agentStore} user cfg@ChatConfig {agen
  where
    configServers :: DefaultAgentServers
    configServers =
-      let smp' = fromMaybe (smp (defaultServers :: DefaultAgentServers)) (nonEmpty smpServers)
-          xftp' = fromMaybe (xftp (defaultServers :: DefaultAgentServers)) (nonEmpty xftpServers)
+      let smp' = fromMaybe (defaultServers.smp) (nonEmpty smpServers)
+          xftp' = fromMaybe (defaultServers.xftp) (nonEmpty xftpServers)
       in defaultServers {smp = smp', xftp = xftp', netCfg = networkConfig}
    agentServers :: ChatConfig -> IO InitialAgentServers
    agentServers config@ChatConfig {defaultServers = defServers@DefaultAgentServers {ntf, netCfg}} = do
@@ -300,9 +301,9 @@ activeAgentServers ChatConfig {defaultServers} p =
    . filter (\ServerCfg {enabled} -> enabled)

 cfgServers :: UserProtocol p => SProtocolType p -> (DefaultAgentServers -> NonEmpty (ProtoServerWithAuth p))
-cfgServers = \case
-  SPSMP -> smp
-  SPXFTP -> xftp
+cfgServers p s = case p of
+  SPSMP -> s.smp
+  SPXFTP -> s.xftp

 startChatController :: forall m. ChatMonad' m => Bool -> Bool -> Bool -> m (Async ())
 startChatController subConns enableExpireCIs startXFTPWorkers = do
@@ -456,15 +457,15 @@ processChatCommand = \case
      chooseServers :: (ProtocolTypeI p, UserProtocol p) => SProtocolType p -> m (NonEmpty (ProtoServerWithAuth p), [ServerCfg p])
      chooseServers protocol
        | sameServers =
-          asks currentUser >>= readTVarIO >>= \case
-            Nothing -> throwChatError CENoActiveUser
-            Just user -> do
-              servers <- withStore' (`getProtocolServers` user)
-              cfg <- asks config
-              pure (activeAgentServers cfg protocol servers, servers)
+            asks currentUser >>= readTVarIO >>= \case
+              Nothing -> throwChatError CENoActiveUser
+              Just user -> do
+                servers <- withStore' (`getProtocolServers` user)
+                cfg <- asks config
+                pure (activeAgentServers cfg protocol servers, servers)
        | otherwise = do
-          defServers <- asks $ defaultServers . config
-          pure (cfgServers protocol defServers, [])
+            defServers <- asks $ defaultServers . config
+            pure (cfgServers protocol defServers, [])
      storeServers user servers =
        unless (null servers) . withStore $
          \db -> overwriteProtocolServers db user servers
@@ -694,18 +695,18 @@ processChatCommand = \case
          | isVoice mc && not (groupFeatureAllowed SGFVoice gInfo) = notAllowedError GFVoice
          | not (isVoice mc) && isJust file_ && not (groupFeatureAllowed SGFFiles gInfo) = notAllowedError GFFiles
          | otherwise = do
-            (fInv_, ciFile_, ft_) <- unzipMaybe3 <$> setupSndFileTransfer g (length $ filter memberCurrent ms)
-            timed_ <- sndGroupCITimed live gInfo itemTTL
-            (msgContainer, quotedItem_) <- prepareMsg fInv_ timed_ membership
-            (msg@SndMessage {sharedMsgId}, sentToMembers) <- sendGroupMessage user gInfo ms (XMsgNew msgContainer)
-            ci <- saveSndChatItem' user (CDGroupSnd gInfo) msg (CISndMsgContent mc) ciFile_ quotedItem_ timed_ live
-            withStore' $ \db ->
-              forM_ sentToMembers $ \GroupMember {groupMemberId} ->
-                createGroupSndStatus db (chatItemId' ci) groupMemberId CISSndNew
-            mapM_ (sendGroupFileInline ms sharedMsgId) ft_
-            forM_ (timed_ >>= timedDeleteAt') $
-              startProximateTimedItemThread user (ChatRef CTGroup groupId, chatItemId' ci)
-            pure $ CRNewChatItem user (AChatItem SCTGroup SMDSnd (GroupChat gInfo) ci)
+              (fInv_, ciFile_, ft_) <- unzipMaybe3 <$> setupSndFileTransfer g (length $ filter memberCurrent ms)
+              timed_ <- sndGroupCITimed live gInfo itemTTL
+              (msgContainer, quotedItem_) <- prepareMsg fInv_ timed_ membership
+              (msg@SndMessage {sharedMsgId}, sentToMembers) <- sendGroupMessage user gInfo ms (XMsgNew msgContainer)
+              ci <- saveSndChatItem' user (CDGroupSnd gInfo) msg (CISndMsgContent mc) ciFile_ quotedItem_ timed_ live
+              withStore' $ \db ->
+                forM_ sentToMembers $ \GroupMember {groupMemberId} ->
+                  createGroupSndStatus db (chatItemId' ci) groupMemberId CISSndNew
+              mapM_ (sendGroupFileInline ms sharedMsgId) ft_
+              forM_ (timed_ >>= timedDeleteAt') $
+                startProximateTimedItemThread user (ChatRef CTGroup groupId, chatItemId' ci)
+              pure $ CRNewChatItem user (AChatItem SCTGroup SMDSnd (GroupChat gInfo) ci)
        notAllowedError f = pure $ chatCmdError (Just user) ("feature not allowed " <> T.unpack (groupFeatureNameText f))
        setupSndFileTransfer :: Group -> Int -> m (Maybe (FileInvitation, CIFile 'MDSnd, FileTransferMeta))
        setupSndFileTransfer g@(Group gInfo _) n = forM file_ $ \file -> do
@@ -760,11 +761,11 @@ processChatCommand = \case
      quoteContent qmc ciFile_
        | replaceContent = MCText qTextOrFile
        | otherwise = case qmc of
-          MCImage _ image -> MCImage qTextOrFile image
-          MCFile _ -> MCFile qTextOrFile
-          -- consider same for voice messages
-          -- MCVoice _ voice -> MCVoice qTextOrFile voice
-          _ -> qmc
+            MCImage _ image -> MCImage qTextOrFile image
+            MCFile _ -> MCFile qTextOrFile
+            -- consider same for voice messages
+            -- MCVoice _ voice -> MCVoice qTextOrFile voice
+            _ -> qmc
        where
          -- if the message we're quoting with is one of the "large" MsgContents
          -- we replace the quote's content with MCText
@@ -993,7 +994,7 @@ processChatCommand = \case
      pure $ CRContactConnectionDeleted user conn
    CTGroup -> do
      Group gInfo@GroupInfo {membership} members <- withStore $ \db -> getGroup db user chatId
-      let isOwner = memberRole (membership :: GroupMember) == GROwner
+      let isOwner = membership.memberRole == GROwner
          canDelete = isOwner || not (memberCurrent membership)
      unless canDelete $ throwChatError $ CEGroupUserRole gInfo GROwner
      filesInfo <- withStore' $ \db -> getGroupFileInfo db user gInfo
@@ -1019,13 +1020,13 @@ processChatCommand = \case
            delete ct
              | directOrUsed ct = pure []
              | otherwise =
-                withStore' (\db -> checkContactHasGroups db user ct) >>= \case
-                  Just _ -> pure []
-                  Nothing -> do
-                    conns <- withStore' $ \db -> getContactConnections db userId ct
-                    withStore' (\db -> setContactDeleted db user ct)
-                      `catchChatError` (toView . CRChatError (Just user))
-                    pure $ map aConnId conns
+                  withStore' (\db -> checkContactHasGroups db user ct) >>= \case
+                    Just _ -> pure []
+                    Nothing -> do
+                      conns <- withStore' $ \db -> getContactConnections db userId ct
+                      withStore' (\db -> setContactDeleted db user ct)
+                        `catchChatError` (toView . CRChatError (Just user))
+                      pure $ map aConnId conns
    CTContactRequest -> pure $ chatCmdError (Just user) "not supported"
  APIClearChat (ChatRef cType chatId) -> withUser $ \user -> case cType of
    CTDirect -> do
@@ -1254,10 +1255,9 @@ processChatCommand = \case
    m <- withStore $ \db -> do
      liftIO $ updateGroupMemberSettings db user gId gMemberId settings
      getGroupMember db user gId gMemberId
-    when (memberActive m) $
-      forM_ (memberConnId m) $ \connId -> do
-        let ntfOn = showMessages $ memberSettings m
-        withAgent (\a -> toggleConnectionNtfs a connId ntfOn) `catchChatError` (toView . CRChatError (Just user))
+    when (memberActive m) $ forM_ (memberConnId m) $ \connId -> do
+      let ntfOn = showMessages $ memberSettings m
+      withAgent (\a -> toggleConnectionNtfs a connId ntfOn) `catchChatError` (toView . CRChatError (Just user))
    ok user
  APIContactInfo contactId -> withUser $ \user@User {userId} -> do
    -- [incognito] print user's incognito profile for this contact
@@ -1328,8 +1328,8 @@ processChatCommand = \case
          Just SecurityCode {securityCode}
            | sameVerificationCode code securityCode -> pure ct
            | otherwise -> do
-              withStore' $ \db -> setConnectionVerified db user connId Nothing
-              pure (ct :: Contact) {activeConn = Just $ (conn :: Connection) {connectionCode = Nothing}}
+                withStore' $ \db -> setConnectionVerified db user connId Nothing
+                pure (ct :: Contact) {activeConn = Just $ (conn :: Connection) {connectionCode = Nothing}}
          _ -> pure ct
        pure $ CRContactCode user ct' code
      Nothing -> throwChatError $ CEContactNotActive ct
@@ -1342,8 +1342,8 @@ processChatCommand = \case
          Just SecurityCode {securityCode}
            | sameVerificationCode code securityCode -> pure m
            | otherwise -> do
-              withStore' $ \db -> setConnectionVerified db user connId Nothing
-              pure (m :: GroupMember) {activeConn = Just $ (conn :: Connection) {connectionCode = Nothing}}
+                withStore' $ \db -> setConnectionVerified db user connId Nothing
+                pure (m :: GroupMember) {activeConn = Just $ (conn :: Connection) {connectionCode = Nothing}}
          _ -> pure m
        pure $ CRGroupMemberCode user g m' code
      _ -> throwChatError CEGroupMemberNotActive
@@ -1622,12 +1622,12 @@ processChatCommand = \case
        pure $ CRSentGroupInvitation user gInfo contact member
      Just member@GroupMember {groupMemberId, memberStatus, memberRole = mRole}
        | memberStatus == GSMemInvited -> do
-          unless (mRole == memRole) $ withStore' $ \db -> updateGroupMemberRole db user member memRole
-          withStore' (\db -> getMemberInvitation db user groupMemberId) >>= \case
-            Just cReq -> do
-              sendInvitation member {memberRole = memRole} cReq
-              pure $ CRSentGroupInvitation user gInfo contact member {memberRole = memRole}
-            Nothing -> throwChatError $ CEGroupCantResendInvitation gInfo cName
+            unless (mRole == memRole) $ withStore' $ \db -> updateGroupMemberRole db user member memRole
+            withStore' (\db -> getMemberInvitation db user groupMemberId) >>= \case
+              Just cReq -> do
+                sendInvitation member {memberRole = memRole} cReq
+                pure $ CRSentGroupInvitation user gInfo contact member {memberRole = memRole}
+              Nothing -> throwChatError $ CEGroupCantResendInvitation gInfo cName
        | otherwise -> throwChatError $ CEGroupDuplicateMember cName
  APIJoinGroup groupId -> withUser $ \user@User {userId} -> do
    withChatLock "joinGroup" . procCmd $ do
@@ -1639,7 +1639,7 @@ processChatCommand = \case
      case activeConn of
        Just Connection {peerChatVRange} -> do
          subMode <- chatReadVar subscriptionMode
-          dm <- directMessage $ XGrpAcpt (memberId (membership :: GroupMember))
+          dm <- directMessage $ XGrpAcpt membership.memberId
          agentConnId <- withAgent $ \a -> joinConnection a (aUserId user) True connRequest dm subMode
          withStore' $ \db -> do
            createMemberConnection db userId fromMember agentConnId (fromJVersionRange peerChatVRange) subMode
@@ -1796,7 +1796,7 @@ processChatCommand = \case
    case memberConn m of
      Just mConn -> do
        let msg = XGrpDirectInv cReq msgContent_
-        (sndMsg, _) <- sendDirectMessage mConn msg (GroupId $ groupId (g :: GroupInfo))
+        (sndMsg, _) <- sendDirectMessage mConn msg (GroupId $ g.groupId)
        withStore' $ \db -> setContactGrpInvSent db ct True
        let ct' = ct {contactGrpInvSent = True}
        forM_ msgContent_ $ \mc -> do
@@ -1884,21 +1884,21 @@ processChatCommand = \case
        FTSnd ftm@FileTransferMeta {xftpSndFile, cancelled} fts
          | cancelled -> throwChatError $ CEFileCancel fileId "file already cancelled"
          | not (null fts) && all fileCancelledOrCompleteSMP fts ->
-            throwChatError $ CEFileCancel fileId "file transfer is complete"
+              throwChatError $ CEFileCancel fileId "file transfer is complete"
          | otherwise -> do
-            fileAgentConnIds <- cancelSndFile user ftm fts True
-            deleteAgentConnectionsAsync user fileAgentConnIds
-            sharedMsgId <- withStore $ \db -> getSharedMsgIdByFileId db userId fileId
-            withStore (\db -> getChatRefByFileId db user fileId) >>= \case
-              ChatRef CTDirect contactId -> do
-                contact <- withStore $ \db -> getContact db user contactId
-                void . sendDirectContactMessage contact $ XFileCancel sharedMsgId
-              ChatRef CTGroup groupId -> do
-                Group gInfo ms <- withStore $ \db -> getGroup db user groupId
-                void . sendGroupMessage user gInfo ms $ XFileCancel sharedMsgId
-              _ -> throwChatError $ CEFileInternal "invalid chat ref for file transfer"
-            ci <- withStore $ \db -> getChatItemByFileId db user fileId
-            pure $ CRSndFileCancelled user ci ftm fts
+              fileAgentConnIds <- cancelSndFile user ftm fts True
+              deleteAgentConnectionsAsync user fileAgentConnIds
+              sharedMsgId <- withStore $ \db -> getSharedMsgIdByFileId db userId fileId
+              withStore (\db -> getChatRefByFileId db user fileId) >>= \case
+                ChatRef CTDirect contactId -> do
+                  contact <- withStore $ \db -> getContact db user contactId
+                  void . sendDirectContactMessage contact $ XFileCancel sharedMsgId
+                ChatRef CTGroup groupId -> do
+                  Group gInfo ms <- withStore $ \db -> getGroup db user groupId
+                  void . sendGroupMessage user gInfo ms $ XFileCancel sharedMsgId
+                _ -> throwChatError $ CEFileInternal "invalid chat ref for file transfer"
+              ci <- withStore $ \db -> getChatItemByFileId db user fileId
+              pure $ CRSndFileCancelled user ci ftm fts
          where
            fileCancelledOrCompleteSMP SndFileTransfer {fileStatus = s} =
              s == FSCancelled || (s == FSComplete && isNothing xftpSndFile)
@@ -1906,23 +1906,23 @@ processChatCommand = \case
          | cancelled -> throwChatError $ CEFileCancel fileId "file already cancelled"
          | rcvFileComplete fileStatus -> throwChatError $ CEFileCancel fileId "file transfer is complete"
          | otherwise -> case xftpRcvFile of
-            Nothing -> do
-              cancelRcvFileTransfer user ftr >>= mapM_ (deleteAgentConnectionAsync user)
-              ci <- withStore $ \db -> getChatItemByFileId db user fileId
-              pure $ CRRcvFileCancelled user ci ftr
-            Just XFTPRcvFile {agentRcvFileId} -> do
-              forM_ (liveRcvFileTransferPath ftr) $ \filePath -> do
-                fsFilePath <- toFSFilePath filePath
-                liftIO $ removeFile fsFilePath `catchAll_` pure ()
-              forM_ agentRcvFileId $ \(AgentRcvFileId aFileId) ->
-                withAgent (`xftpDeleteRcvFile` aFileId)
-              ci <- withStore $ \db -> do
-                liftIO $ do
-                  updateCIFileStatus db user fileId CIFSRcvInvitation
-                  updateRcvFileStatus db fileId FSNew
-                  updateRcvFileAgentId db fileId Nothing
-                getChatItemByFileId db user fileId
-              pure $ CRRcvFileCancelled user ci ftr
+              Nothing -> do
+                cancelRcvFileTransfer user ftr >>= mapM_ (deleteAgentConnectionAsync user)
+                ci <- withStore $ \db -> getChatItemByFileId db user fileId
+                pure $ CRRcvFileCancelled user ci ftr
+              Just XFTPRcvFile {agentRcvFileId} -> do
+                forM_ (liveRcvFileTransferPath ftr) $ \filePath -> do
+                  fsFilePath <- toFSFilePath filePath
+                  liftIO $ removeFile fsFilePath `catchAll_` pure ()
+                forM_ agentRcvFileId $ \(AgentRcvFileId aFileId) ->
+                  withAgent (`xftpDeleteRcvFile` aFileId)
+                ci <- withStore $ \db -> do
+                  liftIO $ do
+                    updateCIFileStatus db user fileId CIFSRcvInvitation
+                    updateRcvFileStatus db fileId FSNew
+                    updateRcvFileAgentId db fileId Nothing
+                  getChatItemByFileId db user fileId
+                pure $ CRRcvFileCancelled user ci ftr
  FileStatus fileId -> withUser $ \user -> do
    ci@(AChatItem _ _ _ ChatItem {file}) <- withStore $ \db -> getChatItemByFileId db user fileId
    case file of
@@ -1987,7 +1987,8 @@ processChatCommand = \case
  DeleteRemoteCtrl rc -> withUser_ $ deleteRemoteCtrl rc >> ok_
  QuitChat -> liftIO exitSuccess
  ShowVersion -> do
-    let versionInfo = coreVersionInfo $(simplexmqCommitQ)
+    -- simplexmqCommitQ makes iOS builds crash m(
+    let versionInfo = coreVersionInfo ""
    chatMigrations <- map upMigration <$> withStore' (Migrations.getCurrent . DB.conn)
    agentMigrations <- withAgent getAgentMigrations
    pure $ CRVersionInfo {versionInfo, chatMigrations, agentMigrations}
@@ -2133,7 +2134,7 @@ processChatCommand = \case
      xftpCfg <- readTVarIO =<< asks userXFTPFileConfig
      fileSize <- liftIO $ CF.getFileContentsSize $ CryptoFile fsFilePath cfArgs
      when (fromInteger fileSize > maxFileSize) $ throwChatError $ CEFileSize f
-      let chunks = - ((- fileSize) `div` fileChunkSize)
+      let chunks = -((-fileSize) `div` fileChunkSize)
          fileInline = inlineFileMode mc inlineFiles chunks n
          fileMode = case xftpCfg of
            Just cfg
@@ -2152,18 +2153,18 @@ processChatCommand = \case
    updateProfile_ user@User {profile = p@LocalProfile {displayName = n}} p'@Profile {displayName = n'} updateUser
      | p' == fromLocalProfile p = pure $ CRUserProfileNoChange user
      | otherwise = do
-        when (n /= n') $ checkValidName n'
-        -- read contacts before user update to correctly merge preferences
-        -- [incognito] filter out contacts with whom user has incognito connections
-        contacts <-
-          filter (\ct -> contactReady ct && contactActive ct && not (contactConnIncognito ct))
-            <$> withStore' (`getUserContacts` user)
-        user' <- updateUser
-        asks currentUser >>= atomically . (`writeTVar` Just user')
-        withChatLock "updateProfile" . procCmd $ do
-          ChatConfig {logLevel} <- asks config
-          summary <- foldM (processAndCount user' logLevel) (UserProfileUpdateSummary 0 0 0 []) contacts
-          pure $ CRUserProfileUpdated user' (fromLocalProfile p) p' summary
+          when (n /= n') $ checkValidName n'
+          -- read contacts before user update to correctly merge preferences
+          -- [incognito] filter out contacts with whom user has incognito connections
+          contacts <-
+            filter (\ct -> contactReady ct && contactActive ct && not (contactConnIncognito ct))
+              <$> withStore' (`getUserContacts` user)
+          user' <- updateUser
+          asks currentUser >>= atomically . (`writeTVar` Just user')
+          withChatLock "updateProfile" . procCmd $ do
+            ChatConfig {logLevel} <- asks config
+            summary <- foldM (processAndCount user' logLevel) (UserProfileUpdateSummary 0 0 0 []) contacts
+            pure $ CRUserProfileUpdated user' (fromLocalProfile p) p' summary
      where
        processAndCount user' ll s@UserProfileUpdateSummary {notChanged, updateSuccesses, updateFailures, changedContacts = cts} ct = do
          let mergedProfile = userProfileToSend user Nothing $ Just ct
@@ -2184,16 +2185,16 @@ processChatCommand = \case
    updateContactPrefs user@User {userId} ct@Contact {activeConn = Just Connection {customUserProfileId}, userPreferences = contactUserPrefs} contactUserPrefs'
      | contactUserPrefs == contactUserPrefs' = pure $ CRContactPrefsUpdated user ct ct
      | otherwise = do
-        assertDirectAllowed user MDSnd ct XInfo_
-        ct' <- withStore' $ \db -> updateContactUserPreferences db user ct contactUserPrefs'
-        incognitoProfile <- forM customUserProfileId $ \profileId -> withStore $ \db -> getProfileById db userId profileId
-        let mergedProfile = userProfileToSend user (fromLocalProfile <$> incognitoProfile) (Just ct)
-            mergedProfile' = userProfileToSend user (fromLocalProfile <$> incognitoProfile) (Just ct')
-        when (mergedProfile' /= mergedProfile) $
-          withChatLock "updateProfile" $ do
-            void (sendDirectContactMessage ct' $ XInfo mergedProfile') `catchChatError` (toView . CRChatError (Just user))
-            when (directOrUsed ct') $ createSndFeatureItems user ct ct'
-        pure $ CRContactPrefsUpdated user ct ct'
+          assertDirectAllowed user MDSnd ct XInfo_
+          ct' <- withStore' $ \db -> updateContactUserPreferences db user ct contactUserPrefs'
+          incognitoProfile <- forM customUserProfileId $ \profileId -> withStore $ \db -> getProfileById db userId profileId
+          let mergedProfile = userProfileToSend user (fromLocalProfile <$> incognitoProfile) (Just ct)
+              mergedProfile' = userProfileToSend user (fromLocalProfile <$> incognitoProfile) (Just ct')
+          when (mergedProfile' /= mergedProfile) $
+            withChatLock "updateProfile" $ do
+              void (sendDirectContactMessage ct' $ XInfo mergedProfile') `catchChatError` (toView . CRChatError (Just user))
+              when (directOrUsed ct') $ createSndFeatureItems user ct ct'
+          pure $ CRContactPrefsUpdated user ct ct'
    runUpdateGroupProfile :: User -> Group -> GroupProfile -> m ChatResponse
    runUpdateGroupProfile user (Group g@GroupInfo {groupProfile = p@GroupProfile {displayName = n}} ms) p'@GroupProfile {displayName = n'} = do
      assertUserGroupRole g GROwner
@@ -2212,7 +2213,7 @@ processChatCommand = \case
      when (displayName /= validName) $ throwChatError CEInvalidDisplayName {displayName, validName}
    assertUserGroupRole :: GroupInfo -> GroupMemberRole -> m ()
    assertUserGroupRole g@GroupInfo {membership} requiredRole = do
-      when (memberRole (membership :: GroupMember) < requiredRole) $ throwChatError $ CEGroupUserRole g requiredRole
+      when (membership.memberRole < requiredRole) $ throwChatError $ CEGroupUserRole g requiredRole
      when (memberStatus membership == GSMemInvited) $ throwChatError (CEGroupNotJoined g)
      when (memberRemoved membership) $ throwChatError CEGroupMemberUserRemoved
      unless (memberActive membership) $ throwChatError CEGroupMemberNotActive
@@ -2238,15 +2239,15 @@ processChatCommand = \case
          Nothing -> throwChatError CENoCurrentCall
          Just call@Call {contactId}
            | ctId == contactId -> do
-              call_ <- action user ct call
-              case call_ of
-                Just call' -> do
-                  unless (isRcvInvitation call') $ withStore' $ \db -> deleteCalls db user ctId
-                  atomically $ TM.insert ctId call' calls
-                _ -> do
-                  withStore' $ \db -> deleteCalls db user ctId
-                  atomically $ TM.delete ctId calls
-              ok user
+                call_ <- action user ct call
+                case call_ of
+                  Just call' -> do
+                    unless (isRcvInvitation call') $ withStore' $ \db -> deleteCalls db user ctId
+                    atomically $ TM.insert ctId call' calls
+                  _ -> do
+                    withStore' $ \db -> deleteCalls db user ctId
+                    atomically $ TM.delete ctId calls
+                ok user
            | otherwise -> throwChatError $ CECallContact contactId
    withServerProtocol :: ProtocolTypeI p => SProtocolType p -> (UserProtocol p => m a) -> m a
    withServerProtocol p action = case userProtocol p of
@@ -2256,7 +2257,7 @@ processChatCommand = \case
    forwardFile chatName fileId sendCommand = withUser $ \user -> do
      withStore (\db -> getFileTransfer db user fileId) >>= \case
        FTRcv RcvFileTransfer {fileStatus = RFSComplete RcvFileInfo {filePath}, cryptoArgs} -> forward filePath cryptoArgs
-        FTSnd {fileTransferMeta = FileTransferMeta {filePath, xftpSndFile}} -> forward filePath $ xftpSndFile >>= \XFTPSndFile {cryptoArgs} -> cryptoArgs
+        FTSnd {fileTransferMeta = FileTransferMeta {filePath, xftpSndFile}} -> forward filePath $ xftpSndFile >>= \f -> f.cryptoArgs
        _ -> throwChatError CEFileNotReceived {fileId}
      where
        forward path cfArgs = processChatCommand . sendCommand chatName $ CryptoFile path cfArgs
@@ -2311,12 +2312,12 @@ processChatCommand = \case
    setUserPrivacy :: User -> User -> m ChatResponse
    setUserPrivacy user@User {userId} user'@User {userId = userId'}
      | userId == userId' = do
-        asks currentUser >>= atomically . (`writeTVar` Just user')
-        withStore' (`updateUserPrivacy` user')
-        pure $ CRUserPrivacy {user = user', updatedUser = user'}
+          asks currentUser >>= atomically . (`writeTVar` Just user')
+          withStore' (`updateUserPrivacy` user')
+          pure $ CRUserPrivacy {user = user', updatedUser = user'}
      | otherwise = do
-        withStore' (`updateUserPrivacy` user')
-        pure $ CRUserPrivacy {user, updatedUser = user'}
+          withStore' (`updateUserPrivacy` user')
+          pure $ CRUserPrivacy {user, updatedUser = user'}
    checkDeleteChatUser :: User -> m ()
    checkDeleteChatUser user@User {userId} = do
      when (activeUser user) $ throwChatError (CECantDeleteActiveUser userId)
@@ -2350,11 +2351,11 @@ processChatCommand = \case
        Just (RcvDirectMsgConnection conn ct_) -> do
          let Connection {connStatus, contactConnInitiated} = conn
          if
-              | connStatus == ConnNew && contactConnInitiated ->
+            | connStatus == ConnNew && contactConnInitiated ->
                pure $ CPInvitationLink ILPOwnLink
-              | not (connReady conn) ->
+            | not (connReady conn) ->
                pure $ CPInvitationLink (ILPConnecting ct_)
-              | otherwise -> case ct_ of
+            | otherwise -> case ct_ of
                Just ct -> pure $ CPInvitationLink (ILPKnown ct)
                Nothing -> throwChatError $ CEInternalError "ready RcvDirectMsgConnection connection should have associated contact"
        Just _ -> throwChatError $ CECommandError "found connection entity is not RcvDirectMsgConnection"
@@ -2365,7 +2366,6 @@ processChatCommand = \case
            ( CRInvitationUri crData {crScheme = CRSSimplex} e2e,
              CRInvitationUri crData {crScheme = simplexChat} e2e
            )
-          _ -> (cReq, cReq) -- ghc8107
    connectPlan user (ACR SCMContact cReq) = do
      let CRContactUri ConnReqUriData {crClientData} = cReq
          groupLinkId = crClientData >>= decodeJSON >>= \(CRDataGroup gli) -> Just gli
@@ -2402,7 +2402,7 @@ processChatCommand = \case
                (Nothing, Just _) -> throwChatError $ CECommandError "found connection entity is not RcvDirectMsgConnection"
                (Just gInfo@GroupInfo {membership}, _)
                  | not (memberActive membership) && not (memberRemoved membership) ->
-                    pure $ CPGroupLink (GLPConnectingProhibit gInfo_)
+                      pure $ CPGroupLink (GLPConnectingProhibit gInfo_)
                  | memberActive membership -> pure $ CPGroupLink (GLPKnown gInfo)
                  | otherwise -> pure $ CPGroupLink GLPOk
      where
@@ -2412,7 +2412,6 @@ processChatCommand = \case
            ( CRContactUri crData {crScheme = CRSSimplex},
              CRContactUri crData {crScheme = simplexChat}
            )
-          _ -> (cReq, cReq) -- ghc8107
        cReqHashes :: (ConnReqUriHash, ConnReqUriHash)
        cReqHashes = bimap hash hash cReqSchemas
        hash = ConnReqUriHash . C.sha256Hash . strEncode
@@ -2618,14 +2617,14 @@ acceptFileReceive user@User {userId} RcvFileTransfer {fileId, xftpRcvFile, fileI
      filePath <- getRcvFilePath fileId filePath_ fName True
      inline <- receiveInline
      if
-          | inline -> do
+        | inline -> do
            -- accepting inline
            ci <- withStoreCtx (Just "acceptFile, acceptRcvInlineFT") $ \db -> acceptRcvInlineFT db user fileId filePath
            sharedMsgId <- withStore $ \db -> getSharedMsgIdByFileId db userId fileId
            send $ XFileAcptInv sharedMsgId Nothing fName
            pure ci
-          | fileInline == Just IFMSent -> throwChatError $ CEFileAlreadyReceiving fName
-          | otherwise -> do
+        | fileInline == Just IFMSent -> throwChatError $ CEFileAlreadyReceiving fName
+        | otherwise -> do
            -- accepting via a new connection
            subMode <- chatReadVar subscriptionMode
            connIds <- createAgentConnectionAsync user cmdFunction True SCMInvitation subMode
@@ -2902,9 +2901,9 @@ subscribeUserConnections onlyNeeded agentBatchSubscribe user@User {userId} = do
            groupEvent
              | memberStatus membership == GSMemInvited = CRGroupInvitation user g
              | all (\GroupMember {activeConn} -> isNothing activeConn) members =
-                if memberActive membership
-                  then CRGroupEmpty user g
-                  else CRGroupRemoved user g
+                  if memberActive membership
+                    then CRGroupEmpty user g
+                    else CRGroupRemoved user g
              | otherwise = CRGroupSubscribed user g
    sndFileSubsToView :: Map ConnId (Either AgentErrorType ()) -> Map ConnId SndFileTransfer -> m ()
    sndFileSubsToView rs sfts = do
@@ -2976,11 +2975,11 @@ cleanupManager = do
          `catchChatError` (toView . CRChatError (Just user))
    cleanupMessages = do
      ts <- liftIO getCurrentTime
-      let cutoffTs = addUTCTime (- (30 * nominalDay)) ts
+      let cutoffTs = addUTCTime (-(30 * nominalDay)) ts
      withStoreCtx' (Just "cleanupManager, deleteOldMessages") (`deleteOldMessages` cutoffTs)
    cleanupProbes = do
      ts <- liftIO getCurrentTime
-      let cutoffTs = addUTCTime (- (14 * nominalDay)) ts
+      let cutoffTs = addUTCTime (-(14 * nominalDay)) ts
      withStore' (`deleteOldProbes` cutoffTs)

 startProximateTimedItemThread :: ChatMonad m => User -> (ChatRef, ChatItemId) -> UTCTime -> m ()
@@ -3158,13 +3157,13 @@ processAgentMsgSndFile _corrId aFileId msg =
            _ -> pure () -- TODO error?
        SFERR e
          | temporaryAgentError e ->
-            throwChatError $ CEXFTPSndFile fileId (AgentSndFileId aFileId) e
+              throwChatError $ CEXFTPSndFile fileId (AgentSndFileId aFileId) e
          | otherwise -> do
-            ci <- withStore $ \db -> do
-              liftIO $ updateFileCancelled db user fileId CIFSSndError
-              getChatItemByFileId db user fileId
-            withAgent (`xftpDeleteSndFileInternal` aFileId)
-            toView $ CRSndFileError user ci
+              ci <- withStore $ \db -> do
+                liftIO $ updateFileCancelled db user fileId CIFSSndError
+                getChatItemByFileId db user fileId
+              withAgent (`xftpDeleteSndFileInternal` aFileId)
+              toView $ CRSndFileError user ci
      where
        fileDescrText :: FilePartyI p => ValidFileDescription p -> T.Text
        fileDescrText = safeDecodeUtf8 . strEncode
@@ -3219,13 +3218,13 @@ processAgentMsgRcvFile _corrId aFileId msg =
              toView $ CRRcvFileComplete user ci
        RFERR e
          | temporaryAgentError e ->
-            throwChatError $ CEXFTPRcvFile fileId (AgentRcvFileId aFileId) e
+              throwChatError $ CEXFTPRcvFile fileId (AgentRcvFileId aFileId) e
          | otherwise -> do
-            ci <- withStore $ \db -> do
-              liftIO $ updateFileCancelled db user fileId CIFSRcvError
-              getChatItemByFileId db user fileId
-            agentXFTPDeleteRcvFile aFileId fileId
-            toView $ CRRcvFileError user ci e
+              ci <- withStore $ \db -> do
+                liftIO $ updateFileCancelled db user fileId CIFSRcvError
+                getChatItemByFileId db user fileId
+              agentXFTPDeleteRcvFile aFileId fileId
+              toView $ CRRcvFileError user ci e

 processAgentMessageConn :: forall m. ChatMonad m => User -> ACorrId -> ConnId -> ACommand 'Agent 'AEConn -> m ()
 processAgentMessageConn user _ agentConnId END =
@@ -3503,18 +3502,18 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
            case chatMsgEvent of
              XGrpAcpt memId
                | sameMemberId memId m -> do
-                  withStore $ \db -> liftIO $ updateGroupMemberStatus db userId m GSMemAccepted
-                  -- [async agent commands] no continuation needed, but command should be asynchronous for stability
-                  allowAgentConnectionAsync user conn' confId XOk
+                    withStore $ \db -> liftIO $ updateGroupMemberStatus db userId m GSMemAccepted
+                    -- [async agent commands] no continuation needed, but command should be asynchronous for stability
+                    allowAgentConnectionAsync user conn' confId XOk
                | otherwise -> messageError "x.grp.acpt: memberId is different from expected"
              _ -> messageError "CONF from invited member must have x.grp.acpt"
          _ ->
            case chatMsgEvent of
              XGrpMemInfo memId _memProfile
                | sameMemberId memId m -> do
-                  -- TODO update member profile
-                  -- [async agent commands] no continuation needed, but command should be asynchronous for stability
-                  allowAgentConnectionAsync user conn' confId $ XGrpMemInfo (memberId (membership :: GroupMember)) (fromLocalProfile $ memberProfile membership)
+                    -- TODO update member profile
+                    -- [async agent commands] no continuation needed, but command should be asynchronous for stability
+                    allowAgentConnectionAsync user conn' confId $ XGrpMemInfo membership.memberId (fromLocalProfile $ memberProfile membership)
                | otherwise -> messageError "x.grp.mem.info: memberId is different from expected"
              _ -> messageError "CONF from member must have x.grp.mem.info"
      INFO connInfo -> do
@@ -3523,8 +3522,8 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
        case chatMsgEvent of
          XGrpMemInfo memId _memProfile
            | sameMemberId memId m -> do
-              -- TODO update member profile
-              pure ()
+                -- TODO update member profile
+                pure ()
            | otherwise -> messageError "x.grp.mem.info: memberId is different from expected"
          XInfo _ -> pure () -- sent when connecting via group link
          XOk -> pure ()
@@ -3585,19 +3584,19 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
                  forM_ (invitedByGroupMemberId membership) $ \hostId -> do
                    host <- withStore $ \db -> getGroupMember db user groupId hostId
                    forM_ (memberConn host) $ \hostConn ->
-                      void $ sendDirectMessage hostConn (XGrpMemCon $ memberId (m :: GroupMember)) (GroupId groupId)
+                      void $ sendDirectMessage hostConn (XGrpMemCon m.memberId) (GroupId groupId)
                GCPostMember ->
                  forM_ (invitedByGroupMemberId m) $ \invitingMemberId -> do
                    im <- withStore $ \db -> getGroupMember db user groupId invitingMemberId
                    forM_ (memberConn im) $ \imConn ->
-                      void $ sendDirectMessage imConn (XGrpMemCon $ memberId (m :: GroupMember)) (GroupId groupId)
+                      void $ sendDirectMessage imConn (XGrpMemCon m.memberId) (GroupId groupId)
                _ -> messageWarning "sendXGrpMemCon: member category GCPreMember or GCPostMember is expected"
      MSG msgMeta _msgFlags msgBody -> do
        cmdId <- createAckCmd conn
        tryChatError (processChatMessage cmdId) >>= \case
          Right (ACMsg _ chatMsg, withRcpt) -> do
            ackMsg agentConnId cmdId msgMeta $ if withRcpt then Just "" else Nothing
-            when (memberRole (membership :: GroupMember) >= GRAdmin) $ forwardMsg_ chatMsg
+            when (membership.memberRole >= GRAdmin) $ forwardMsg_ chatMsg
          Left e -> ackMsg agentConnId cmdId msgMeta Nothing >> throwError e
        where
          processChatMessage :: Int64 -> m (AChatMessage, Bool)
@@ -3676,7 +3675,7 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
              -- invited members to which this member was introduced
              invitedMembers <- withStore' $ \db -> getForwardInvitedMembers db user m highlyAvailable
              let ms = introducedMembers <> invitedMembers
-                  msg = XGrpMsgForward (memberId (m :: GroupMember)) chatMsg' brokerTs
+                  msg = XGrpMsgForward m.memberId chatMsg' brokerTs
              unless (null ms) . void $
                sendGroupMessage user gInfo ms msg
      RCVD msgMeta msgRcpt ->
@@ -3748,11 +3747,11 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
    mdeUpdatedCI :: (MsgDecryptError, Word32) -> CChatItem c -> Maybe (ChatItem c 'MDRcv, CIContent 'MDRcv)
    mdeUpdatedCI (mde', n') (CChatItem _ ci@ChatItem {content = CIRcvDecryptionError mde n})
      | mde == mde' = case mde of
-        MDERatchetHeader -> r (n + n')
-        MDETooManySkipped -> r n' -- the numbers are not added as sequential MDETooManySkipped will have it incremented by 1
-        MDERatchetEarlier -> r (n + n')
-        MDEOther -> r (n + n')
-        MDERatchetSync -> r 0
+          MDERatchetHeader -> r (n + n')
+          MDETooManySkipped -> r n' -- the numbers are not added as sequential MDETooManySkipped will have it incremented by 1
+          MDERatchetEarlier -> r (n + n')
+          MDEOther -> r (n + n')
+          MDERatchetSync -> r 0
      | otherwise = Nothing
      where
        r n'' = Just (ci, CIRcvDecryptionError mde n'')
@@ -3770,9 +3769,9 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
            -- TODO save XFileAcpt message
            XFileAcpt name
              | name == fileName -> do
-                withStore' $ \db -> updateSndFileStatus db ft FSAccepted
-                -- [async agent commands] no continuation needed, but command should be asynchronous for stability
-                allowAgentConnectionAsync user conn' confId XOk
+                  withStore' $ \db -> updateSndFileStatus db ft FSAccepted
+                  -- [async agent commands] no continuation needed, but command should be asynchronous for stability
+                  allowAgentConnectionAsync user conn' confId XOk
              | otherwise -> messageError "x.file.acpt: fileName is different from expected"
            _ -> messageError "CONF from file connection must have x.file.acpt"
        CON -> do
@@ -3938,8 +3937,8 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
                _ -> pure ()

    memberCanSend :: GroupMember -> m () -> m ()
-    memberCanSend GroupMember {memberRole} a
-      | memberRole <= GRObserver = messageError "member is not allowed to send messages"
+    memberCanSend mem a
+      | mem.memberRole <= GRObserver = messageError "member is not allowed to send messages"
      | otherwise = a

    incAuthErrCounter :: ConnectionEntity -> Connection -> AgentErrorType -> m ()
@@ -3965,8 +3964,8 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
      case cmdData_ of
        Just cmdData@CommandData {cmdId, cmdConnId = Just cmdConnId', cmdFunction}
          | connId == cmdConnId' && (agentMsgTag == commandExpectedResponse cmdFunction || agentMsgTag == APCT SAEConn ERR_) -> do
-            withStore' $ \db -> deleteCommand db user cmdId
-            action cmdData
+              withStore' $ \db -> deleteCommand db user cmdId
+              action cmdData
          | otherwise -> err cmdId $ "not matching connection id or unexpected response, corrId = " <> show corrId
        Just CommandData {cmdId, cmdConnId = Nothing} -> err cmdId $ "no command connection id, corrId = " <> show corrId
        Nothing -> throwChatError . CEAgentCommandError $ "command not found, corrId = " <> show corrId
@@ -4276,29 +4275,29 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
      | isVoice content && not (groupFeatureAllowed SGFVoice gInfo) = rejected GFVoice
      | not (isVoice content) && isJust fInv_ && not (groupFeatureAllowed SGFFiles gInfo) = rejected GFFiles
      | otherwise = do
-        -- TODO integrity message check
-        -- check if message moderation event was received ahead of message
-        let timed_ = rcvGroupCITimed gInfo itemTTL
-            live = fromMaybe False live_
-        withStore' (\db -> getCIModeration db user gInfo memberId sharedMsgId_) >>= \case
-          Just ciModeration -> do
-            applyModeration timed_ live ciModeration
-            withStore' $ \db -> deleteCIModeration db gInfo memberId sharedMsgId_
-          Nothing -> createItem timed_ live
+          -- TODO integrity message check
+          -- check if message moderation event was received ahead of message
+          let timed_ = rcvGroupCITimed gInfo itemTTL
+              live = fromMaybe False live_
+          withStore' (\db -> getCIModeration db user gInfo memberId sharedMsgId_) >>= \case
+            Just ciModeration -> do
+              applyModeration timed_ live ciModeration
+              withStore' $ \db -> deleteCIModeration db gInfo memberId sharedMsgId_
+            Nothing -> createItem timed_ live
      where
        rejected f = void $ newChatItem (CIRcvGroupFeatureRejected f) Nothing Nothing False
        ExtMsgContent content fInv_ itemTTL live_ = mcExtMsgContent mc
        applyModeration timed_ live CIModeration {moderatorMember = moderator@GroupMember {memberRole = moderatorRole}, createdByMsgId, moderatedAt}
          | moderatorRole < GRAdmin || moderatorRole < memberRole =
-            createItem timed_ live
+              createItem timed_ live
          | groupFeatureAllowed SGFFullDelete gInfo = do
-            ci <- saveRcvChatItem' user (CDGroupRcv gInfo m) msg sharedMsgId_ brokerTs CIRcvModerated Nothing timed_ False
-            ci' <- withStore' $ \db -> updateGroupChatItemModerated db user gInfo ci moderator moderatedAt
-            toView $ CRNewChatItem user $ AChatItem SCTGroup SMDRcv (GroupChat gInfo) ci'
+              ci <- saveRcvChatItem' user (CDGroupRcv gInfo m) msg sharedMsgId_ brokerTs CIRcvModerated Nothing timed_ False
+              ci' <- withStore' $ \db -> updateGroupChatItemModerated db user gInfo ci moderator moderatedAt
+              toView $ CRNewChatItem user $ AChatItem SCTGroup SMDRcv (GroupChat gInfo) ci'
          | otherwise = do
-            file_ <- processFileInvitation fInv_ content $ \db -> createRcvGroupFileTransfer db userId m
-            ci <- saveRcvChatItem' user (CDGroupRcv gInfo m) msg sharedMsgId_ brokerTs (CIRcvMsgContent content) (snd <$> file_) timed_ False
-            toView =<< markGroupCIDeleted user gInfo ci createdByMsgId False (Just moderator) moderatedAt
+              file_ <- processFileInvitation fInv_ content $ \db -> createRcvGroupFileTransfer db userId m
+              ci <- saveRcvChatItem' user (CDGroupRcv gInfo m) msg sharedMsgId_ brokerTs (CIRcvMsgContent content) (snd <$> file_) timed_ False
+              toView =<< markGroupCIDeleted user gInfo ci createdByMsgId False (Just moderator) moderatedAt
        createItem timed_ live = do
          file_ <- processFileInvitation fInv_ content $ \db -> createRcvGroupFileTransfer db userId m
          newChatItem (CIRcvMsgContent content) (snd <$> file_) timed_ live
@@ -4367,7 +4366,7 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
          _ -> messageError "x.msg.del: message of another member without memberId"
        checkRole GroupMember {memberRole} a
          | senderRole < GRAdmin || senderRole < memberRole =
-            messageError "x.msg.del: message of another member with insufficient member permissions"
+              messageError "x.msg.del: message of another member with insufficient member permissions"
          | otherwise = a
        delete :: MsgDirectionI d => ChatItem 'CTGroup d -> Maybe GroupMember -> m ChatResponse
        delete ci byGroupMember
@@ -4620,17 +4619,17 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
    processContactProfileUpdate :: Contact -> Profile -> Bool -> m Contact
    processContactProfileUpdate c@Contact {profile = p} p' createItems
      | fromLocalProfile p /= p' = do
-        c' <- withStore $ \db ->
-          if userTTL == rcvTTL
-            then updateContactProfile db user c p'
-            else do
-              c' <- liftIO $ updateContactUserPreferences db user c ctUserPrefs'
-              updateContactProfile db user c' p'
-        when (directOrUsed c' && createItems) $ createRcvFeatureItems user c c'
-        toView $ CRContactUpdated user c c'
-        pure c'
+          c' <- withStore $ \db ->
+            if userTTL == rcvTTL
+              then updateContactProfile db user c p'
+              else do
+                c' <- liftIO $ updateContactUserPreferences db user c ctUserPrefs'
+                updateContactProfile db user c' p'
+          when (directOrUsed c' && createItems) $ createRcvFeatureItems user c c'
+          toView $ CRContactUpdated user c c'
+          pure c'
      | otherwise =
-        pure c
+          pure c
      where
        Contact {userPreferences = ctUserPrefs@Preferences {timedMessages = ctUserTMPref}} = c
        userTTL = prefParam $ getPreference SCFTimedMessages ctUserPrefs
@@ -4718,21 +4717,21 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
          case cgm2 of
            COMContact c2@Contact {contactId = cId2, profile = p2}
              | cId1 /= cId2 && profilesMatch p1 p2 -> do
-                void . sendDirectContactMessage c1 $ XInfoProbeOk probe
-                COMContact <$$> mergeContacts c1 c2
+                  void . sendDirectContactMessage c1 $ XInfoProbeOk probe
+                  COMContact <$$> mergeContacts c1 c2
              | otherwise -> messageWarning "probeMatch ignored: profiles don't match or same contact id" >> pure Nothing
            COMGroupMember m2@GroupMember {memberProfile = p2, memberContactId}
              | isNothing memberContactId && profilesMatch p1 p2 -> do
-                void . sendDirectContactMessage c1 $ XInfoProbeOk probe
-                COMContact <$$> associateMemberAndContact c1 m2
+                  void . sendDirectContactMessage c1 $ XInfoProbeOk probe
+                  COMContact <$$> associateMemberAndContact c1 m2
              | otherwise -> messageWarning "probeMatch ignored: profiles don't match or member already has contact" >> pure Nothing
        COMGroupMember GroupMember {activeConn = Nothing} -> pure Nothing
        COMGroupMember m1@GroupMember {groupId, memberProfile = p1, memberContactId, activeConn = Just conn} ->
          case cgm2 of
            COMContact c2@Contact {profile = p2}
              | memberCurrent m1 && isNothing memberContactId && profilesMatch p1 p2 -> do
-                void $ sendDirectMessage conn (XInfoProbeOk probe) (GroupId groupId)
-                COMContact <$$> associateMemberAndContact c2 m1
+                  void $ sendDirectMessage conn (XInfoProbeOk probe) (GroupId groupId)
+                  COMContact <$$> associateMemberAndContact c2 m1
              | otherwise -> messageWarning "probeMatch ignored: profiles don't match or member already has contact or member not current" >> pure Nothing
            COMGroupMember _ -> messageWarning "probeMatch ignored: members are not matched with members" >> pure Nothing

@@ -4848,16 +4847,16 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
        Just call@Call {contactId, callId, chatItemId}
          | contactId /= ctId' || callId /= callId' -> messageError $ eventName <> ": wrong contact or callId"
          | otherwise -> do
-            (call_, aciContent_) <- action call
-            case call_ of
-              Just call' -> do
-                unless (isRcvInvitation call') $ withStore' $ \db -> deleteCalls db user ctId'
-                atomically $ TM.insert ctId' call' calls
-              _ -> do
-                withStore' $ \db -> deleteCalls db user ctId'
-                atomically $ TM.delete ctId' calls
-            forM_ aciContent_ $ \aciContent ->
-              updateDirectChatItemView user ct chatItemId aciContent False $ Just msgId
+              (call_, aciContent_) <- action call
+              case call_ of
+                Just call' -> do
+                  unless (isRcvInvitation call') $ withStore' $ \db -> deleteCalls db user ctId'
+                  atomically $ TM.insert ctId' call' calls
+                _ -> do
+                  withStore' $ \db -> deleteCalls db user ctId'
+                  atomically $ TM.delete ctId' calls
+              forM_ aciContent_ $ \aciContent ->
+                updateDirectChatItemView user ct chatItemId aciContent False $ Just msgId

    msgCallStateError :: Text -> Call -> m ()
    msgCallStateError eventName Call {callState} =
@@ -4908,8 +4907,8 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
    suffixOrd displayName localDisplayName
      | localDisplayName == displayName = Just 0
      | otherwise = case T.stripPrefix (displayName <> "_") localDisplayName of
-        Just suffix -> readMaybe $ T.unpack suffix
-        Nothing -> Nothing
+          Just suffix -> readMaybe $ T.unpack suffix
+          Nothing -> Nothing

    associateMemberWithContact :: Contact -> GroupMember -> m Contact
    associateMemberWithContact c1 m2@GroupMember {groupId} = do
@@ -5009,7 +5008,7 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
      withStore' $ \db -> saveMemberInvitation db toMember introInv
      subMode <- chatReadVar subscriptionMode
      -- [incognito] send membership incognito profile, create direct connection as incognito
-      dm <- directMessage $ XGrpMemInfo (memberId (membership :: GroupMember)) (fromLocalProfile $ memberProfile membership)
+      dm <- directMessage $ XGrpMemInfo membership.memberId (fromLocalProfile $ memberProfile membership)
      -- [async agent commands] no continuation needed, but commands should be asynchronous for stability
      groupConnIds <- joinAgentConnectionAsync user (chatHasNtfs chatSettings) groupConnReq dm subMode
      directConnIds <- forM directConnReq $ \dcr -> joinAgentConnectionAsync user True dcr dm subMode
@@ -5019,21 +5018,21 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do

    xGrpMemRole :: GroupInfo -> GroupMember -> MemberId -> GroupMemberRole -> RcvMessage -> UTCTime -> m ()
    xGrpMemRole gInfo@GroupInfo {membership} m@GroupMember {memberRole = senderRole} memId memRole msg brokerTs
-      | memberId (membership :: GroupMember) == memId =
-        let gInfo' = gInfo {membership = membership {memberRole = memRole}}
-         in changeMemberRole gInfo' membership $ RGEUserRole memRole
+      | membership.memberId == memId =
+          let gInfo' = gInfo {membership = membership {memberRole = memRole}}
+           in changeMemberRole gInfo' membership $ RGEUserRole memRole
      | otherwise =
-        withStore' (\db -> runExceptT $ getGroupMemberByMemberId db user gInfo memId) >>= \case
-          Right member -> changeMemberRole gInfo member $ RGEMemberRole (groupMemberId' member) (fromLocalProfile $ memberProfile member) memRole
-          Left _ -> messageError "x.grp.mem.role with unknown member ID"
+          withStore' (\db -> runExceptT $ getGroupMemberByMemberId db user gInfo memId) >>= \case
+            Right member -> changeMemberRole gInfo member $ RGEMemberRole (groupMemberId' member) (fromLocalProfile $ memberProfile member) memRole
+            Left _ -> messageError "x.grp.mem.role with unknown member ID"
      where
        changeMemberRole gInfo' member@GroupMember {memberRole = fromRole} gEvent
          | senderRole < GRAdmin || senderRole < fromRole = messageError "x.grp.mem.role with insufficient member permissions"
          | otherwise = do
-            withStore' $ \db -> updateGroupMemberRole db user member memRole
-            ci <- saveRcvChatItem user (CDGroupRcv gInfo m) msg brokerTs (CIRcvGroupEvent gEvent)
-            groupMsgToView gInfo ci
-            toView CRMemberRole {user, groupInfo = gInfo', byMember = m, member = member {memberRole = memRole}, fromRole, toRole = memRole}
+              withStore' $ \db -> updateGroupMemberRole db user member memRole
+              ci <- saveRcvChatItem user (CDGroupRcv gInfo m) msg brokerTs (CIRcvGroupEvent gEvent)
+              groupMsgToView gInfo ci
+              toView CRMemberRole {user, groupInfo = gInfo', byMember = m, member = member {memberRole = memRole}, fromRole, toRole = memRole}

    checkHostRole :: GroupMember -> GroupMemberRole -> m ()
    checkHostRole GroupMember {memberRole, localDisplayName} memRole =
@@ -5080,7 +5079,7 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do

    xGrpMemDel :: GroupInfo -> GroupMember -> MemberId -> RcvMessage -> UTCTime -> m ()
    xGrpMemDel gInfo@GroupInfo {membership} m@GroupMember {memberRole = senderRole} memId msg brokerTs = do
-      if memberId (membership :: GroupMember) == memId
+      if membership.memberId == memId
        then checkRole membership $ do
          deleteGroupLinkIfExists user gInfo
          -- member records are not deleted to keep history
@@ -5103,7 +5102,7 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
      where
        checkRole GroupMember {memberRole} a
          | senderRole < GRAdmin || senderRole < memberRole =
-            messageError "x.grp.mem.del with insufficient member permissions"
+              messageError "x.grp.mem.del with insufficient member permissions"
          | otherwise = a
        deleteMemberItem gEvent = do
          ci <- saveRcvChatItem user (CDGroupRcv gInfo m) msg brokerTs (CIRcvGroupEvent gEvent)
@@ -5135,13 +5134,13 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
    xGrpInfo g@GroupInfo {groupProfile = p} m@GroupMember {memberRole} p' msg brokerTs
      | memberRole < GROwner = messageError "x.grp.info with insufficient member permissions"
      | otherwise = unless (p == p') $ do
-        g' <- withStore $ \db -> updateGroupProfile db user g p'
-        toView $ CRGroupUpdated user g g' (Just m)
-        let cd = CDGroupRcv g' m
-        unless (sameGroupProfileInfo p p') $ do
-          ci <- saveRcvChatItem user cd msg brokerTs (CIRcvGroupEvent $ RGEGroupUpdated p')
-          groupMsgToView g' ci
-        createGroupFeatureChangedItems user cd CIRcvGroupFeature g g'
+          g' <- withStore $ \db -> updateGroupProfile db user g p'
+          toView $ CRGroupUpdated user g g' (Just m)
+          let cd = CDGroupRcv g' m
+          unless (sameGroupProfileInfo p p') $ do
+            ci <- saveRcvChatItem user cd msg brokerTs (CIRcvGroupEvent $ RGEGroupUpdated p')
+            groupMsgToView g' ci
+          createGroupFeatureChangedItems user cd CIRcvGroupFeature g g'

    xGrpDirectInv :: GroupInfo -> GroupMember -> Connection -> ConnReqInvitation -> Maybe MsgContent -> RcvMessage -> UTCTime -> m ()
    xGrpDirectInv g m mConn connReq mContent_ msg brokerTs = do
@@ -5192,8 +5191,8 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
      createInternalChatItem user (CDDirectRcv ct) (CIRcvConnEvent RCEVerificationCodeReset) Nothing

    xGrpMsgForward :: GroupInfo -> GroupMember -> MemberId -> ChatMessage 'Json -> UTCTime -> m ()
-    xGrpMsgForward gInfo@GroupInfo {groupId} m@GroupMember {memberRole, localDisplayName} memberId msg msgTs = do
-      when (memberRole < GRAdmin) $ throwChatError (CEGroupContactRole localDisplayName)
+    xGrpMsgForward gInfo@GroupInfo {groupId} m memberId msg msgTs = do
+      when (m.memberRole < GRAdmin) $ throwChatError (CEGroupContactRole m.localDisplayName)
      author <- withStore $ \db -> getGroupMemberByMemberId db user gInfo memberId
      processForwardedMsg author msg
      where
@@ -5239,8 +5238,8 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
        Just (CChatItem SMDSnd ChatItem {meta = CIMeta {itemId, itemStatus}})
          | itemStatus == newStatus -> pure ()
          | otherwise -> do
-            chatItem <- withStore $ \db -> updateDirectChatItemStatus db user ct itemId newStatus
-            toView $ CRChatItemStatusUpdated user (AChatItem SCTDirect SMDSnd (DirectChat ct) chatItem)
+              chatItem <- withStore $ \db -> updateDirectChatItemStatus db user ct itemId newStatus
+              toView $ CRChatItemStatusUpdated user (AChatItem SCTDirect SMDSnd (DirectChat ct) chatItem)
        _ -> pure ()

    updateGroupMemSndStatus :: ChatItemId -> GroupMemberId -> CIStatus 'MDSnd -> m Bool
@@ -5368,7 +5367,7 @@ parseFileChunk :: ChatMonad m => ByteString -> m FileChunk
 parseFileChunk = liftEither . first (ChatError . CEFileRcvChunk) . smpDecode

 appendFileChunk :: forall m. ChatMonad m => RcvFileTransfer -> Integer -> ByteString -> Bool -> m ()
-appendFileChunk ft@RcvFileTransfer {fileId, fileInvitation, fileStatus, cryptoArgs} chunkNo chunk final =
+appendFileChunk ft@RcvFileTransfer {fileId, fileStatus, cryptoArgs} chunkNo chunk final =
  case fileStatus of
    RFSConnected RcvFileInfo {filePath} -> append_ filePath
    -- sometimes update of file transfer status to FSConnected
@@ -5386,7 +5385,7 @@ appendFileChunk ft@RcvFileTransfer {fileId, fileInvitation, fileStatus, cryptoAr
      when final $ do
        closeFileHandle fileId rcvFiles
        forM_ cryptoArgs $ \cfArgs -> do
-          tmpFile <- getChatTempDirectory >>= (`uniqueCombine` fileName (fileInvitation :: FileInvitation))
+          tmpFile <- getChatTempDirectory >>= (`uniqueCombine` ft.fileInvitation.fileName)
          tryChatError (liftError encryptErr $ encryptFile fsFilePath tmpFile cfArgs) >>= \case
            Right () -> do
              removeFile fsFilePath `catchChatError` \_ -> pure ()
@@ -5543,21 +5542,21 @@ sendGroupMessage' user members chatMsgEvent groupId introId_ postDeliver = do
      Just conn@Connection {connStatus}
        | connDisabled conn || connStatus == ConnDeleted -> pure Nothing
        | connStatus == ConnSndReady || connStatus == ConnReady -> do
-          let tag = toCMEventTag chatMsgEvent
-          deliverMessage conn tag msgBody msgId >> postDeliver
-          pure $ Just m
+            let tag = toCMEventTag chatMsgEvent
+            deliverMessage conn tag msgBody msgId >> postDeliver
+            pure $ Just m
        | otherwise -> pendingOrForwarded
      where
        pendingOrForwarded
          | forwardSupported && isForwardedGroupMsg chatMsgEvent = pure Nothing
          | isXGrpMsgForward chatMsgEvent = pure Nothing
          | otherwise = do
-            withStore' $ \db -> createPendingGroupMessage db groupMemberId msgId introId_
-            pure $ Just m
+              withStore' $ \db -> createPendingGroupMessage db groupMemberId msgId introId_
+              pure $ Just m
        forwardSupported = do
          let mcvr = memberChatVRange' m
          isCompatibleRange mcvr groupForwardVRange && invitingMemberSupportsForward
-        invitingMemberSupportsForward = case invitedByGroupMemberId m of
+        invitingMemberSupportsForward = case m.invitedByGroupMemberId of
          Just invMemberId ->
            -- can be optimized for large groups by replacing [GroupMember] with Map GroupMemberId GroupMember
            case find (\m' -> groupMemberId' m' == invMemberId) members of
@@ -5611,14 +5610,14 @@ saveGroupRcvMsg user groupId authorMember conn@Connection {connId} agentMsgMeta
  let agentMsgId = fst $ recipient agentMsgMeta
      newMsg = NewMessage {chatMsgEvent, msgBody}
      rcvMsgDelivery = RcvMsgDelivery {connId, agentMsgId, agentMsgMeta, agentAckCmdId}
-      amId = Just $ groupMemberId' am'
+      amId = Just am'.groupMemberId
  msg <-
    withStore (\db -> createNewMessageAndRcvMsgDelivery db (GroupId groupId) newMsg sharedMsgId_ rcvMsgDelivery amId)
      `catchChatError` \e -> case e of
        ChatErrorStore (SEDuplicateGroupMessage _ _ _ (Just forwardedByGroupMemberId)) -> do
          fm <- withStore $ \db -> getGroupMember db user groupId forwardedByGroupMemberId
          forM_ (memberConn fm) $ \fmConn ->
-            void $ sendDirectMessage fmConn (XGrpMemCon $ memberId (am' :: GroupMember)) (GroupId groupId)
+            void $ sendDirectMessage fmConn (XGrpMemCon am'.memberId) (GroupId groupId)
          throwError e
        _ -> throwError e
  pure (am', conn', msg)
@@ -5632,9 +5631,9 @@ saveGroupFwdRcvMsg user groupId forwardingMember refAuthorMember msgBody ChatMes
    `catchChatError` \e -> case e of
      ChatErrorStore (SEDuplicateGroupMessage _ _ (Just authorGroupMemberId) Nothing) -> do
        am <- withStore $ \db -> getGroupMember db user groupId authorGroupMemberId
-        if sameMemberId (memberId (refAuthorMember :: GroupMember)) am
+        if sameMemberId refAuthorMember.memberId am
          then forM_ (memberConn forwardingMember) $ \fmConn ->
-            void $ sendDirectMessage fmConn (XGrpMemCon $ memberId (am :: GroupMember)) (GroupId groupId)
+            void $ sendDirectMessage fmConn (XGrpMemCon am.memberId) (GroupId groupId)
          else toView $ CRMessageError user "error" "saveGroupFwdRcvMsg: referenced author member id doesn't match message member id"
        throwError e
      _ -> throwError e
@@ -5780,7 +5779,7 @@ createSndFeatureItems :: forall m. ChatMonad m => User -> Contact -> Contact ->
 createSndFeatureItems user ct ct' =
  createFeatureItems user ct ct' CDDirectSnd CISndChatFeature CISndChatPreference getPref
  where
-    getPref = (preference :: ContactUserPref (FeaturePreference f) -> FeaturePreference f) . userPreference
+    getPref u = (userPreference u).preference

 type FeatureContent a d = ChatFeature -> a -> Maybe Int -> CIContent d

@@ -5864,7 +5863,7 @@ getCreateActiveUser st testView = do
            Right user -> pure user
    selectUser :: [User] -> IO User
    selectUser [user] = do
-      withTransaction st (`setActiveUser` userId (user :: User))
+      withTransaction st (`setActiveUser` user.userId)
      pure user
    selectUser users = do
      putStrLn "Select user profile:"
@@ -5878,9 +5877,9 @@ getCreateActiveUser st testView = do
            Just n
              | n <= 0 || n > length users -> putStrLn "invalid user number" >> loop
              | otherwise -> do
-                let user = users !! (n - 1)
-                withTransaction st (`setActiveUser` userId (user :: User))
-                pure user
+                  let user = users !! (n - 1)
+                  withTransaction st (`setActiveUser` user.userId)
+                  pure user
    userStr :: User -> String
    userStr User {localDisplayName, profile = LocalProfile {fullName}} =
      T.unpack $ localDisplayName <> if T.null fullName || localDisplayName == fullName then "" else " (" <> fullName <> ")"
@@ -5889,10 +5888,10 @@ getCreateActiveUser st testView = do
      displayName <- getWithPrompt "display name"
      let validName = mkValidName displayName
      if
-          | null displayName -> putStrLn "display name can't be empty" >> getContactName
-          | null validName -> putStrLn "display name is invalid, please choose another" >> getContactName
-          | displayName /= validName -> putStrLn ("display name is invalid, you could use this one: " <> validName) >> getContactName
-          | otherwise -> pure $ T.pack displayName
+        | null displayName -> putStrLn "display name can't be empty" >> getContactName
+        | null validName -> putStrLn "display name is invalid, please choose another" >> getContactName
+        | displayName /= validName -> putStrLn ("display name is invalid, you could use this one: " <> validName) >> getContactName
+        | otherwise -> pure $ T.pack displayName
    getWithPrompt :: String -> IO String
    getWithPrompt s = putStr (s <> ": ") >> hFlush stdout >> getLine

@@ -9,7 +9,6 @@ module Simplex.Chat.Bot where
 import Control.Concurrent.Async
 import Control.Concurrent.STM
 import Control.Monad
-import Control.Monad.Reader
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Text as T
 import Simplex.Chat.Controller
@@ -5,6 +5,7 @@
 {-# LANGUAGE KindSignatures #-}
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE NamedFieldPuns #-}
+{-# LANGUAGE OverloadedRecordDot #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE StandaloneDeriving #-}
@@ -343,7 +344,7 @@ contactTimedTTL Contact {mergedPreferences = ContactUserPreferences {timedMessag
  | forUser enabled && forContact enabled = Just ttl
  | otherwise = Nothing
  where
-    TimedMessagesPreference {ttl} = preference (userPreference :: ContactUserPref TimedMessagesPreference)
+    TimedMessagesPreference {ttl} = userPreference.preference

 groupTimedTTL :: GroupInfo -> Maybe (Maybe Int)
 groupTimedTTL GroupInfo {fullGroupPreferences = FullGroupPreferences {timedMessages = TimedMessagesGroupPreference {enable, ttl}}}
@@ -189,7 +189,6 @@ mobileChatOpts dbFilePrefix dbKey =
      allowInstantFiles = True,
      autoAcceptFileSize = 0,
      muteNotifications = True,
-      markRead = False,
      maintenance = True
    }

@@ -16,12 +16,12 @@ type JSONByteString = LB.ByteString
 getByteString :: Ptr Word8 -> CInt -> IO ByteString
 getByteString ptr len = do
  fp <- newForeignPtr_ ptr
-  pure $ PS fp 0 $ fromIntegral len
+  pure $ BS fp $ fromIntegral len
 {-# INLINE getByteString #-}

 putByteString :: Ptr Word8 -> ByteString -> IO ()
-putByteString ptr (PS fp offset len) =
-  withForeignPtr fp $ \p -> memcpy ptr (p `plusPtr` offset) len
+putByteString ptr (BS fp len) =
+  withForeignPtr fp $ \p -> memcpy ptr p len
 {-# INLINE putByteString #-}

 putLazyByteString :: Ptr Word8 -> LB.ByteString -> IO ()
@@ -42,7 +42,6 @@ data ChatOpts = ChatOpts
    allowInstantFiles :: Bool,
    autoAcceptFileSize :: Integer,
    muteNotifications :: Bool,
-    markRead :: Bool,
    maintenance :: Bool
  }

@@ -269,12 +268,6 @@ chatOptsP appDir defaultDbFileName = do
      ( long "mute"
          <> help "Mute notifications"
      )
-  markRead <-
-    switch
-      ( long "mark-read"
-          <> short 'r'
-          <> help "Mark shown messages as read"
-      )
  maintenance <-
    switch
      ( long "maintenance"
@@ -293,7 +286,6 @@ chatOptsP appDir defaultDbFileName = do
        allowInstantFiles,
        autoAcceptFileSize,
        muteNotifications,
-        markRead,
        maintenance
      }

@@ -2,6 +2,7 @@
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE NamedFieldPuns #-}
+{-# LANGUAGE OverloadedRecordDot #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE QuasiQuotes #-}
 {-# LANGUAGE ScopedTypeVariables #-}
@@ -479,7 +480,7 @@ createOrUpdateContactRequest db user@User {userId} userContactLinkId invId (Vers
        ExceptT $
          maybeM getContactRequestByXContactId xContactId_ >>= \case
            Nothing -> createContactRequest
-            Just cr -> updateContactRequest cr $> Right (contactRequestId (cr :: UserContactRequest))
+            Just cr -> updateContactRequest cr $> Right cr.contactRequestId
      getContactRequest db user cReqId
    createContactRequest :: IO (Either StoreError Int64)
    createContactRequest = do
@@ -2,6 +2,7 @@
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE NamedFieldPuns #-}
+{-# LANGUAGE OverloadedRecordDot #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE QuasiQuotes #-}
 {-# LANGUAGE ScopedTypeVariables #-}
@@ -490,7 +491,7 @@ createRcvFileTransfer :: DB.Connection -> UserId -> Contact -> FileInvitation ->
 createRcvFileTransfer db userId Contact {contactId, localDisplayName = c} f@FileInvitation {fileName, fileSize, fileConnReq, fileInline, fileDescr} rcvFileInline chunkSize = do
  currentTs <- liftIO getCurrentTime
  rfd_ <- mapM (createRcvFD_ db userId currentTs) fileDescr
-  let rfdId = (fileDescrId :: RcvFileDescr -> Int64) <$> rfd_
+  let rfdId = (\RcvFileDescr {fileDescrId} -> fileDescrId) <$> rfd_
      -- cryptoArgs = Nothing here, the decision to encrypt is made when receiving it
      xftpRcvFile = (\rfd -> XFTPRcvFile {rcvFileDescription = rfd, agentRcvFileId = Nothing, agentRcvFileDeleted = False}) <$> rfd_
      fileProtocol = if isJust rfd_ then FPXFTP else FPSMP
@@ -511,7 +512,7 @@ createRcvGroupFileTransfer :: DB.Connection -> UserId -> GroupMember -> FileInvi
 createRcvGroupFileTransfer db userId GroupMember {groupId, groupMemberId, localDisplayName = c} f@FileInvitation {fileName, fileSize, fileConnReq, fileInline, fileDescr} rcvFileInline chunkSize = do
  currentTs <- liftIO getCurrentTime
  rfd_ <- mapM (createRcvFD_ db userId currentTs) fileDescr
-  let rfdId = (fileDescrId :: RcvFileDescr -> Int64) <$> rfd_
+  let rfdId = (\RcvFileDescr {fileDescrId} -> fileDescrId) <$> rfd_
      -- cryptoArgs = Nothing here, the decision to encrypt is made when receiving it
      xftpRcvFile = (\rfd -> XFTPRcvFile {rcvFileDescription = rfd, agentRcvFileId = Nothing, agentRcvFileDeleted = False}) <$> rfd_
      fileProtocol = if isJust rfd_ then FPXFTP else FPSMP
@@ -906,7 +907,7 @@ getLocalCryptoFile db userId fileId sent =
    _ -> do
      unless sent $ throwError $ SEFileNotFound fileId
      FileTransferMeta {filePath, xftpSndFile} <- getFileTransferMeta_ db userId fileId
-      pure $ CryptoFile filePath $ xftpSndFile >>= \XFTPSndFile {cryptoArgs} -> cryptoArgs
+      pure $ CryptoFile filePath $ xftpSndFile >>= \f -> f.cryptoArgs

 updateDirectCIFileStatus :: forall d. MsgDirectionI d => DB.Connection -> User -> Int64 -> CIFileStatus d -> ExceptT StoreError IO AChatItem
 updateDirectCIFileStatus db user fileId fileStatus = do
@@ -2,6 +2,7 @@
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE NamedFieldPuns #-}
+{-# LANGUAGE OverloadedRecordDot #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE QuasiQuotes #-}
 {-# LANGUAGE RecordWildCards #-}
@@ -357,7 +358,7 @@ createGroupInvitation db user@User {userId} contact@Contact {contactId, activeCo
              "INSERT INTO groups (group_profile_id, local_display_name, inv_queue_info, host_conn_custom_user_profile_id, user_id, enable_ntfs, created_at, updated_at, chat_ts) VALUES (?,?,?,?,?,?,?,?,?)"
              (profileId, localDisplayName, connRequest, customUserProfileId, userId, True, currentTs, currentTs, currentTs)
            insertedRowId db
-          let JVersionRange hostVRange = peerChatVRange hostConn
+          let JVersionRange hostVRange = hostConn.peerChatVRange
          GroupMember {groupMemberId} <- createContactMemberInv_ db user groupId Nothing contact fromMember GCHostMember GSMemInvited IBUnknown Nothing currentTs hostVRange
          membership <- createContactMemberInv_ db user groupId (Just groupMemberId) user invitedMember GCUserMember GSMemInvited (IBContact contactId) incognitoProfileId currentTs supportedChatVRange
          let chatSettings = ChatSettings {enableNtfs = MFAll, sendRcpts = Nothing, favorite = False}
@@ -1054,7 +1055,7 @@ saveIntroInvitation db reMember toMember introInv = do
        WHERE group_member_intro_id = :intro_id
      |]
      [ ":intro_status" := GMIntroInvReceived,
-        ":group_queue_info" := groupConnReq (introInv :: IntroInvitation),
+        ":group_queue_info" := introInv.groupConnReq,
        ":direct_queue_info" := directConnReq introInv,
        ":updated_at" := currentTs,
        ":intro_id" := introId intro
@@ -1162,7 +1163,7 @@ createIntroReMember db user@User {userId} gInfo@GroupInfo {groupId} _host@GroupM

 createIntroToMemberContact :: DB.Connection -> User -> GroupMember -> GroupMember -> VersionRange -> (CommandId, ConnId) -> Maybe (CommandId, ConnId) -> Maybe ProfileId -> SubscriptionMode -> IO ()
 createIntroToMemberContact db user@User {userId} GroupMember {memberContactId = viaContactId, activeConn} _to@GroupMember {groupMemberId, localDisplayName} mcvr (groupCmdId, groupAgentConnId) directConnIds customUserProfileId subMode = do
-  let cLevel = 1 + maybe 0 (connLevel :: Connection -> Int) activeConn
+  let cLevel = 1 + maybe 0 (\Connection {connLevel} -> connLevel) activeConn
  currentTs <- getCurrentTime
  Connection {connId = groupConnId} <- createMemberConnection_ db userId groupMemberId groupAgentConnId mcvr viaContactId cLevel currentTs subMode
  setCommandConnId db user groupCmdId groupConnId
@@ -296,7 +296,7 @@ getUserContactProfiles db User {userId} =
      |]
      (Only userId)
  where
-    toContactProfile :: (ContactName, Text, Maybe ImageData, Maybe ConnReqContact, Maybe Preferences) -> (Profile)
+    toContactProfile :: (ContactName, Text, Maybe ImageData, Maybe ConnReqContact, Maybe Preferences) -> Profile
    toContactProfile (displayName, fullName, image, contactLink, preferences) = Profile {displayName, fullName, image, contactLink, preferences}

 createUserContactLink :: DB.Connection -> User -> ConnId -> ConnReqContact -> SubscriptionMode -> ExceptT StoreError IO ()
@@ -44,7 +44,7 @@ simplexChatTerminal cfg opts t =
  handle checkDBKeyError . simplexChatCore cfg opts $ \u cc -> do
    ct <- newChatTerminal t opts
    when (firstTime cc) . printToTerminal ct $ chatWelcome u
-    runChatTerminal ct cc opts
+    runChatTerminal ct cc

 checkDBKeyError :: SQLError -> IO ()
 checkDBKeyError e = case sqlError e of
@@ -53,5 +53,5 @@ checkDBKeyError e = case sqlError e of
    exitFailure
  _ -> throwIO e

-runChatTerminal :: ChatTerminal -> ChatController -> ChatOpts -> IO ()
-runChatTerminal ct cc opts = raceAny_ [runTerminalInput ct cc, runTerminalOutput ct cc opts, runInputLoop ct cc]
+runChatTerminal :: ChatTerminal -> ChatController -> IO ()
+runChatTerminal ct cc = raceAny_ [runTerminalInput ct cc, runTerminalOutput ct cc, runInputLoop ct cc]
@@ -142,13 +142,13 @@ withTermLock ChatTerminal {termLock} action = do
  action
  atomically $ putTMVar termLock ()

-runTerminalOutput :: ChatTerminal -> ChatController -> ChatOpts -> IO ()
-runTerminalOutput ct cc@ChatController {outputQ, showLiveItems, logFilePath} ChatOpts {markRead} = do
+runTerminalOutput :: ChatTerminal -> ChatController -> IO ()
+runTerminalOutput ct cc@ChatController {outputQ, showLiveItems, logFilePath} = do
  forever $ do
    (_, outputRH, r) <- atomically $ readTBQueue outputQ
    case r of
-      CRNewChatItem u ci -> when markRead $ markChatItemRead u ci
-      CRChatItemUpdated u ci -> when markRead $ markChatItemRead u ci
+      CRNewChatItem u ci -> markChatItemRead u ci
+      CRChatItemUpdated u ci -> markChatItemRead u ci
      CRRemoteHostConnected {remoteHost = RemoteHostInfo {remoteHostId}} -> getRemoteUser remoteHostId
      CRRemoteHostStopped {remoteHostId_} -> mapM_ removeRemoteUser remoteHostId_
      _ -> pure ()
@@ -9,6 +9,7 @@
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE NamedFieldPuns #-}
+{-# LANGUAGE OverloadedRecordDot #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE PatternSynonyms #-}
 {-# LANGUAGE ScopedTypeVariables #-}
@@ -60,21 +61,21 @@ class IsContact a where
  preferences' :: a -> Maybe Preferences

 instance IsContact User where
-  contactId' = userContactId
+  contactId' u = u.userContactId
  {-# INLINE contactId' #-}
-  profile' = profile
+  profile' u = u.profile
  {-# INLINE profile' #-}
-  localDisplayName' = localDisplayName
+  localDisplayName' u = u.localDisplayName
  {-# INLINE localDisplayName' #-}
  preferences' User {profile = LocalProfile {preferences}} = preferences
  {-# INLINE preferences' #-}

 instance IsContact Contact where
-  contactId' = contactId
+  contactId' c = c.contactId
  {-# INLINE contactId' #-}
-  profile' = profile
+  profile' c = c.profile
  {-# INLINE profile' #-}
-  localDisplayName' = localDisplayName
+  localDisplayName' c = c.localDisplayName
  {-# INLINE localDisplayName' #-}
  preferences' Contact {profile = LocalProfile {preferences}} = preferences
  {-# INLINE preferences' #-}
@@ -194,7 +195,7 @@ directOrUsed ct@Contact {contactUsed} =
  contactDirect ct || contactUsed

 anyDirectOrUsed :: Contact -> Bool
-anyDirectOrUsed Contact {contactUsed, activeConn} = ((\Connection {connLevel} -> connLevel) <$> activeConn) == Just 0 || contactUsed
+anyDirectOrUsed Contact {contactUsed, activeConn} = ((\c -> c.connLevel) <$> activeConn) == Just 0 || contactUsed

 contactReady :: Contact -> Bool
 contactReady Contact {activeConn} = maybe False connReady activeConn
@@ -7,6 +7,7 @@
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE NamedFieldPuns #-}
+{-# LANGUAGE OverloadedRecordDot #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE StandaloneDeriving #-}
@@ -14,6 +15,7 @@
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE TypeFamilyDependencies #-}
 {-# OPTIONS_GHC -Wno-unrecognised-pragmas #-}
+{-# OPTIONS_GHC -fno-warn-ambiguous-fields #-}

 {-# HLINT ignore "Use newtype instead of data" #-}

@@ -77,12 +79,12 @@ allChatFeatures =
  ]

 chatPrefSel :: SChatFeature f -> Preferences -> Maybe (FeaturePreference f)
-chatPrefSel = \case
-  SCFTimedMessages -> timedMessages
-  SCFFullDelete -> fullDelete
-  SCFReactions -> reactions
-  SCFVoice -> voice
-  SCFCalls -> calls
+chatPrefSel f ps = case f of
+  SCFTimedMessages -> ps.timedMessages
+  SCFFullDelete -> ps.fullDelete
+  SCFReactions -> ps.reactions
+  SCFVoice -> ps.voice
+  SCFCalls -> ps.calls

 chatFeature :: SChatFeature f -> ChatFeature
 chatFeature = \case
@@ -102,12 +104,12 @@ instance PreferenceI (Maybe Preferences) where
  getPreference f prefs = fromMaybe (getPreference f defaultChatPrefs) (chatPrefSel f =<< prefs)

 instance PreferenceI FullPreferences where
-  getPreference = \case
-    SCFTimedMessages -> timedMessages
-    SCFFullDelete -> fullDelete
-    SCFReactions -> reactions
-    SCFVoice -> voice
-    SCFCalls -> calls
+  getPreference f ps = case f of
+    SCFTimedMessages -> ps.timedMessages
+    SCFFullDelete -> ps.fullDelete
+    SCFReactions -> ps.reactions
+    SCFVoice -> ps.voice
+    SCFCalls -> ps.calls
  {-# INLINE getPreference #-}

 setPreference :: forall f. FeatureI f => SChatFeature f -> Maybe FeatureAllowed -> Maybe Preferences -> Preferences
@@ -190,13 +192,13 @@ allGroupFeatures =
  ]

 groupPrefSel :: SGroupFeature f -> GroupPreferences -> Maybe (GroupFeaturePreference f)
-groupPrefSel = \case
-  SGFTimedMessages -> timedMessages
-  SGFDirectMessages -> directMessages
-  SGFFullDelete -> fullDelete
-  SGFReactions -> reactions
-  SGFVoice -> voice
-  SGFFiles -> files
+groupPrefSel f ps = case f of
+  SGFTimedMessages -> ps.timedMessages
+  SGFDirectMessages -> ps.directMessages
+  SGFFullDelete -> ps.fullDelete
+  SGFReactions -> ps.reactions
+  SGFVoice -> ps.voice
+  SGFFiles -> ps.files

 toGroupFeature :: SGroupFeature f -> GroupFeature
 toGroupFeature = \case
@@ -217,13 +219,13 @@ instance GroupPreferenceI (Maybe GroupPreferences) where
  getGroupPreference pt prefs = fromMaybe (getGroupPreference pt defaultGroupPrefs) (groupPrefSel pt =<< prefs)

 instance GroupPreferenceI FullGroupPreferences where
-  getGroupPreference = \case
-    SGFTimedMessages -> timedMessages
-    SGFDirectMessages -> directMessages
-    SGFFullDelete -> fullDelete
-    SGFReactions -> reactions
-    SGFVoice -> voice
-    SGFFiles -> files
+  getGroupPreference f ps = case f of
+    SGFTimedMessages -> ps.timedMessages
+    SGFDirectMessages -> ps.directMessages
+    SGFFullDelete -> ps.fullDelete
+    SGFReactions -> ps.reactions
+    SGFVoice -> ps.voice
+    SGFFiles -> ps.files
  {-# INLINE getGroupPreference #-}

 -- collection of optional group preferences
@@ -369,19 +371,19 @@ class (Eq (FeaturePreference f), HasField "allow" (FeaturePreference f) FeatureA
  prefParam :: FeaturePreference f -> Maybe Int

 instance HasField "allow" TimedMessagesPreference FeatureAllowed where
-  hasField p = (\allow -> p {allow}, allow (p :: TimedMessagesPreference))
+  hasField p = (\allow -> p {allow}, p.allow)

 instance HasField "allow" FullDeletePreference FeatureAllowed where
-  hasField p = (\allow -> p {allow}, allow (p :: FullDeletePreference))
+  hasField p = (\allow -> p {allow}, p.allow)

 instance HasField "allow" ReactionsPreference FeatureAllowed where
-  hasField p = (\allow -> p {allow}, allow (p :: ReactionsPreference))
+  hasField p = (\allow -> p {allow}, p.allow)

 instance HasField "allow" VoicePreference FeatureAllowed where
-  hasField p = (\allow -> p {allow}, allow (p :: VoicePreference))
+  hasField p = (\allow -> p {allow}, p.allow)

 instance HasField "allow" CallsPreference FeatureAllowed where
-  hasField p = (\allow -> p {allow}, allow (p :: CallsPreference))
+  hasField p = (\allow -> p {allow}, p.allow)

 instance FeatureI 'CFTimedMessages where
  type FeaturePreference 'CFTimedMessages = TimedMessagesPreference
@@ -444,25 +446,25 @@ class (Eq (GroupFeaturePreference f), HasField "enable" (GroupFeaturePreference
  groupPrefParam :: GroupFeaturePreference f -> Maybe Int

 instance HasField "enable" GroupPreference GroupFeatureEnabled where
-  hasField p = (\enable -> p {enable}, enable (p :: GroupPreference))
+  hasField p = (\enable -> p {enable}, p.enable)

 instance HasField "enable" TimedMessagesGroupPreference GroupFeatureEnabled where
-  hasField p = (\enable -> p {enable}, enable (p :: TimedMessagesGroupPreference))
+  hasField p = (\enable -> p {enable}, p.enable)

 instance HasField "enable" DirectMessagesGroupPreference GroupFeatureEnabled where
-  hasField p = (\enable -> p {enable}, enable (p :: DirectMessagesGroupPreference))
+  hasField p = (\enable -> p {enable}, p.enable)

 instance HasField "enable" ReactionsGroupPreference GroupFeatureEnabled where
-  hasField p = (\enable -> p {enable}, enable (p :: ReactionsGroupPreference))
+  hasField p = (\enable -> p {enable}, p.enable)

 instance HasField "enable" FullDeleteGroupPreference GroupFeatureEnabled where
-  hasField p = (\enable -> p {enable}, enable (p :: FullDeleteGroupPreference))
+  hasField p = (\enable -> p {enable}, p.enable)

 instance HasField "enable" VoiceGroupPreference GroupFeatureEnabled where
-  hasField p = (\enable -> p {enable}, enable (p :: VoiceGroupPreference))
+  hasField p = (\enable -> p {enable}, p.enable)

 instance HasField "enable" FilesGroupPreference GroupFeatureEnabled where
-  hasField p = (\enable -> p {enable}, enable (p :: FilesGroupPreference))
+  hasField p = (\enable -> p {enable}, p.enable)

 instance GroupFeatureI 'GFTimedMessages where
  type GroupFeaturePreference 'GFTimedMessages = TimedMessagesGroupPreference
@@ -693,12 +695,12 @@ preferenceState pref =
   in (allow, param)

 getContactUserPreference :: SChatFeature f -> ContactUserPreferences -> ContactUserPreference (FeaturePreference f)
-getContactUserPreference = \case
-  SCFTimedMessages -> timedMessages
-  SCFFullDelete -> fullDelete
-  SCFReactions -> reactions
-  SCFVoice -> voice
-  SCFCalls -> calls
+getContactUserPreference f ps = case f of
+  SCFTimedMessages -> ps.timedMessages
+  SCFFullDelete -> ps.fullDelete
+  SCFReactions -> ps.reactions
+  SCFVoice -> ps.voice
+  SCFCalls -> ps.calls

 $(J.deriveJSON (enumJSON $ dropPrefix "CF") ''ChatFeature)

@@ -3,6 +3,7 @@
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE NamedFieldPuns #-}
+{-# LANGUAGE OverloadedRecordDot #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE PatternSynonyms #-}
 {-# LANGUAGE ScopedTypeVariables #-}
@@ -211,7 +212,7 @@ responseToView hu@(currentRH, user_) ChatConfig {logLevel, showReactions, showRe
  CRContactConnecting u _ -> ttyUser u []
  CRContactConnected u ct userCustomProfile -> ttyUser u $ viewContactConnected ct userCustomProfile testView
  CRContactAnotherClient u c -> ttyUser u [ttyContact' c <> ": contact is connected to another client"]
-  CRSubscriptionEnd u acEntity -> ttyUser u [sShow (connId (entityConnection acEntity :: Connection)) <> ": END"]
+  CRSubscriptionEnd u acEntity -> ttyUser u [sShow ((entityConnection acEntity).connId) <> ": END"]
  CRContactsDisconnected srv cs -> [plain $ "server disconnected " <> showSMPServer srv <> " (" <> contactList cs <> ")"]
  CRContactsSubscribed srv cs -> [plain $ "server connected " <> showSMPServer srv <> " (" <> contactList cs <> ")"]
  CRContactSubError u c e -> ttyUser u [ttyContact' c <> ": contact error " <> sShow e]
@@ -489,7 +490,7 @@ viewGroupSubscribed :: GroupInfo -> [StyledString]
 viewGroupSubscribed g = [membershipIncognito g <> ttyFullGroup g <> ": connected to server(s)"]

 showSMPServer :: SMPServer -> String
-showSMPServer ProtocolServer {host} = B.unpack $ strEncode host
+showSMPServer srv = B.unpack $ strEncode srv.host

 viewHostEvent :: AProtocolType -> TransportHost -> String
 viewHostEvent p h = map toUpper (B.unpack $ strEncode p) <> " host " <> B.unpack (strEncode h)
@@ -948,7 +949,7 @@ viewGroupMembers (Group GroupInfo {membership} members) = map groupMember . filt
    removedOrLeft m = let s = memberStatus m in s == GSMemRemoved || s == GSMemLeft
    groupMember m = memIncognito m <> ttyFullMember m <> ": " <> plain (intercalate ", " $ [role m] <> category m <> status m <> muted m)
    role :: GroupMember -> String
-    role m = B.unpack . strEncode $ memberRole (m :: GroupMember)
+    role m = B.unpack . strEncode $ m.memberRole
    category m = case memberCategory m of
      GCUserMember -> ["you"]
      GCInviteeMember -> ["invited"]
@@ -986,7 +987,7 @@ viewGroupsList [] = ["you have no groups!", "to create: " <> highlight' "/g <nam
 viewGroupsList gs = map groupSS $ sortOn (ldn_ . fst) gs
  where
    ldn_ :: GroupInfo -> Text
-    ldn_ = T.toLower . (localDisplayName :: GroupInfo -> GroupName)
+    ldn_ g = T.toLower g.localDisplayName
    groupSS (g@GroupInfo {membership, chatSettings = ChatSettings {enableNtfs}}, GroupSummary {currentMembers}) =
      case memberStatus membership of
        GSMemInvited -> groupInvitation' g
@@ -1901,7 +1902,7 @@ viewChatError logLevel testView = \case
          "[" <> connEntityLabel entity <> ", userContactLinkId: " <> sShow userContactLinkId <> ", connId: " <> cId conn <> "] "
        Nothing -> ""
      cId :: Connection -> StyledString
-      cId conn = sShow (connId (conn :: Connection))
+      cId conn = sShow conn.connId
  ChatErrorRemoteCtrl e -> [plain $ "remote controller error: " <> show e]
  ChatErrorRemoteHost RHNew e -> [plain $ "new remote host error: " <> show e]
  ChatErrorRemoteHost (RHId rhId) e -> [plain $ "remote host " <> show rhId <> " error: " <> show e]
@@ -0,0 +1,96 @@
+# This file was automatically generated by 'stack init'
+#
+# Some commonly used options have been documented as comments in this file.
+# For advanced use and comprehensive documentation of the format, please see:
+# https://docs.haskellstack.org/en/stable/yaml_configuration/
+
+# Resolver to choose a 'specific' stackage snapshot or a compiler version.
+# A snapshot resolver dictates the compiler version and the set of packages
+# to be used for project dependencies. For example:
+#
+# resolver: lts-3.5
+# resolver: nightly-2015-09-21
+# resolver: ghc-7.10.2
+#
+# The location of a snapshot can be provided as a file or url. Stack assumes
+# a snapshot provided as a file might change, whereas a url resource does not.
+#
+# resolver: ./custom-snapshot.yaml
+# resolver: https://example.com/snapshots/2018-01-01.yaml
+resolver: lts-18.21
+
+# User packages to be built.
+# Various formats can be used as shown in the example below.
+#
+# packages:
+# - some-directory
+# - https://example.com/foo/bar/baz-0.0.2.tar.gz
+#   subdirs:
+#   - auto-update
+#   - wai
+packages:
+  - .
+# Dependency packages to be pulled from upstream that are not in the resolver.
+# These entries can reference officially published versions as well as
+# forks / in-progress versions pinned to a git hash. For example:
+#
+extra-deps:
+  - cryptostore-0.2.1.0@sha256:9896e2984f36a1c8790f057fd5ce3da4cbcaf8aa73eb2d9277916886978c5b19,3881
+  - network-3.1.2.7@sha256:e3d78b13db9512aeb106e44a334ab42b7aa48d26c097299084084cb8be5c5568,4888
+  - simple-logger-0.1.0@sha256:be8ede4bd251a9cac776533bae7fb643369ebd826eb948a9a18df1a8dd252ff8,1079
+  - tls-1.6.0@sha256:7ae39373fd2de27fb80e90f76d22aeeb9a074a0ddd120cbd02c9c52f516a9e55,6987
+  # below hackage dependencies are to update Aeson to 2.0.3
+  - OneTuple-0.3.1@sha256:a848c096c9d29e82ffdd30a9998aa2931cbccb3a1bc137539d80f6174d31603e,2262
+  - attoparsec-0.14.4@sha256:79584bdada8b730cb5138fca8c35c76fbef75fc1d1e01e6b1d815a5ee9843191,5810
+  - hashable-1.4.0.2@sha256:0cddd0229d1aac305ea0404409c0bbfab81f075817bd74b8b2929eff58333e55,5005
+  - semialign-1.2.0.1@sha256:0e179b4d3a8eff79001d374d6c91917c6221696b9620f0a4d86852fc6a9b9501,2836
+  - text-short-0.1.5@sha256:962c6228555debdc46f758d0317dea16e5240d01419b42966674b08a5c3d8fa6,3498
+  - time-compat-1.9.6.1@sha256:42d8f2e08e965e1718917d54ad69e1d06bd4b87d66c41dc7410f59313dba4ed1,5033
+  # - simplexmq-1.0.0@sha256:34b2004728ae396e3ae449cd090ba7410781e2b3cefc59259915f4ca5daa9ea8,8561
+  # - ../simplexmq
+  - github: simplex-chat/simplexmq
+    commit: 90a8fc91d35c578c3b52ad296a6f1df715da2278
+  - github: kazu-yamamoto/http2
+    commit: f5525b755ff2418e6e6ecc69e877363b0d0bcaeb
+  # - ../direct-sqlcipher
+  - github: simplex-chat/direct-sqlcipher
+    commit: f814ee68b16a9447fbb467ccc8f29bdd3546bfd9
+  # - ../sqlcipher-simple
+  - github: simplex-chat/sqlcipher-simple
+    commit: a46bd361a19376c5211f1058908fc0ae6bf42446
+  # - terminal-0.2.0.0@sha256:de6770ecaae3197c66ac1f0db5a80cf5a5b1d3b64a66a05b50f442de5ad39570,2977
+  - github: simplex-chat/aeson
+    commit: aab7b5a14d6c5ea64c64dcaee418de1bb00dcc2b
+  - github: simplex-chat/haskell-terminal
+    commit: f708b00009b54890172068f168bf98508ffcd495
+  - github: simplex-chat/android-support
+    commit: 9aa09f148089d6752ce563b14c2df1895718d806
+#
+# extra-deps: []
+
+# Override default flag values for local packages and extra-deps
+flags:
+  zip:
+    disable-bzip2: true
+    disable-zstd: true
+  direct-sqlcipher:
+    openssl: true
+# Extra package databases containing global packages
+# extra-package-dbs: []
+
+# Control whether we use the GHC we find on the path
+# system-ghc: true
+#
+# Require a specific version of stack, using version ranges
+# require-stack-version: -any # Default
+# require-stack-version: ">=2.1"
+#
+# Override the architecture used by stack, especially useful on Windows
+# arch: i386
+# arch: x86_64
+#
+# Extra directories used by stack for building
+# extra-lib-dirs: [/path/to/dir]
+#
+# Allow a newer minor version of GHC than the snapshot specifies
+# compiler-check: newer-minor
@@ -1,5 +1,6 @@
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE NamedFieldPuns #-}
+{-# LANGUAGE OverloadedRecordDot #-}
 {-# LANGUAGE OverloadedStrings #-}

 module Bots.BroadcastTests where
@@ -33,7 +34,7 @@ broadcastBotProfile = Profile {displayName = "broadcast_bot", fullName = "Broadc
 mkBotOpts :: FilePath -> [KnownContact] -> BroadcastBotOpts
 mkBotOpts tmp publishers =
  BroadcastBotOpts
-    { coreOptions = (coreOptions (testOpts :: ChatOpts)) {dbFilePrefix = tmp </> botDbPrefix},
+    { coreOptions = testOpts.coreOptions {dbFilePrefix = tmp </> botDbPrefix},
      publishers,
      welcomeMessage = defaultWelcomeMessage publishers,
      prohibitedMessage = defaultWelcomeMessage publishers
@@ -1,5 +1,6 @@
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE NamedFieldPuns #-}
+{-# LANGUAGE OverloadedRecordDot #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE PostfixOperators #-}

@@ -62,7 +63,7 @@ directoryProfile = Profile {displayName = "SimpleX-Directory", fullName = "", im
 mkDirectoryOpts :: FilePath -> [KnownContact] -> DirectoryOpts
 mkDirectoryOpts tmp superUsers =
  DirectoryOpts
-    { coreOptions = (coreOptions (testOpts :: ChatOpts)) {dbFilePrefix = tmp </> serviceDbPrefix},
+    { coreOptions = testOpts.coreOptions {dbFilePrefix = tmp </> serviceDbPrefix},
      superUsers,
      directoryLog = Just $ tmp </> "directory_service.log",
      serviceName = "SimpleX-Directory",
@@ -82,7 +82,6 @@ testOpts =
      allowInstantFiles = True,
      autoAcceptFileSize = 0,
      muteNotifications = True,
-      markRead = True,
      maintenance = False
    }

@@ -175,7 +174,7 @@ startTestChat_ db cfg opts user = do
  t <- withVirtualTerminal termSettings pure
  ct <- newChatTerminal t opts
  cc <- newChatController db (Just user) cfg opts
-  chatAsync <- async . runSimplexChat opts user cc $ \_u cc' -> runChatTerminal ct cc' opts
+  chatAsync <- async . runSimplexChat opts user cc . const $ runChatTerminal ct
  atomically . unless (maintenance opts) $ readTVar (agentAsync cc) >>= \a -> when (isNothing a) retry
  termQ <- newTQueueIO
  termAsync <- async $ readTerminalOutput t termQ
@@ -162,13 +162,13 @@ storedBindingsTest = testChat2 aliceProfile aliceDesktopProfile $ \mobile deskto

  desktop ##> "/list remote hosts"
  desktop <## "Remote hosts:"
-  desktop <##. "1. Mobile (connected) ["
+  desktop <## "1. Mobile (connected) [lo 127.0.0.1:52230]"
  stopDesktop mobile desktop
  desktop ##> "/list remote hosts"
  desktop <## "Remote hosts:"
-  desktop <##. "1. Mobile ["
+  desktop <## "1. Mobile [lo 127.0.0.1:52230]"

-- TODO: more parser tests
+  -- TODO: more parser tests

 remoteMessageTest :: HasCallStack => FilePath -> IO ()
 remoteMessageTest = testChat3 aliceProfile aliceDesktopProfile bobProfile $ \mobile desktop bob -> do