TryQuiet · islathehut · Jan 12, 2026 · Jan 12, 2026 · Jan 16, 2026 · Jan 19, 2026
diff --git a/.github/workflows/e2e-linux.yml b/.github/workflows/e2e-linux.yml
@@ -13,7 +13,7 @@ jobs:
     timeout-minutes: 180
 
     env:
-      DISPLAY: ":99.0"
+      DISPLAY: ":99"
       TEST_MODE: true
       IS_CI: true
       SKIP_BACK_COMPAT_TEST_BRANCHES: '["update-orbitdb", "chore/upgrade-orbitdb-2_4_3", "fix/2679-2680-2682-3_0-fixes"]'
@@ -64,39 +64,53 @@ jobs:
         run: ENVFILE=.env.e2e npm run distUbuntu && VERSION=$(jq -r ".version" package.json) && cd dist && FILE_NAME=$(ls | grep $VERSION) && echo "FILE_NAME=$(ls | grep $VERSION)" >> $GITHUB_ENV && cp $FILE_NAME ../../e2e-tests/Quiet && export FILE_NAME=$FILE_NAME
 
       - name: Chmod
+        id: finish-build
         working-directory: ./packages/e2e-tests/Quiet
         run: chmod +x $FILE_NAME
 
       - name: Run one client test
         uses: nick-fields/retry@14672906e672a08bd6eeb15720e9ed3ce869cdd4 # v2.9.0
+        if: (success() || failure()) && steps.finish-build.outcome == 'success'
         with:
           timeout_minutes: 15
           max_attempts: 3
           command: cd packages/e2e-tests && npm run test oneClient.test.ts
 
       - name: Run user profile test
         uses: nick-fields/retry@v2
+        if: (success() || failure()) && steps.finish-build.outcome == 'success'
         with:
           timeout_minutes: 25
           max_attempts: 3
           command: cd packages/e2e-tests && npm run test userProfile.test.ts
 
       - name: Run multiple clients test
         uses: nick-fields/retry@14672906e672a08bd6eeb15720e9ed3ce869cdd4 # v2.9.0
+        if: (success() || failure()) && steps.finish-build.outcome == 'success'
         with:
           timeout_minutes: 25
           max_attempts: 3
           command: cd packages/e2e-tests && npm run test multipleClients.test.ts
+
+      # - name: Run multiple clients test (DMs)
+      #   uses: nick-fields/retry@14672906e672a08bd6eeb15720e9ed3ce869cdd4 # v2.9.0
+      #   if: (success() || failure()) && steps.finish-build.outcome == 'success'
+      #   with:
+      #     timeout_minutes: 25
+      #     max_attempts: 3
+      #     command: cd packages/e2e-tests && npm run test multipleClients.dms.test.ts
 
       - name: Run multiple clients test (private channels)
         uses: nick-fields/retry@14672906e672a08bd6eeb15720e9ed3ce869cdd4 # v2.9.0
+        if: (success() || failure()) && steps.finish-build.outcome == 'success'
         with:
           timeout_minutes: 25
           max_attempts: 3
           command: cd packages/e2e-tests && npm run test multipleClients.privateChannels.test.ts
 
       - name: Run invitation link test - Includes 2 separate application clients
         uses: nick-fields/retry@14672906e672a08bd6eeb15720e9ed3ce869cdd4 # v2.9.0
+        if: (success() || failure()) && steps.finish-build.outcome == 'success'
         with:
           timeout_minutes: 25
           max_attempts: 3

diff --git a/.github/workflows/e2e-mac.yml b/.github/workflows/e2e-mac.yml
@@ -63,38 +63,52 @@ jobs:
         run: hdiutil mount $FILE_NAME
 
       - name: Add App file to applications
+        id: finish-build
         run: cd ~ && cp -R "/Volumes/Quiet $VERSION${{matrix.binary_suffix}}/Quiet.app" /Applications
 
       - name: Run one client test
         uses: nick-fields/retry@14672906e672a08bd6eeb15720e9ed3ce869cdd4 # v2.9.0
+        if: (success() || failure()) && steps.finish-build.outcome == 'success'
         with:
           timeout_minutes: 15
           max_attempts: 3
           command: cd packages/e2e-tests && npm run test oneClient.test.ts
 
       - name: Run user profile test
         uses: nick-fields/retry@14672906e672a08bd6eeb15720e9ed3ce869cdd4 # v2.9.0
+        if: (success() || failure()) && steps.finish-build.outcome == 'success'
         with:
           timeout_minutes: 25
           max_attempts: 3
           command: cd packages/e2e-tests && npm run test userProfile.test.ts
 
       - name: Run multiple clients test
         uses: nick-fields/retry@14672906e672a08bd6eeb15720e9ed3ce869cdd4 # v2.9.0
