Merge branch 'develop' into merge/mobile-releasable-to-develop

TryQuiet · Oct 9, 2023 · 06ab121 · 06ab121
2 parents e634868 + e4cdc80
commit 06ab121
Show file tree

Hide file tree

Showing 216 changed files with 4,288 additions and 1,664 deletions.
diff --git a/.github/actions/setup-env/action.yml b/.github/actions/setup-env/action.yml
@@ -51,6 +51,7 @@ runs:
       shell: bash
 
     - name: "Bootstrap project"
+      if: ${{ runner.os != 'Windows' }}
       run: |
         if [[ ! -z "${{ inputs.bootstrap-packages }}" ]]
         then
@@ -59,3 +60,13 @@ runs:
             lerna bootstrap
         fi
       shell: bash
+
+    - name: "Bootstrap project on windows"
+      if: ${{ runner.os == 'Windows' }}
+      run: |
+        if ( "${{ inputs.bootstrap-packages }}" ) {
+          lerna bootstrap --scope '{${{ inputs.bootstrap-packages }},}'
+        } else {
+          lerna bootstrap
+        }
+      shell: powershell
diff --git a/.github/secrets/match_AppStore_comquietmobile.mobileprovision.gpg b/.github/secrets/match_AppStore_comquietmobile.mobileprovision.gpg
diff --git a/.github/workflows/backend-tests.yml b/.github/workflows/backend-tests.yml
@@ -17,7 +17,7 @@ jobs:
       - name: "Print OS"
         run: echo ${{ matrix.os }}
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: "Setup environment"
         uses: ./.github/actions/setup-env
@@ -38,7 +38,7 @@ jobs:
       - name: "Print OS"
         run: echo ${{ matrix.os }}
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: "Setup environment"
         uses: ./.github/actions/setup-env
@@ -59,7 +59,7 @@ jobs:
       - name: "Print OS"
         run: echo ${{ matrix.os }}
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: "Setup environment"
         uses: ./.github/actions/setup-env

diff --git a/.github/workflows/check-desktop-visual-regression.yml b/.github/workflows/check-desktop-visual-regression.yml
@@ -17,7 +17,7 @@ jobs:
       - name: "Print OS"
         run: echo ${{ matrix.os }}
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0 # Required to retrieve git history
 
@@ -31,4 +31,4 @@ jobs:
         with:
           workingDir: ./packages/desktop
           token: ${{ secrets.GH_TOKEN }}
-          projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
+          projectToken: 3218757eee04
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -16,7 +16,7 @@ jobs:
       - name: "Print OS"
         run: echo ${{ matrix.os }}
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: "Remove test files workaround (jest types conflicting with cypress types)"
         if: ${{ runner.os == 'Windows' }}

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -41,11 +41,11 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@a09933a12a80f87b87005513f0abb1494c27a716 # v2.21.4
+        uses: github/codeql-action/init@ddccb873888234080b77e9bc2d4764d5ccaaccf9 # v2.21.9
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -55,7 +55,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@a09933a12a80f87b87005513f0abb1494c27a716 # v2.21.4
+        uses: github/codeql-action/autobuild@ddccb873888234080b77e9bc2d4764d5ccaaccf9 # v2.21.9
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -68,6 +68,6 @@ jobs:
       #   ./location_of_script_within_repo/buildscript.sh
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@a09933a12a80f87b87005513f0abb1494c27a716 # v2.21.4
+        uses: github/codeql-action/analyze@ddccb873888234080b77e9bc2d4764d5ccaaccf9 # v2.21.9
         with:
           category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/depencency-review.yml b/.github/workflows/depencency-review.yml
@@ -17,6 +17,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 'Checkout Repository'
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
       - name: 'Dependency Review'
-        uses: actions/dependency-review-action@0efb1d1d84fc9633afcdaad14c485cbbc90ef46c # v2.5.1
+        uses: actions/dependency-review-action@6c5ccdad469c9f8a2996bfecaec55a631a347034 # v3.1.0
diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
@@ -34,7 +34,7 @@ jobs:
       CHECKSUM_PATH: ${{ github.event.action == 'released' && 'packages/desktop/dist/latest-linux.yml' || 'packages/desktop/dist/alpha-linux.yml' }}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Setup environment
         uses: ./.github/actions/setup-env
