Merge pull request #1824 from TryQuiet/chore/merge-master-to-develop

Chore/merge master to develop

.github/workflows/deploy-android.yaml

@@ -64,6 +64,7 @@ jobs:
         run: cd ./packages/mobile/android && ENVFILE=../.env.production ./gradlew bundleStandardRelease
 
       - name: "Upload Artifact"
+        continue-on-error: true
         uses: actions/upload-artifact@v2
         with:
           name: app-standard-release.aab

packages/backend/CHANGELOG.md

@@ -36,6 +36,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 # [1.10.0-alpha.0](https://github.com/TryQuiet/backend/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-08-29)
+## [1.9.1](https://github.com/TryQuiet/backend/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-09-15)
 
 **Note:** Version bump only for package @quiet/backend
 

packages/backend/package.json

@@ -144,4 +144,4 @@
 			"ipfs-pubsub-peer-monitor": "vinkabuki/ipfs-pubsub-peer-monitor#038af76f22e6c902dab4a855b24273707ce17d94"
 		}
 	}
-}
+}

packages/common/CHANGELOG.md

@@ -25,6 +25,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 # [1.9.0-alpha.0](/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-08-29)
+## [1.8.1](https://github.com/TryQuiet/quiet/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-09-15)
 
 **Note:** Version bump only for package @quiet/common
 

packages/common/package.json

@@ -42,4 +42,4 @@
   },
   "author": "",
   "license": "ISC"
-}
+}

packages/desktop/CHANGELOG.md

@@ -76,6 +76,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 # [1.10.0-alpha.0](/compare/[email protected]@1.10.0-alpha.0) (2023-08-29)
+## [1.9.1](https://github.com/TryQuiet/quiet/compare/[email protected]@1.9.1) (2023-09-15)
 
 **Note:** Version bump only for package quiet
 

packages/desktop/package.json

@@ -299,4 +299,4 @@
     "node": "18.12.1",
     "npm": "8.19.2"
   }
-}
+}

packages/e2e-tests/CHANGELOG.md

@@ -28,6 +28,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 # [1.9.0-alpha.0](/compare/[email protected]@1.9.0-alpha.0) (2023-08-29)
+## [1.8.1](https://github.com/TryQuiet/quiet/compare/[email protected]@1.8.1) (2023-09-15)
 
 **Note:** Version bump only for package e2e-tests
 

packages/e2e-tests/package.json

@@ -46,4 +46,4 @@
   },
   "author": "",
   "license": "ISC"
-}
+}

packages/identity/CHANGELOG.md

@@ -20,6 +20,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 # [1.9.0-alpha.0](https://github.com/TryQuiet/identity/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-08-29)
+## [1.8.1](https://github.com/TryQuiet/identity/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-09-15)
 
 **Note:** Version bump only for package @quiet/identity
 

packages/identity/package.json

@@ -66,4 +66,4 @@
   "publishConfig": {
     "access": "public"
   }
-}
+}

packages/integration-tests/CHANGELOG.md

@@ -28,6 +28,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 # [1.10.0-alpha.0](/compare/[email protected]@1.10.0-alpha.0) (2023-08-29)
+## [1.9.1](https://github.com/TryQuiet/quiet/compare/[email protected]@1.9.1) (2023-09-15)
 
 **Note:** Version bump only for package integration-tests
 

packages/integration-tests/package.json

@@ -70,4 +70,4 @@
       "./setupTests.ts"
     ]
   }
-}
+}

packages/mobile/CHANGELOG.md

@@ -15,6 +15,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 # [2.0.0-alpha.7](https://github.com/TryQuiet/quiet/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-09-07)
+## [1.10.5](https://github.com/TryQuiet/quiet/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-09-15)
 
 **Note:** Version bump only for package @quiet/mobile
 
@@ -23,6 +24,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 # [2.0.0-alpha.6](https://github.com/TryQuiet/quiet/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-09-07)
+## [1.10.4](https://github.com/TryQuiet/quiet/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-09-15)
 
 **Note:** Version bump only for package @quiet/mobile
 
@@ -31,6 +33,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 # [2.0.0-alpha.5](https://github.com/TryQuiet/quiet/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-09-06)
+## [1.10.3](https://github.com/TryQuiet/quiet/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-09-15)
 
 **Note:** Version bump only for package @quiet/mobile
 
@@ -39,6 +42,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 # [2.0.0-alpha.4](https://github.com/TryQuiet/quiet/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-09-06)
+## [1.10.2](https://github.com/TryQuiet/quiet/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-09-15)
 
 **Note:** Version bump only for package @quiet/mobile
 
@@ -79,6 +83,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 # [1.11.0-alpha.0](/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-08-29)
+## [1.10.1](https://github.com/TryQuiet/quiet/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-09-15)
 
 **Note:** Version bump only for package @quiet/mobile
 

packages/mobile/android/app/build.gradle

@@ -166,7 +166,7 @@ android {
         applicationId "com.quietmobile"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 312
+        versionCode 323
         versionName "2.0.0-alpha.8"
         resValue "string", "build_config_package", "com.quietmobile"
         testBuildType System.getProperty('testBuildType', 'debug')

packages/mobile/android/app/src/main/java/com/quietmobile/Utils/Utils.kt

@@ -18,7 +18,7 @@ object Utils {
             outputStreamWriter.append("$data \n")
             outputStreamWriter.close()
         } catch (e: IOException) {
-            Log.e("Worker", "File write failed: $e")
+            Log.e("Worker", "File write failed at: $e")
         }
     }
 