+        if: (success() || failure()) && steps.finish-build.outcome == 'success'
         with:
           timeout_minutes: 25
           max_attempts: 3
           command: cd packages/e2e-tests && npm run test multipleClients.test.ts
 
       - name: Run multiple clients test (private channels)
         uses: nick-fields/retry@14672906e672a08bd6eeb15720e9ed3ce869cdd4 # v2.9.0
+        if: (success() || failure()) && steps.finish-build.outcome == 'success'
         with:
           timeout_minutes: 25
           max_attempts: 3
           command: cd packages/e2e-tests && npm run test multipleClients.privateChannels.test.ts
 
+      # - name: Run multiple clients test (DMs)
+      #   uses: nick-fields/retry@14672906e672a08bd6eeb15720e9ed3ce869cdd4 # v2.9.0
+      #   if: (success() || failure()) && steps.finish-build.outcome == 'success'
+      #   with:
+      #     timeout_minutes: 25
+      #     max_attempts: 3
+      #     command: cd packages/e2e-tests && npm run test multipleClients.dms.test.ts
+
       - name: Run invitation link test - Includes 2 separate application clients
         uses: nick-fields/retry@14672906e672a08bd6eeb15720e9ed3ce869cdd4 # v2.9.0
+        if: (success() || failure()) && steps.finish-build.outcome == 'success'
         with:
           timeout_minutes: 25
           max_attempts: 3

diff --git a/.github/workflows/e2e-qss-linux.yml b/.github/workflows/e2e-qss-linux.yml
@@ -70,29 +70,41 @@ jobs:
         run: ENVFILE=.env.e2e.qss npm run distUbuntu && VERSION=$(jq -r ".version" package.json) && cd dist && FILE_NAME=$(ls | grep $VERSION) && echo "FILE_NAME=$(ls | grep $VERSION)" >> $GITHUB_ENV && cp $FILE_NAME ../../e2e-tests/Quiet && export FILE_NAME=$FILE_NAME
 
       - name: Chmod
+        id: finish-build
         working-directory: ./packages/e2e-tests/Quiet
         run: chmod +x $FILE_NAME
 
-      - name: Run multiple clients with QSS test
+      - name: Run one client with QSS test
         uses: nick-fields/retry@14672906e672a08bd6eeb15720e9ed3ce869cdd4 # v2.9.0
+        if: (success() || failure()) && steps.finish-build.outcome == 'success'
         with:
           timeout_minutes: 25
           max_attempts: 3
-          command: cd packages/e2e-tests && npm run test multipleClients.qss.test.ts
+          command: cd packages/e2e-tests && npm run test oneClient.qss.test.ts
 
-      - name: Run multiple clients with QSS test (private channels)
+      - name: Run multiple clients with QSS test
         uses: nick-fields/retry@14672906e672a08bd6eeb15720e9ed3ce869cdd4 # v2.9.0
+        if: (success() || failure()) && steps.finish-build.outcome == 'success'
         with:
           timeout_minutes: 25
           max_attempts: 3
-          command: cd packages/e2e-tests && npm run test multipleClients.privateChannels.qss.test.ts
+          command: cd packages/e2e-tests && npm run test multipleClients.qss.test.ts
 
-      - name: Run one client with QSS test
+      - name: Run multiple clients with QSS test (private channels)
         uses: nick-fields/retry@14672906e672a08bd6eeb15720e9ed3ce869cdd4 # v2.9.0
+        if: (success() || failure()) && steps.finish-build.outcome == 'success'
         with:
           timeout_minutes: 25
           max_attempts: 3
-          command: cd packages/e2e-tests && npm run test oneClient.qss.test.ts
+          command: cd packages/e2e-tests && npm run test multipleClients.privateChannels.qss.test.ts
+
+      # - name: Run multiple clients with QSS test (DMs)
+      #   uses: nick-fields/retry@14672906e672a08bd6eeb15720e9ed3ce869cdd4 # v2.9.0
+      #   if: (success() || failure()) && steps.finish-build.outcome == 'success'
+      #   with:
+      #     timeout_minutes: 25
+      #     max_attempts: 3
+      #     command: cd packages/e2e-tests && npm run test multipleClients.dms.qss.test.ts
 
       - name: Stop QSS docker
         if: always()

diff --git a/.gitmodules b/.gitmodules
@@ -1,7 +1,7 @@
 [submodule "3rd-party/auth"]
 	path = 3rd-party/auth
 	url = https://github.com/TryQuiet/auth.git