@@ -105,7 +105,7 @@ jobs:
       S3_BUCKET: ${{ github.event.action == 'released' && 'quiet' || 'test.quiet' }}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - uses: actions-rs/components-nightly@v1
         with:
@@ -153,7 +153,7 @@ jobs:
 
       - name: Extract version
         id: extract_version
-        uses: Saionaro/extract-package-version@v1.1.1
+        uses: Saionaro/extract-package-version@v1.2.1
         with:
           path: packages/desktop
 
@@ -178,7 +178,7 @@ jobs:
       S3_BUCKET: ${{ github.event.action == 'released' && 'quiet' || 'test.quiet' }}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: "Fetch jsign"
         shell: bash
@@ -217,7 +217,7 @@ jobs:
 
       # - name: E2E - Extract version
       #   id: extract_version
-      #   uses: Saionaro/extract-package-version@v1.1.1
+      #   uses: Saionaro/extract-package-version@v1.2.1
       #   with:
       #     path: packages/desktop
 
@@ -274,7 +274,7 @@ jobs:
 
       - name: Extract version
         id: extract_version
-        uses: Saionaro/extract-package-version@v1.1.1
+        uses: Saionaro/extract-package-version@v1.2.1
         with:
           path: packages/desktop
 

diff --git a/.github/workflows/desktop-test-scroll.yml b/.github/workflows/desktop-test-scroll.yml
@@ -18,7 +18,7 @@ jobs:
       - name: "Print OS"
         run: echo ${{ matrix.os }}
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Setup environment
         uses: ./.github/actions/setup-env
@@ -31,14 +31,14 @@ jobs:
       - name: "Remove test files workaround"
         run: find packages/desktop/src -name '*.test.*' -delete && find packages/backend/src -name '*.test.*' -delete
 
-      - uses: cypress-io/github-action@v2
+      - uses: cypress-io/github-action@v6
         with:
           install: false
           command: npm run regression-test:ci
           working-directory: packages/desktop
 
       - name: Archive test screenshots
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         if: always()
         with:
           name: test-screenshots-linux

diff --git a/.github/workflows/desktop-tests.yml b/.github/workflows/desktop-tests.yml
@@ -18,7 +18,7 @@ jobs:
       - name: "Print OS"
         run: echo ${{ matrix.os }}
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: "Setup environment"
         uses: ./.github/actions/setup-env

diff --git a/.github/workflows/e2e-linux.yml b/.github/workflows/e2e-linux.yml
@@ -18,7 +18,7 @@ jobs:
       TEST_MODE: true
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Install WM
         run: sudo apt install fluxbox
@@ -53,12 +53,12 @@ jobs:
           max_attempts: 3
           command: cd packages/e2e-tests && npm run test oneClient.test.ts
 
-      - name: Run two clients test
+      - name: Run multiple clients test
         uses: nick-fields/retry@v2
         with:
           timeout_minutes: 25
           max_attempts: 3
-          command: cd packages/e2e-tests && npm run test twoClients.test.ts
+          command: cd packages/e2e-tests && npm run test multipleClients.test.ts
 
       - name: Run invitation link test - Includes 2 separate application clients
         uses: nick-fields/retry@v2

diff --git a/.github/workflows/e2e-mac.yml b/.github/workflows/e2e-mac.yml
@@ -11,7 +11,7 @@ jobs:
       IS_E2E: true
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: "Setup environment"
         uses: ./.github/actions/setup-env
@@ -61,11 +61,11 @@ jobs:
           max_attempts: 3
           command: cd packages/e2e-tests && npm run test oneClient.test.ts
 
-      - name: Run two clients test
+      - name: Run multiple clients test
         uses: nick-fields/retry@v2
         with:
           timeout_minutes: 25
           max_attempts: 3