packages/mobile/ios/Quiet/Info.plist

@@ -1,89 +1,89 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleDisplayName</key>
-	<string>Quiet</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>2.0.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleURLTypes</key>
-	<array>
-		<dict>
-			<key>CFBundleTypeRole</key>
-			<string>Editor</string>
-			<key>CFBundleURLName</key>
-			<string>quiet</string>
-			<key>CFBundleURLSchemes</key>
-			<array>
-				<string>quiet</string>
-			</array>
-		</dict>
-	</array>
-	<key>CFBundleVersion</key>
-	<string>302</string>
-	<key>ITSAppUsesNonExemptEncryption</key>
-	<false />
-	<key>LSRequiresIPhoneOS</key>
-	<true />
-	<key>NSAppTransportSecurity</key>
 	<dict>
-		<key>NSExceptionDomains</key>
+		<key>CFBundleDevelopmentRegion</key>
+		<string>en</string>
+		<key>CFBundleDisplayName</key>
+		<string>Quiet</string>
+		<key>CFBundleExecutable</key>
+		<string>$(EXECUTABLE_NAME)</string>
+		<key>CFBundleIdentifier</key>
+		<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+		<key>CFBundleInfoDictionaryVersion</key>
+		<string>6.0</string>
+		<key>CFBundleName</key>
+		<string>$(PRODUCT_NAME)</string>
+		<key>CFBundlePackageType</key>
+		<string>APPL</string>
+		<key>CFBundleShortVersionString</key>
+		<string>2.0.0</string>
+		<key>CFBundleSignature</key>
+		<string>????</string>
+		<key>CFBundleURLTypes</key>
+		<array>
+			<dict>
+				<key>CFBundleTypeRole</key>
+				<string>Editor</string>
+				<key>CFBundleURLName</key>
+				<string>quiet</string>
+				<key>CFBundleURLSchemes</key>
+				<array>
+					<string>quiet</string>
+				</array>
+			</dict>
+		</array>
+		<key>CFBundleVersion</key>
+		<string>302</string>
+		<key>ITSAppUsesNonExemptEncryption</key>
+		<false />
+		<key>LSRequiresIPhoneOS</key>
+		<true />
+		<key>NSAppTransportSecurity</key>
 		<dict>
-			<key>localhost</key>
+			<key>NSExceptionDomains</key>
 			<dict>
-				<key>NSExceptionAllowsInsecureHTTPLoads</key>
-				<true />
+				<key>localhost</key>
+				<dict>
+					<key>NSExceptionAllowsInsecureHTTPLoads</key>
+					<true />
+				</dict>
 			</dict>
 		</dict>
+		<key>NSLocationWhenInUseUsageDescription</key>
+		<string />
+		<key>UIAppFonts</key>
+		<array>
+			<string>Rubik-Black.ttf</string>
+			<string>Rubik-BlackItalic.ttf</string>
+			<string>Rubik-Bold.ttf</string>
+			<string>Rubik-BoldItalic.ttf</string>
+			<string>Rubik-ExtraBold.ttf</string>
+			<string>Rubik-ExtraBoldItalic.ttf</string>
+			<string>Rubik-Italic.ttf</string>
+			<string>Rubik-Light.ttf</string>
+			<string>Rubik-LightItalic.ttf</string>
+			<string>Rubik-Medium.ttf</string>
+			<string>Rubik-MediumItalic.ttf</string>
+			<string>Rubik-Regular.ttf</string>
+			<string>Rubik-SemiBold.ttf</string>
+			<string>Rubik-SemiBoldItalic.ttf</string>
+		</array>
+		<key>UIBackgroundModes</key>
+		<array />
+		<key>UILaunchStoryboardName</key>
+		<string>LaunchScreen</string>
+		<key>UIRequiredDeviceCapabilities</key>
+		<array>
+			<string>armv7</string>
+		</array>
+		<key>UISupportedInterfaceOrientations</key>
+		<array>
+			<string>UIInterfaceOrientationPortrait</string>
+			<string>UIInterfaceOrientationLandscapeLeft</string>
+			<string>UIInterfaceOrientationLandscapeRight</string>
+		</array>
+		<key>UIViewControllerBasedStatusBarAppearance</key>
+		<false />
 	</dict>
-	<key>NSLocationWhenInUseUsageDescription</key>
-	<string />
-	<key>UIAppFonts</key>
-	<array>
-		<string>Rubik-Black.ttf</string>
-		<string>Rubik-BlackItalic.ttf</string>
-		<string>Rubik-Bold.ttf</string>
-		<string>Rubik-BoldItalic.ttf</string>
-		<string>Rubik-ExtraBold.ttf</string>
-		<string>Rubik-ExtraBoldItalic.ttf</string>
-		<string>Rubik-Italic.ttf</string>
-		<string>Rubik-Light.ttf</string>
-		<string>Rubik-LightItalic.ttf</string>
-		<string>Rubik-Medium.ttf</string>
-		<string>Rubik-MediumItalic.ttf</string>
-		<string>Rubik-Regular.ttf</string>
-		<string>Rubik-SemiBold.ttf</string>
-		<string>Rubik-SemiBoldItalic.ttf</string>
-	</array>
-	<key>UIBackgroundModes</key>
-	<array />
-	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
-	<key>UIRequiredDeviceCapabilities</key>
-	<array>
-		<string>armv7</string>
-	</array>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UIViewControllerBasedStatusBarAppearance</key>
-	<false />
-</dict>
 </plist>