-	branch = main
+	branch = feat/private-dms
 [submodule "3rd-party/js-libp2p-noise"]
 	path = 3rd-party/js-libp2p-noise
 	url = https://github.com/TryQuiet/js-libp2p-noise.git
@@ -13,4 +13,4 @@
 [submodule "3rd-party/qss"]
 	path = 3rd-party/qss
 	url = https://github.com/TryQuiet/quiet-storage-service.git
-	branch = main
+	branch = feat/2571-private-dms
diff --git a/3rd-party/auth b/3rd-party/auth
diff --git a/3rd-party/qss b/3rd-party/qss
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Features
 
+* Adds one-on-one and group DMs to desktop [#2571](https://github.com/TryQuiet/quiet/issues/2571)
 * Allow all users to create private channels [#3277](https://github.com/TryQuiet/quiet/issues/3277)
 
 ### Fixes
@@ -60,6 +61,7 @@
 
 * Registers APNS token with push notifications service [#3080](https://github.com/TryQuiet/quiet/issues/3080)
 * Adds push notification service [#3086](https://github.com/TryQuiet/quiet/issues/3086)
+* Adds private channels [#3155](https://github.com/TryQuiet/quiet/issues/3155)
 
 ### Fixes
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/backend/package-lock.json b/packages/backend/package-lock.json
diff --git a/packages/backend/package.json b/packages/backend/package.json
@@ -73,7 +73,7 @@
     "@types/jest": "28.1.8",
     "@types/luxon": "^3.4.2",
     "@types/mock-fs": "^4.13.1",
-    "@types/node": "18.11.9",
+    "@types/node": "20.19.43",
     "@types/node-fetch": "^2.5.11",
     "@types/supertest": "^2.0.11",
     "@types/tmp": "^0.2.3",
@@ -107,7 +107,7 @@
     "@helia/unixfs": "4.0.1",
     "@ipld/dag-cbor": "^9.2.1",
     "@ipld/dag-pb": "^4.1.2",
-    "@libp2p/crypto": "^5.0.8",
+    "@libp2p/crypto": "5.0.8",
     "@libp2p/echo": "^1.1.1",
     "@libp2p/identify": "^3.0.14",
     "@libp2p/interface": "^2.3.0",
@@ -201,8 +201,11 @@
   },
   "overrides": {
     "level": "$level",
+    "multiformats": "13.3.1",
+    "@chainsafe/libp2p-noise": {
+      "@libp2p/crypto": "5.0.8"
+    },
     "@orbitdb/core": {
-      "multiformats": "13.3.1",
       "@ipld/dag-cbor": "9.2.1"
     },
     "express": {

diff --git a/packages/backend/src/nest/auth/services/crypto/crypto.service.ts b/packages/backend/src/nest/auth/services/crypto/crypto.service.ts
@@ -178,8 +178,10 @@ class CryptoService extends ChainServiceBase {
       contents,
     }
     const isValid = this.validateSignature(fullSig)
-    if (!isValid && failOnInvalid) {
-      throw new Error(`Couldn't verify signature on message`)
+    if (!isValid) {
+      const validationError = new Error(`Couldn't verify signature on message`)
+      logger.error(`Error while validating message signature`, validationError)
+      if (failOnInvalid) throw validationError
     }
 
     return {

diff --git a/packages/backend/src/nest/auth/services/roles/permissions.ts b/packages/backend/src/nest/auth/services/roles/permissions.ts
@@ -1,3 +1,21 @@
-export enum Permissions {
-  MODIFIABLE_MEMBERSHIP = 'modifiable-membership',
+import { PermissionsMap, Permission } from '@localfirst/auth'
+
+export const defaultDmPermissions = (memberIds: string[]): PermissionsMap => {
+  return {
+    [Permission.MODIFIABLE_MEMBERSHIP]: {
+      memberIds,
+    },
+  }
+}
+
+export const defaultChannelPermissions = (): PermissionsMap => {
+  return {
+    [Permission.MODIFIABLE_MEMBERSHIP]: true,
+  }
+}
+
+export const defaultGenericPermissions = (): PermissionsMap => {
+  return {
+    [Permission.MODIFIABLE_MEMBERSHIP]: true,
+  }
 }
+1 −1		packages/auth/src/index.ts
+11 −1		packages/auth/src/role/types.ts
+6 −3		packages/auth/src/team/Team.ts
+2 −1		packages/auth/src/team/isAdminOnlyAction.ts
+8 −2		packages/auth/src/team/membershipResolver.ts
+15 −1		packages/auth/src/team/reducer.ts
+17 −1		packages/auth/src/team/types.ts
+40 −0		packages/auth/src/team/validate.ts
+3 −1		packages/auth/src/util/actionFingerprint.ts