-          command: cd packages/e2e-tests && npm run test twoClients.test.ts
+          command: cd packages/e2e-tests && npm run test multipleClients.test.ts
 
 
diff --git a/.github/workflows/e2e-win.yml b/.github/workflows/e2e-win.yml
@@ -13,7 +13,7 @@ jobs:
       E2E: true
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: "Setup environment"
         uses: ./.github/actions/setup-env
@@ -41,7 +41,7 @@ jobs:
 
       - name: Extract version
         id: extract_version
-        uses: Saionaro/extract-package-version@v1.1.1
+        uses: Saionaro/extract-package-version@v1.2.1
         with:
           path: packages/desktop
 
@@ -56,7 +56,7 @@ jobs:
         shell: bash
 
       - name: "Upload built app"
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: quiet-windows
           path: ./packages/desktop/dist/Quiet Setup ${{ steps.extract_version.outputs.version }}.exe
@@ -68,11 +68,11 @@ jobs:
         shell: powershell
 
       - name: Kill Quiet
-        run: Stop-Process -Name "Quiet" -Force
+        run: Get-Process -Name "Quiet" -ErrorAction SilentlyContinue | Stop-Process -Force
         shell: powershell
 
       - name: Kill tor
-        run: Stop-Process -Name "tor" -Force
+        run: Get-Process -Name "tor" -ErrorAction SilentlyContinue | Stop-Process -Force
         shell: powershell
 
       - name: Delay
@@ -87,13 +87,13 @@ jobs:
           shell: bash
           command: cd packages/e2e-tests && npm run test oneClient.test.ts
 
-      - name: Run two clients test
+      - name: Run multiple clients test
         uses: nick-fields/retry@v2
         with:
           timeout_minutes: 30
           max_attempts: 3
           shell: bash
-          command: cd packages/e2e-tests && npm run test twoClients.test.ts
+          command: cd packages/e2e-tests && npm run test multipleClients.test.ts
 
       - name: Run invitation link test - Includes 2 separate application clients
         uses: nick-fields/retry@v2

diff --git a/.github/workflows/identity-tests.yml b/.github/workflows/identity-tests.yml
@@ -18,7 +18,7 @@ jobs:
       - name: "Print OS"
         run: echo ${{ matrix.os }}
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: "Setup environment"
         uses: ./.github/actions/setup-env

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -20,7 +20,7 @@ jobs:
       - name: 'Print OS'
         run: echo ${{ matrix.os }}
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: "Setup environment"
         uses: ./.github/actions/setup-env

diff --git a/.github/workflows/mobile-deploy-android.yaml b/.github/workflows/mobile-deploy-android.yaml
@@ -19,7 +19,7 @@ jobs:
       - name: "Print OS"
         run: echo ${{ matrix.os }}
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: "Set up JDK"
         uses: actions/setup-java@v3
@@ -65,7 +65,7 @@ jobs:
 
       - name: "Upload Artifact"
         continue-on-error: true
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: app-standard-release.aab
           path: ./packages/mobile/android/app/build/outputs/bundle/standardRelease/app-standard-release.aab

diff --git a/.github/workflows/mobile-deploy-ios.yml b/.github/workflows/mobile-deploy-ios.yml
@@ -19,7 +19,7 @@ jobs:
       - name: "Print OS"
         run: echo ${{ matrix.os }}
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           lfs: true
 
@@ -70,7 +70,7 @@ jobs:
             -exportPath build/
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: Quiet.ipa
           path: ./packages/mobile/ios/build/Quiet.ipa

diff --git a/.github/workflows/mobile-tests.yml b/.github/workflows/mobile-tests.yml
@@ -18,7 +18,7 @@ jobs:
       - name: "Print OS"
         run: echo ${{ matrix.os }}
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Setup environment
         uses: ./.github/actions/setup-env

diff --git a/.github/workflows/state-manager-tests.yml b/.github/workflows/state-manager-tests.yml
@@ -18,7 +18,7 @@ jobs:
       - name: "Print OS"
         run: echo ${{ matrix.os }}
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: "Setup environment"
         uses: ./.github/actions/setup-env