Merge branch 'develop' into feature/2310

TryQuiet · Apr 9, 2024 · cd863db · cd863db
2 parents beaec60 + fa3a9b6
commit cd863db
Show file tree

Hide file tree

Showing 85 changed files with 2,126 additions and 6,636 deletions.
diff --git a/.github/workflows/e2e-linux.yml b/.github/workflows/e2e-linux.yml
@@ -16,6 +16,7 @@ jobs:
       ELECTRON_CUSTOM_VERSION: 23.0.0
       DISPLAY: ":99.0"
       TEST_MODE: true
+      IS_CI: true
 
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

diff --git a/.github/workflows/e2e-mac.yml b/.github/workflows/e2e-mac.yml
@@ -9,6 +9,7 @@ jobs:
       ELECTRON_CUSTOM_VERSION: 23.0.0
       TEST_MODE: true
       IS_E2E: true
+      IS_CI: true
 
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

diff --git a/.github/workflows/e2e-win.yml b/.github/workflows/e2e-win.yml
@@ -11,6 +11,7 @@ jobs:
       ELECTRON_CUSTOM_VERSION: 23.0.0
       TEST_MODE: true
       E2E: true
+      IS_CI: true
 
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,11 +10,16 @@
 # Fixes
 
 * Allow JPEG and GIF files as profile photos ([#2332](https://github.com/TryQuiet/quiet/issues/2332))
+* Fixes issues with recreating general channel when deleted while offline ([#2334](https://github.com/TryQuiet/quiet/issues/2334))
 
 # Other:
 
 * Refactored package.json to have consistent license "GPL-3.0-or-later"
 
+# Chores
+
+* Cleanup data directory at end of e2e tests
+
 [2.1.2]
 
 # Refactorings: