Merge branch 'develop' into update-orbitdb

TryQuiet · Dec 20, 2024 · 49b5276 · 49b5276
2 parents 39964c5 + 5668f86
commit 49b5276
Show file tree

Hide file tree

Showing 12 changed files with 62 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,15 +2,19 @@
 
 ## [unreleased]
 
+## [2.3.3]
+
 ### New features
 
 * Adds basic sigchain functions ([#2625](https://github.com/TryQuiet/quiet/issues/2625))
 * Instantiates signature chain when creating communities and reloading application ([#2626](https://github.com/TryQuiet/quiet/issues/2626))
 * Added in LFA-ready invite links ([#2627](https://github.com/TryQuiet/quiet/issues/2627))
 
 ### Fixes
-* Changed company name in app to "A Quiet LLC" ([#2642] (https://github.com/TryQuiet/quiet/issues/2642))
-* Fixed copyright statement in Electron app ([#2589] (https://github.com/TryQuiet/quiet/issues/2589))
+
+* Changed company name in app to "A Quiet LLC" ([#2642](https://github.com/TryQuiet/quiet/issues/2642))
+* Fixed copyright statement in Electron app ([#2589](https://github.com/TryQuiet/quiet/issues/2589))
+* Improved clickable link contrast ([#2593](https://github.com/TryQuiet/quiet/issues/2593))
 
 ## [2.3.2]
 

diff --git a/PUBLISHING.md b/PUBLISHING.md
@@ -101,3 +101,11 @@ QA will test according to the following checklists:
 2. PM can asynchronously decide a bug is not a blocker
 3. Team and QA can consult PM if they suspect a bug is not really a blocker despite meeting criteria
 4. PM can approve release in advance, pending completion of issues, or wait to give approval
+
+## Breaking changes
+
+While Quiet is in its early stages and does not have known communities of active users, we have the luxury of releasing breaking changes, e.g. changes that require users to start a new community. 
+
+1. Do not automatically update Desktop users. Instead, follow the approach in this issue: https://github.com/TryQuiet/quiet/issues/2039 (make a final release with message asking them to update manually, and use a new default storage location, e.g. "Quiet 4", so that users can potentially run both versions side-by-side to access old messages.) 
+2. Do not automatically update iOS users. Instead, create a new release branch in TestFlight such that users must update manually. See: https://github.com/TryQuiet/quiet/issues/1980
+3. On Android, we currently have no great way to avoid automatic updates. In this case, decide whether to show a message a few days or weeks in advance, or not. See: https://github.com/TryQuiet/quiet/issues/1980#issuecomment-1795028313
diff --git a/packages/backend/src/nest/connections-manager/connections-manager.service.ts b/packages/backend/src/nest/connections-manager/connections-manager.service.ts
@@ -302,8 +302,11 @@ export class ConnectionsManagerService extends EventEmitter implements OnModuleI
   }
 
   public async closeAllServices(options: { saveTor: boolean } = { saveTor: false }) {
-    this.logger.info('Closing services')
+    this.logger.info('Saving active sigchain')
     await this.saveActiveChain()
+    await this.sigChainService.deleteChain(this.sigChainService.activeChainTeamName!, false)
+
+    this.logger.info('Closing services')
 
     await this.closeSocket()
 

diff --git a/packages/desktop/CHANGELOG.md b/packages/desktop/CHANGELOG.md
@@ -1,5 +1,21 @@
 # Changelog
 
+## [unreleased]
+
+## [2.3.3]
+
+### New features
+
+* Adds basic sigchain functions ([#2625](https://github.com/TryQuiet/quiet/issues/2625))
+* Instantiates signature chain when creating communities and reloading application ([#2626](https://github.com/TryQuiet/quiet/issues/2626))
+* Added in LFA-ready invite links ([#2627](https://github.com/TryQuiet/quiet/issues/2627))
+
+### Fixes
+
+* Changed company name in app to "A Quiet LLC" ([#2642](https://github.com/TryQuiet/quiet/issues/2642))
+* Fixed copyright statement in Electron app ([#2589](https://github.com/TryQuiet/quiet/issues/2589))
+* Improved clickable link contrast ([#2593](https://github.com/TryQuiet/quiet/issues/2593))
+
 ## [2.3.2]
 
 ### Chores

diff --git a/packages/desktop/package-lock.json b/packages/desktop/package-lock.json
diff --git a/packages/desktop/package.json b/packages/desktop/package.json
@@ -80,7 +80,7 @@
   },
   "homepage": "https://github.com/TryQuiet",
   "@comment version": "To build new version for specific platform, just replace platform in version tag to one of following linux, mac, windows",
-  "version": "2.3.2",
+  "version": "2.3.3",
   "description": "Decentralized team chat",
   "main": "dist/main/main.js",
   "scripts": {

diff --git a/packages/mobile/CHANGELOG.md b/packages/mobile/CHANGELOG.md
@@ -1,5 +1,21 @@
 # Changelog
 
+## [unreleased]
+
+## [2.3.3]
+
+### New features
+
+* Adds basic sigchain functions ([#2625](https://github.com/TryQuiet/quiet/issues/2625))
+* Instantiates signature chain when creating communities and reloading application ([#2626](https://github.com/TryQuiet/quiet/issues/2626))
+* Added in LFA-ready invite links ([#2627](https://github.com/TryQuiet/quiet/issues/2627))
+
+### Fixes
+
+* Changed company name in app to "A Quiet LLC" ([#2642](https://github.com/TryQuiet/quiet/issues/2642))
+* Fixed copyright statement in Electron app ([#2589](https://github.com/TryQuiet/quiet/issues/2589))
+* Improved clickable link contrast ([#2593](https://github.com/TryQuiet/quiet/issues/2593))
+
 ## [2.3.2]
 
 ### Chores

diff --git a/packages/mobile/android/app/build.gradle b/packages/mobile/android/app/build.gradle
@@ -192,8 +192,8 @@ android {
         applicationId "com.quietmobile"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 433
-        versionName "2.3.2"
+        versionCode 436
+        versionName "2.3.3"
         resValue "string", "build_config_package", "com.quietmobile"
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'

diff --git a/packages/mobile/ios/Quiet/Info.plist b/packages/mobile/ios/Quiet/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.3.2</string>
+	<string>2.3.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -34,7 +34,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>390</string>
+	<string>393</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>

diff --git a/packages/mobile/ios/QuietTests/Info.plist b/packages/mobile/ios/QuietTests/Info.plist
@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.3.2</string>
+	<string>2.3.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>390</string>
+	<string>393</string>
 </dict>
 </plist>
diff --git a/packages/mobile/package-lock.json b/packages/mobile/package-lock.json
diff --git a/packages/mobile/package.json b/packages/mobile/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@quiet/mobile",
-  "version": "2.3.2",
+  "version": "2.3.3",
   "scripts": {
     "build": "tsc -p tsconfig.build.json --noEmit",
     "storybook-android": "ENVFILE=.env.storybook react-native run-android --mode=storybookDebug --appIdSuffix=storybook.debug",