Merge branch 'develop' of github.com:TryQuiet/quiet into chore/bump-p…

…ackages
TryQuiet · Oct 16, 2023 · 433f12b · 433f12b
2 parents 25cb635 + a4132fa
commit 433f12b
Show file tree

Hide file tree

Showing 77 changed files with 526 additions and 218 deletions.
diff --git a/.github/secrets/match_AppStore_comquietmobile.mobileprovision.gpg b/.github/secrets/match_AppStore_comquietmobile.mobileprovision.gpg
diff --git a/.github/workflows/e2e-android.yml b/.github/workflows/e2e-android.yml
@@ -0,0 +1,34 @@
+name: E2E Android
+
+on:
+  push:
+    paths:
+      - packages/mobile/**
+
+jobs:
+  detox-android:
+    timeout-minutes: 10
+    runs-on: [self-hosted, macOS, ARM64, android]
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install dependencies
+        run: |
+          npm i
+          npm run lerna bootstrap --scope @quiet/eslint-config,@quiet/logger,@quiet/common,@quiet/types,@quiet/state-manager,@quiet/backend,@quiet/identity,@quiet/mobile,backend-bundle
+
+      - name: Pull binaries
+        run: |
+          git lfs install
+          git lfs pull
+
+      - name: Build Detox
+        run: |
+          cd packages/mobile
+          detox build -c android.emu.debug.ci
+
+      - name: Run basic tests
+        run: |
+          cd packages/mobile
+          detox test starter -c android.emu.debug.ci
diff --git a/.github/workflows/e2e-ios.yml b/.github/workflows/e2e-ios.yml
@@ -1,14 +1,14 @@
 name: E2E iOS
 
 on:
-  pull_request:
+  push:
     paths:
       - packages/mobile/**
 
 jobs:
-  detox:
+  detox-ios:
     timeout-minutes: 10
-    runs-on: [self-hosted, macOS, ARM64]
+    runs-on: [self-hosted, macOS, ARM64, iOS]
 
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/mobile-deploy-android.yaml b/.github/workflows/mobile-deploy-android.yaml
@@ -7,6 +7,7 @@ on:
 
 jobs:
   build-android:
+    needs: detox-android
     runs-on: ${{ matrix.os }}
     if: |
       startsWith(github.ref, 'refs/tags/@quiet/mobile')
@@ -41,13 +42,13 @@ jobs:
 
       - name: "Create gradle configuration directory"
         run: mkdir -p $HOME/.gradle
-
+      
       - name: "Prepare ndk configuration"
         run: |
           printf "\
           NDK_PATH=${{ steps.setup-ndk.outputs.ndk-path }}\n\
           " > $HOME/.gradle/gradle.properties
-      
+
       - name: "Prepare signing configuration"
         run: |
           printf "\

diff --git a/.github/workflows/mobile-deploy-ios.yml b/.github/workflows/mobile-deploy-ios.yml
@@ -7,6 +7,7 @@ on:
 
 jobs:
   build-ios:
+    needs: detox-ios
     runs-on: ${{ matrix.os }}
     if: |
       startsWith(github.ref, 'refs/tags/@quiet/mobile')

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
+[unreleased]
 
-[Unreleased]
+* Fixed mobile bugs - joining by QR code and not showing username taken screen for user who has unique name
+
+* Shorter dots-placeholder for invite link
 
 * Revert adjusting bootstrap scripts for developing on Windows
 

diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@
   Encrypted p2p team chat with no servers, just Tor.
     <br />
 <!--    <a href="https://tryquiet.org"><strong>tryquiet.org »</strong></a> -->
-    <a href="https://github.com/TryQuiet/quiet/releases/tag/quiet%401.9.4"><strong>Downloads</strong></a> | 
+    <a href="https://github.com/TryQuiet/quiet/releases/tag/quiet%401.9.5"><strong>Downloads</strong></a> | 
     <a href="#how-it-works"><strong>How it Works</strong></a> |   
     <a href="#features"><strong>Features</strong></a> | 
     <a href="https://github.com/TryQuiet/monorepo/wiki/Threat-Model"><strong>Threat Model</strong></a> | 
@@ -52,7 +52,7 @@ See our [FAQ](https://github.com/TryQuiet/monorepo/wiki/Quiet-FAQ) for answers t
 
 ## Getting started
 
-To try Quiet, download the [latest release](https://github.com/TryQuiet/quiet/releases/tag/quiet%401.9.4) for your platform (.dmg for macOS, .exe for Windows, etc.) and install it in the normal way. Then create a community and open the community's settings to invite members. 
+To try Quiet, download the [latest release](https://github.com/TryQuiet/quiet/releases/tag/quiet%401.9.5) for your platform (.dmg for macOS, .exe for Windows, etc.) and install it in the normal way. Then create a community and open the community's settings to invite members. 
 
 If you'd like to help develop Quiet, see [Contributing to Quiet](#contributing-to-quiet).
 

diff --git a/packages/backend-bundle/CHANGELOG.md b/packages/backend-bundle/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.0.1-alpha.4](https://github.com/TryQuiet/quiet/compare/backend-bundle@2.0.1-alpha.3...backend-bundle@2.0.1-alpha.4) (2023-10-12)
+
+**Note:** Version bump only for package backend-bundle
+
+
+
+
+
 ## [2.0.1-alpha.3](https://github.com/TryQuiet/quiet/compare/backend-bundle@2.0.1-alpha.2...backend-bundle@2.0.1-alpha.3) (2023-10-10)
 
 **Note:** Version bump only for package backend-bundle

diff --git a/packages/backend-bundle/package-lock.json b/packages/backend-bundle/package-lock.json
diff --git a/packages/backend-bundle/package.json b/packages/backend-bundle/package.json
@@ -1,6 +1,6 @@
 {
   "name": "backend-bundle",
-  "version": "2.0.1-alpha.3",
+  "version": "2.0.1-alpha.4",
   "description": "",
   "main": "bundle.cjs",
   "scripts": {},

diff --git a/packages/backend/CHANGELOG.md b/packages/backend/CHANGELOG.md
@@ -3,6 +3,33 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.0.1-alpha.6](https://github.com/TryQuiet/backend/compare/@quiet/backend@2.0.1-alpha.5...@quiet/backend@2.0.1-alpha.6) (2023-10-13)
+
+**Note:** Version bump only for package @quiet/backend
+
+
+
+
+
+## [2.0.1-alpha.5](https://github.com/TryQuiet/backend/compare/@quiet/backend@2.0.1-alpha.4...@quiet/backend@2.0.1-alpha.5) (2023-10-12)
+
+**Note:** Version bump only for package @quiet/backend
+
+
+
+
+
+## [2.0.1-alpha.4](https://github.com/TryQuiet/backend/compare/@quiet/backend@2.0.1-alpha.3...@quiet/backend@2.0.1-alpha.4) (2023-10-11)
+
+
+### Reverts
+
+* Revert "Adjust project bootstrap scripts to be windows-friendly (#1870)" (#1937) ([0811ea3](https://github.com/TryQuiet/backend/commit/0811ea3ea3f682dd763be72b12f626fe416bc036)), closes [#1870](https://github.com/TryQuiet/backend/issues/1870) [#1937](https://github.com/TryQuiet/backend/issues/1937) [#1870](https://github.com/TryQuiet/backend/issues/1870)
+
+
+
+
+
 ## [2.0.1-alpha.3](https://github.com/TryQuiet/backend/compare/@quiet/backend@2.0.1-alpha.2...@quiet/backend@2.0.1-alpha.3) (2023-10-10)
 
 **Note:** Version bump only for package @quiet/backend

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
@@ -1,6 +1,6 @@
 {
 	"name": "@quiet/backend",
-	"version": "2.0.1-alpha.3",
+	"version": "2.0.1-alpha.6",
 	"description": "tlg-manager",
 	"types": "lib/index.d.ts",
 	"type": "module",
@@ -53,8 +53,8 @@
 		"@nestjs/cli": "^10.0.0",
 		"@nestjs/schematics": "^10.0.0",
 		"@nestjs/testing": "^10.0.0",
-		"@quiet/eslint-config": "^2.0.1-alpha.3",
-		"@quiet/state-manager": "^2.0.1-alpha.3",
+		"@quiet/eslint-config": "^2.0.1-alpha.4",
+		"@quiet/state-manager": "^2.0.1-alpha.6",
 		"@types/crypto-js": "^4.0.2",
 		"@types/express": "^4.17.9",
 		"@types/jest": "28.1.8",
@@ -89,10 +89,10 @@
 		"@nestjs/core": "^10.0.0",
 		"@nestjs/platform-express": "^10.0.0",
 		"@peculiar/webcrypto": "1.4.3",
-		"@quiet/common": "^2.0.1-alpha.3",
-		"@quiet/identity": "^2.0.1-alpha.3",
-		"@quiet/logger": "^2.0.1-alpha.3",
-		"@quiet/types": "^2.0.1-alpha.3",
+		"@quiet/common": "^2.0.1-alpha.4",
+		"@quiet/identity": "^2.0.1-alpha.4",
+		"@quiet/logger": "^2.0.1-alpha.4",
+		"@quiet/types": "^2.0.1-alpha.4",
 		"abortable-iterator": "^3.0.0",
 		"class-transformer": "^0.5.1",
 		"class-validator": "^0.13.1",

diff --git a/packages/common/CHANGELOG.md b/packages/common/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.0.1-alpha.4](https://github.com/TryQuiet/quiet/compare/@quiet/common@2.0.1-alpha.3...@quiet/common@2.0.1-alpha.4) (2023-10-12)
+
+**Note:** Version bump only for package @quiet/common
+
+
+
+
+
 ## [2.0.1-alpha.3](https://github.com/TryQuiet/quiet/compare/@quiet/common@2.0.1-alpha.2...@quiet/common@2.0.1-alpha.3) (2023-10-10)
 
 **Note:** Version bump only for package @quiet/common

diff --git a/packages/common/package-lock.json b/packages/common/package-lock.json
diff --git a/packages/common/package.json b/packages/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@quiet/common",
-  "version": "2.0.1-alpha.3",
+  "version": "2.0.1-alpha.4",
   "description": "Common monorepo utils",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -18,15 +18,15 @@
     "rmDist": "rimraf lib/"
   },
   "devDependencies": {
-    "@quiet/eslint-config": "^2.0.1-alpha.3",
+    "@quiet/eslint-config": "^2.0.1-alpha.4",
     "@types/jest": "^26.0.23",
     "@types/node": "^17.0.21",
     "jest": "^26.6.3",
     "ts-jest": "^26.5.2",
     "typescript": "^4.9.3"
   },
   "dependencies": {
-    "@quiet/types": "^2.0.1-alpha.3",
+    "@quiet/types": "^2.0.1-alpha.4",
     "cross-env": "^5.2.0",
     "debug": "^4.3.1"
   },

diff --git a/packages/desktop/CHANGELOG.md b/packages/desktop/CHANGELOG.md
@@ -3,6 +3,33 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.0.1-alpha.6](https://github.com/TryQuiet/quiet/compare/@quiet/desktop@2.0.1-alpha.5...@quiet/desktop@2.0.1-alpha.6) (2023-10-13)
+
+**Note:** Version bump only for package @quiet/desktop
+
+
+
+
+
+## [2.0.1-alpha.5](https://github.com/TryQuiet/quiet/compare/@quiet/desktop@2.0.1-alpha.4...@quiet/desktop@2.0.1-alpha.5) (2023-10-12)
+
+**Note:** Version bump only for package @quiet/desktop
+
+
+
+
+
+## [2.0.1-alpha.4](https://github.com/TryQuiet/quiet/compare/@quiet/desktop@2.0.1-alpha.3...@quiet/desktop@2.0.1-alpha.4) (2023-10-11)
+
+
+### Reverts
+
+* Revert "Adjust project bootstrap scripts to be windows-friendly (#1870)" (#1937) ([0811ea3](https://github.com/TryQuiet/quiet/commit/0811ea3ea3f682dd763be72b12f626fe416bc036)), closes [#1870](https://github.com/TryQuiet/quiet/issues/1870) [#1937](https://github.com/TryQuiet/quiet/issues/1937) [#1870](https://github.com/TryQuiet/quiet/issues/1870)
+
+
+
+
+
 ## [2.0.1-alpha.3](https://github.com/TryQuiet/quiet/compare/@quiet/desktop@2.0.1-alpha.2...@quiet/desktop@2.0.1-alpha.3) (2023-10-10)
 
 **Note:** Version bump only for package @quiet/desktop

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.0.1-alpha.3",
+  "version": "2.0.1-alpha.6",
   "description": "Decentralized team chat",
   "main": "dist/main/main.js",
   "scripts": {
@@ -125,11 +125,11 @@
   "dependencies": {
     "@electron/remote": "^2.0.8",
     "@peculiar/webcrypto": "1.4.3",
-    "@quiet/common": "^2.0.1-alpha.3",
-    "@quiet/logger": "^2.0.1-alpha.3",
-    "@quiet/types": "^2.0.1-alpha.3",
+    "@quiet/common": "^2.0.1-alpha.4",
+    "@quiet/logger": "^2.0.1-alpha.4",
+    "@quiet/types": "^2.0.1-alpha.4",
     "@sentry/electron": "^2.5.4",
-    "backend-bundle": "^2.0.1-alpha.3",
+    "backend-bundle": "^2.0.1-alpha.4",
     "electron-debug": "^3.0.1",
     "electron-localshortcut": "^3.2.1",
     "electron-store": "^8.0.1",
@@ -155,9 +155,9 @@
     "@mui/icons-material": "^5.10.15",
     "@mui/lab": "^5.0.0-alpha.109",
     "@mui/material": "~5.10.15",
-    "@quiet/eslint-config": "^2.0.1-alpha.3",
-    "@quiet/identity": "^2.0.1-alpha.3",
-    "@quiet/state-manager": "^2.0.1-alpha.3",
+    "@quiet/eslint-config": "^2.0.1-alpha.4",
+    "@quiet/identity": "^2.0.1-alpha.4",
+    "@quiet/state-manager": "^2.0.1-alpha.6",
     "@redux-saga/types": "^1.1.0",
     "@reduxjs/toolkit": "^1.9.1",
     "@sentry/browser": "^6.19.7",

diff --git a/packages/desktop/src/renderer/components/Settings/Tabs/Invite/Invite.component.test.tsx b/packages/desktop/src/renderer/components/Settings/Tabs/Invite/Invite.component.test.tsx
@@ -76,7 +76,7 @@ describe('CopyLink', () => {
                     class="MuiTypography-root MuiTypography-body2 InviteToCommunitylink css-16d47hw-MuiTypography-root"
                     data-testid="invitation-link"
                   >
-                    •••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••
+                    ••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••
                   </p>
                   <button
                     class="MuiButtonBase-root MuiIconButton-root MuiIconButton-sizeSmall InviteToCommunityeyeIcon css-1pe4mpk-MuiButtonBase-root-MuiIconButton-root"