From 3e6762a2115faefef09a08a78d253907ed5e9a0d Mon Sep 17 00:00:00 2001
From: Kacper Michalik <kacper.michalik@rumblefish.pl>
Date: Tue, 8 Aug 2023 13:05:36 +0200
Subject: [PATCH 01/14] initial changes

---
 .github/workflows/e2e-crossplatform.yml       |   7 +
 .../e2e-tests/src/tests/twoClients.test.ts    | 189 +++++++++---------
 2 files changed, 102 insertions(+), 94 deletions(-)

diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml
index dc8e984858..f251a59f0c 100644
--- a/.github/workflows/e2e-crossplatform.yml
+++ b/.github/workflows/e2e-crossplatform.yml
@@ -100,6 +100,13 @@ jobs:
           shell: bash
           command: cd packages/e2e-tests && npm run test oneClient.test.ts
 
+
+      - name: Run two 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
       #   # Old prod version
       # - name: Rename latest quiet
       #   run: cd $env:LOCALAPPDATA/programs; rename-item quiet quiet2
diff --git a/packages/e2e-tests/src/tests/twoClients.test.ts b/packages/e2e-tests/src/tests/twoClients.test.ts
index fdfac53c38..1104445f8d 100644
--- a/packages/e2e-tests/src/tests/twoClients.test.ts
+++ b/packages/e2e-tests/src/tests/twoClients.test.ts
@@ -250,104 +250,105 @@ describe('Two Clients', () => {
       const channels = await sidebar.getChannelList()
       expect(channels.length).toEqual(2)
     })
-
-    it('Leave community', async () => {
-      console.log('TEST 2')
-      const settingsModal = await new Sidebar(guestApp.driver).openSettings()
-      const isSettingsModal = await settingsModal.element.isDisplayed()
-      expect(isSettingsModal).toBeTruthy()
-      await settingsModal.openLeaveCommunityModal()
-      await settingsModal.leaveCommunityButton()
-    })
-    if (process.env.TEST_MODE) {
-      it('Leave community - Close debug modal', async () => {
-        const debugModal = new DebugModeModal(guestApp.driver)
-        await debugModal.close()
+    if (process.platform !== 'win32') {
+      it('Leave community', async () => {
+        console.log('TEST 2')
+        const settingsModal = await new Sidebar(guestApp.driver).openSettings()
+        const isSettingsModal = await settingsModal.element.isDisplayed()
+        expect(isSettingsModal).toBeTruthy()
+        await settingsModal.openLeaveCommunityModal()
+        await settingsModal.leaveCommunityButton()
+      })
+      if (process.env.TEST_MODE) {
+        it('Leave community - Close debug modal', async () => {
+          const debugModal = new DebugModeModal(guestApp.driver)
+          await debugModal.close()
+        })
+      }
+      // Delete general channel while guest is absent
+      it('Channel deletion - Owner recreate general channel', async () => {
+        console.log('TEST 3')
+        await new Promise<void>(resolve => setTimeout(() => resolve(), 10000))
+        const isGeneralChannel = await generalChannel.messageInput.isDisplayed()
+        expect(isGeneralChannel).toBeTruthy()
+        await channelContextMenu.openMenu()
+        await channelContextMenu.openDeletionChannelModal()
+        await channelContextMenu.deleteChannel()
+        const channels = await sidebar.getChannelList()
+        expect(channels.length).toEqual(2)
       })
-    }
-    // Delete general channel while guest is absent
-    it('Channel deletion - Owner recreate general channel', async () => {
-      console.log('TEST 3')
-      await new Promise<void>(resolve => setTimeout(() => resolve(), 10000))
-      const isGeneralChannel = await generalChannel.messageInput.isDisplayed()
-      expect(isGeneralChannel).toBeTruthy()
-      await channelContextMenu.openMenu()
-      await channelContextMenu.openDeletionChannelModal()
-      await channelContextMenu.deleteChannel()
-      const channels = await sidebar.getChannelList()
-      expect(channels.length).toEqual(2)
-    })
 
-    it('Leave community - Guest re-join to community successfully', async () => {
-      console.log('TEST 4')
-      const joinCommunityModal = new JoinCommunityModal(guestApp.driver)
-      const isJoinCommunityModal = await joinCommunityModal.element.isDisplayed()
-      expect(isJoinCommunityModal).toBeTruthy()
-      await joinCommunityModal.typeCommunityCode(invitationCode)
-      await joinCommunityModal.submit()
-    })
-    it('Leave community - Guest register new username', async () => {
-      console.log('TEST 5')
-      const registerModal2 = new RegisterUsernameModal(guestApp.driver)
-      const isRegisterModal2 = await registerModal2.element.isDisplayed()
-      expect(isRegisterModal2).toBeTruthy()
-      await registerModal2.typeUsername(joiningUserUsername2)
-      await registerModal2.submit()
-    })
+      it('Leave community - Guest re-join to community successfully', async () => {
+        console.log('TEST 4')
+        const joinCommunityModal = new JoinCommunityModal(guestApp.driver)
+        const isJoinCommunityModal = await joinCommunityModal.element.isDisplayed()
+        expect(isJoinCommunityModal).toBeTruthy()
+        await joinCommunityModal.typeCommunityCode(invitationCode)
+        await joinCommunityModal.submit()
+      })
+      it('Leave community - Guest register new username', async () => {
+        console.log('TEST 5')
+        const registerModal2 = new RegisterUsernameModal(guestApp.driver)
+        const isRegisterModal2 = await registerModal2.element.isDisplayed()
+        expect(isRegisterModal2).toBeTruthy()
+        await registerModal2.typeUsername(joiningUserUsername2)
+        await registerModal2.submit()
+      })
 
-    // Check correct channels replication
-    it('Channel deletion - User see information about recreation general channel and see correct amount of messages', async () => {
-      console.log('TEST 6')
-      generalChannel2 = new Channel(guestApp.driver, 'general')
-      await generalChannel2.element.isDisplayed()
-      await new Promise<void>(resolve =>
-        setTimeout(() => {
-          resolve()
-        }, 10000)
-      )
-      const messages = await generalChannel2.getUserMessages(ownerUsername)
-      const text1 = await messages[0].getText()
-      const text2 = await messages[1].getText()
-      expect(messages.length).toEqual(2)
-      expect(text1).toEqual(`@${ownerUsername} deleted all messages in #general`)
-      expect(text2).toEqual(`@${joiningUserUsername2} has joined Testcommunity! 🎉`)
-    })
+      // Check correct channels replication
+      it('Channel deletion - User see information about recreation general channel and see correct amount of messages', async () => {
+        console.log('TEST 6')
+        generalChannel2 = new Channel(guestApp.driver, 'general')
+        await generalChannel2.element.isDisplayed()
+        await new Promise<void>(resolve =>
+          setTimeout(() => {
+            resolve()
+          }, 10000)
+        )
+        const messages = await generalChannel2.getUserMessages(ownerUsername)
+        const text1 = await messages[0].getText()
+        const text2 = await messages[1].getText()
+        expect(messages.length).toEqual(2)
+        expect(text1).toEqual(`@${ownerUsername} deleted all messages in #general`)
+        expect(text2).toEqual(`@${joiningUserUsername2} has joined Testcommunity! 🎉`)
+      })
 
-    it('Leave community - Guest sends a message', async () => {
-      console.log('TEST 7')
-      generalChannel2 = new Channel(guestApp.driver, 'general')
-      await generalChannel2.element.isDisplayed()
-      const isMessageInput2 = await generalChannel2.messageInput.isDisplayed()
-      expect(isMessageInput2).toBeTruthy()
-      await new Promise<void>(resolve =>
-        setTimeout(() => {
-          resolve()
-        }, 5000)
-      )
-      await generalChannel2.sendMessage(joiningUserMessages[1])
-    })
-    it('Leave community - Sent message is visible in a channel', async () => {
-      console.log('TEST 8')
-      const messages2 = await generalChannel2.getUserMessages(joiningUserUsername2)
-      const text2 = await messages2[0].getText()
-      expect(text2).toEqual(joiningUserMessages[1])
-    })
+      it('Leave community - Guest sends a message', async () => {
+        console.log('TEST 7')
+        generalChannel2 = new Channel(guestApp.driver, 'general')
+        await generalChannel2.element.isDisplayed()
+        const isMessageInput2 = await generalChannel2.messageInput.isDisplayed()
+        expect(isMessageInput2).toBeTruthy()
+        await new Promise<void>(resolve =>
+          setTimeout(() => {
+            resolve()
+          }, 5000)
+        )
+        await generalChannel2.sendMessage(joiningUserMessages[1])
+      })
+      it('Leave community - Sent message is visible in a channel', async () => {
+        console.log('TEST 8')
+        const messages2 = await generalChannel2.getUserMessages(joiningUserUsername2)
+        const text2 = await messages2[0].getText()
+        expect(text2).toEqual(joiningUserMessages[1])
+      })
 
-    it('Guest close app', async () => {
-      console.log('TEST 9')
-      await guestApp?.close()
-    })
-    it('Guest close app - Owner send another message after guest leave app', async () => {
-      console.log('TEST 10')
-      const isMessageInput = await generalChannel.messageInput.isDisplayed()
-      expect(isMessageInput).toBeTruthy()
-      await generalChannel.sendMessage(ownerMessages[2])
-    })
-    it('Guest close app - Check if message is visible for owner', async () => {
-      console.log('TEST 11')
-      const messages = await generalChannel.getUserMessages(ownerUsername)
-      const text = await messages[messages.length - 1].getText()
-      expect(text).toEqual(ownerMessages[2])
-    })
+      it('Guest close app', async () => {
+        console.log('TEST 9')
+        await guestApp?.close()
+      })
+      it('Guest close app - Owner send another message after guest leave app', async () => {
+        console.log('TEST 10')
+        const isMessageInput = await generalChannel.messageInput.isDisplayed()
+        expect(isMessageInput).toBeTruthy()
+        await generalChannel.sendMessage(ownerMessages[2])
+      })
+      it('Guest close app - Check if message is visible for owner', async () => {
+        console.log('TEST 11')
+        const messages = await generalChannel.getUserMessages(ownerUsername)
+        const text = await messages[messages.length - 1].getText()
+        expect(text).toEqual(ownerMessages[2])
+      })
+    }
   })
 })

From d08356747a5ceda4b5ce5f9c92e9c918490ccc20 Mon Sep 17 00:00:00 2001
From: Kacper Michalik <kacper.michalik@rumblefish.pl>
Date: Tue, 8 Aug 2023 13:30:17 +0200
Subject: [PATCH 02/14] bash

---
 .github/workflows/e2e-crossplatform.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml
index f251a59f0c..aaf5f41ff1 100644
--- a/.github/workflows/e2e-crossplatform.yml
+++ b/.github/workflows/e2e-crossplatform.yml
@@ -106,6 +106,7 @@ jobs:
         with:
           timeout_minutes: 25
           max_attempts: 3
+          shell: bash
           command: cd packages/e2e-tests && npm run test twoClients.test.ts
       #   # Old prod version
       # - name: Rename latest quiet

From 56a0e1fbad8f99a255f7eaae779f003bd536fc4a Mon Sep 17 00:00:00 2001
From: Kacper Michalik <kacper.michalik@rumblefish.pl>
Date: Wed, 9 Aug 2023 09:08:39 +0200
Subject: [PATCH 03/14] add invitation test and more time for windows steps

---
 .github/workflows/e2e-crossplatform.yml         |  9 ++++++++-
 packages/e2e-tests/src/tests/twoClients.test.ts | 10 ++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml
index aaf5f41ff1..30d25a5f9c 100644
--- a/.github/workflows/e2e-crossplatform.yml
+++ b/.github/workflows/e2e-crossplatform.yml
@@ -100,7 +100,6 @@ jobs:
           shell: bash
           command: cd packages/e2e-tests && npm run test oneClient.test.ts
 
-
       - name: Run two clients test
         uses: nick-fields/retry@v2
         with:
@@ -108,6 +107,14 @@ jobs:
           max_attempts: 3
           shell: bash
           command: cd packages/e2e-tests && npm run test twoClients.test.ts
+
+      - name: Run invitation link test - Includes 2 separate application clients
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 25
+          max_attempts: 3
+          shell: bash
+          command: cd packages/e2e-tests && npm run test invitationLink.test.ts
       #   # Old prod version
       # - name: Rename latest quiet
       #   run: cd $env:LOCALAPPDATA/programs; rename-item quiet quiet2
diff --git a/packages/e2e-tests/src/tests/twoClients.test.ts b/packages/e2e-tests/src/tests/twoClients.test.ts
index 1104445f8d..9c239ed461 100644
--- a/packages/e2e-tests/src/tests/twoClients.test.ts
+++ b/packages/e2e-tests/src/tests/twoClients.test.ts
@@ -49,6 +49,16 @@ describe('Two Clients', () => {
     await ownerApp?.close()
   })
 
+  afterEach(async () => {
+    if (process.platform !== 'win32') {
+      await new Promise<void>(resolve =>
+        setTimeout(() => {
+          resolve()
+        }, 5000)
+      )
+    }
+  })
+
   describe('Stages:', () => {
     it('Owner opens the app', async () => {
       await ownerApp.open()

From e839ad1940c83eca8d233843e5edfc66d338da31 Mon Sep 17 00:00:00 2001
From: Kacper Michalik <kacper.michalik@rumblefish.pl>
Date: Wed, 9 Aug 2023 09:49:46 +0200
Subject: [PATCH 04/14] time on win32

---
 packages/e2e-tests/src/tests/twoClients.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/e2e-tests/src/tests/twoClients.test.ts b/packages/e2e-tests/src/tests/twoClients.test.ts
index 9c239ed461..cb9384e017 100644
--- a/packages/e2e-tests/src/tests/twoClients.test.ts
+++ b/packages/e2e-tests/src/tests/twoClients.test.ts
@@ -50,7 +50,7 @@ describe('Two Clients', () => {
   })
 
   afterEach(async () => {
-    if (process.platform !== 'win32') {
+    if (process.platform === 'win32') {
       await new Promise<void>(resolve =>
         setTimeout(() => {
           resolve()

From 2c802462b6e7033d0bbba31f24fc0714b2ea534d Mon Sep 17 00:00:00 2001
From: Kacper Michalik <kacper.michalik@rumblefish.pl>
Date: Wed, 9 Aug 2023 11:35:21 +0200
Subject: [PATCH 05/14] lower delay

---
 packages/e2e-tests/src/tests/twoClients.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/e2e-tests/src/tests/twoClients.test.ts b/packages/e2e-tests/src/tests/twoClients.test.ts
index cb9384e017..2675801216 100644
--- a/packages/e2e-tests/src/tests/twoClients.test.ts
+++ b/packages/e2e-tests/src/tests/twoClients.test.ts
@@ -54,7 +54,7 @@ describe('Two Clients', () => {
       await new Promise<void>(resolve =>
         setTimeout(() => {
           resolve()
-        }, 5000)
+        }, 1000)
       )
     }
   })

From fec701c5d194282873095c3b9d33cff69756354e Mon Sep 17 00:00:00 2001
From: Kacper Michalik <kacper.michalik@rumblefish.pl>
Date: Wed, 9 Aug 2023 11:43:22 +0200
Subject: [PATCH 06/14] try to build windows without envs

---
 .github/workflows/e2e-crossplatform.yml | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml
index 30d25a5f9c..c1f25806b6 100644
--- a/.github/workflows/e2e-crossplatform.yml
+++ b/.github/workflows/e2e-crossplatform.yml
@@ -26,14 +26,6 @@ jobs:
         shell: bash
         run: cd packages/desktop && curl https://zbay-binaries.s3.us-east-2.amazonaws.com/jsign/jsign-2.1.jar --output ./jsign-2.1.jar
 
-
-      - name: "Add Windows certificate"
-        id: write_file
-        uses: TryQuiet/base64-to-file@main
-        with:
-          fileName: 'win-certificate.pfx'
-          encodedString: ${{ secrets.WIN_CSC_LINK }}
-
       - name: "Remove test files workaround (jest types conflicting with cypress types)"
         run: find packages/desktop/src -name '*.test.*' -delete
         shell: bash
@@ -45,9 +37,9 @@ jobs:
 
       - name: electron-builder
         env:
-          CERTIFICATE_PATH: ${{ steps.write_file.outputs.filePath }}
-          WIN_CSC_KEY_PASSWORD: ${{ secrets.WIN_CSC_KEY_PASSWORD }}
-          WINDOWS_ALIAS: ${{ secrets.WIN_ALIAS }}
+          CERTIFICATE_PATH: test
+          WIN_CSC_KEY_PASSWORD: test
+          WINDOWS_ALIAS: test
         working-directory: ./packages/desktop
         run: node_modules/.bin/electron-builder --win 
         shell: bash

From c21db70793ba4e898c6b0ecabaa20a02859a688f Mon Sep 17 00:00:00 2001
From: Kacper Michalik <kacper.michalik@rumblefish.pl>
Date: Wed, 9 Aug 2023 12:14:37 +0200
Subject: [PATCH 07/14] try to off sigining on windows

---
 .github/workflows/e2e-crossplatform.yml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml
index c1f25806b6..286b7f4ff2 100644
--- a/.github/workflows/e2e-crossplatform.yml
+++ b/.github/workflows/e2e-crossplatform.yml
@@ -26,6 +26,14 @@ jobs:
         shell: bash
         run: cd packages/desktop && curl https://zbay-binaries.s3.us-east-2.amazonaws.com/jsign/jsign-2.1.jar --output ./jsign-2.1.jar
 
+
+      - name: "Add Windows certificate"
+        id: write_file
+        uses: TryQuiet/base64-to-file@main
+        with:
+          fileName: 'win-certificate.pfx'
+          encodedString: ${{ secrets.WIN_CSC_LINK }}
+
       - name: "Remove test files workaround (jest types conflicting with cypress types)"
         run: find packages/desktop/src -name '*.test.*' -delete
         shell: bash
@@ -37,9 +45,7 @@ jobs:
 
       - name: electron-builder
         env:
-          CERTIFICATE_PATH: test
-          WIN_CSC_KEY_PASSWORD: test
-          WINDOWS_ALIAS: test
+          CSC_IDENTITY_AUTO_DISCOVERY: false
         working-directory: ./packages/desktop
         run: node_modules/.bin/electron-builder --win 
         shell: bash

From eaea924b4dc4d2427f8ccabde990343042ee6ddf Mon Sep 17 00:00:00 2001
From: Kacper Michalik <kacper.michalik@rumblefish.pl>
Date: Wed, 9 Aug 2023 12:26:46 +0200
Subject: [PATCH 08/14] sign off for windows

---
 .github/workflows/e2e-crossplatform.yml | 12 ++----------
 packages/desktop/package.json           |  2 +-
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml
index 286b7f4ff2..cf8b373cde 100644
--- a/.github/workflows/e2e-crossplatform.yml
+++ b/.github/workflows/e2e-crossplatform.yml
@@ -26,14 +26,6 @@ jobs:
         shell: bash
         run: cd packages/desktop && curl https://zbay-binaries.s3.us-east-2.amazonaws.com/jsign/jsign-2.1.jar --output ./jsign-2.1.jar
 
-
-      - name: "Add Windows certificate"
-        id: write_file
-        uses: TryQuiet/base64-to-file@main
-        with:
-          fileName: 'win-certificate.pfx'
-          encodedString: ${{ secrets.WIN_CSC_LINK }}
-
       - name: "Remove test files workaround (jest types conflicting with cypress types)"
         run: find packages/desktop/src -name '*.test.*' -delete
         shell: bash
@@ -44,13 +36,13 @@ jobs:
           source-path: win32
 
       - name: electron-builder
-        env:
-          CSC_IDENTITY_AUTO_DISCOVERY: false
         working-directory: ./packages/desktop
         run: node_modules/.bin/electron-builder --win 
         shell: bash
 
       - name: Extract version
+        env:
+          CSC_IDENTITY_AUTO_DISCOVERY: false
         id: extract_version
         uses: Saionaro/extract-package-version@v1.1.1
         with:
diff --git a/packages/desktop/package.json b/packages/desktop/package.json
index d91667e1d6..2ee5fbf8f9 100644
--- a/packages/desktop/package.json
+++ b/packages/desktop/package.json
@@ -33,7 +33,7 @@
     "win": {
       "icon": "./build/icon.png",
       "target": "NSIS",
-      "sign": "scripts/sign.js",
+      "sign": null,
       "files": [
         "dist/**/*",
         "build/icon.*",

From 9e7a30e24b8bd95430d1515ed6d719990dee92f9 Mon Sep 17 00:00:00 2001
From: Kacper Michalik <kacper.michalik@rumblefish.pl>
Date: Wed, 9 Aug 2023 13:43:01 +0200
Subject: [PATCH 09/14] no sign for e2e workflow

---
 .github/workflows/e2e-crossplatform.yml | 18 +-----------------
 packages/desktop/package.json           |  2 +-
 packages/desktop/scripts/sign.js        |  6 +++++-
 3 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml
index cf8b373cde..89daa280b6 100644
--- a/.github/workflows/e2e-crossplatform.yml
+++ b/.github/workflows/e2e-crossplatform.yml
@@ -12,6 +12,7 @@ jobs:
     env:
       ELECTRON_CUSTOM_VERSION: 23.0.0
       TEST_MODE: true
+      E2E: true
 
     steps:
       - uses: actions/checkout@v2
@@ -41,8 +42,6 @@ jobs:
         shell: bash
 
       - name: Extract version
-        env:
-          CSC_IDENTITY_AUTO_DISCOVERY: false
         id: extract_version
         uses: Saionaro/extract-package-version@v1.1.1
         with:
@@ -90,21 +89,6 @@ jobs:
           shell: bash
           command: cd packages/e2e-tests && npm run test oneClient.test.ts
 
-      - name: Run two clients test
-        uses: nick-fields/retry@v2
-        with:
-          timeout_minutes: 25
-          max_attempts: 3
-          shell: bash
-          command: cd packages/e2e-tests && npm run test twoClients.test.ts
-
-      - name: Run invitation link test - Includes 2 separate application clients
-        uses: nick-fields/retry@v2
-        with:
-          timeout_minutes: 25
-          max_attempts: 3
-          shell: bash
-          command: cd packages/e2e-tests && npm run test invitationLink.test.ts
       #   # Old prod version
       # - name: Rename latest quiet
       #   run: cd $env:LOCALAPPDATA/programs; rename-item quiet quiet2
diff --git a/packages/desktop/package.json b/packages/desktop/package.json
index 2ee5fbf8f9..d91667e1d6 100644
--- a/packages/desktop/package.json
+++ b/packages/desktop/package.json
@@ -33,7 +33,7 @@
     "win": {
       "icon": "./build/icon.png",
       "target": "NSIS",
-      "sign": null,
+      "sign": "scripts/sign.js",
       "files": [
         "dist/**/*",
         "build/icon.*",
diff --git a/packages/desktop/scripts/sign.js b/packages/desktop/scripts/sign.js
index 5d52d7847c..2b3232da14 100644
--- a/packages/desktop/scripts/sign.js
+++ b/packages/desktop/scripts/sign.js
@@ -1,4 +1,8 @@
 exports.default = async function (configuration) {
+  if (process.env.E2E) {
+    console.log('E2E workflow')
+    return
+  }
   console.log('config', configuration.path)
   require('child_process').execSync(
     `java \
@@ -11,7 +15,7 @@ exports.default = async function (configuration) {
     "${configuration.path}"
     `,
     {
-      stdio: 'inherit'
+      stdio: 'inherit',
     }
   )
 }

From 2d92947c2349d9b3abbe77403583e2f6d5f8bf95 Mon Sep 17 00:00:00 2001
From: Kacper Michalik <kacper.michalik@rumblefish.pl>
Date: Wed, 9 Aug 2023 13:51:57 +0200
Subject: [PATCH 10/14] run e2e windows from separate file

---
 .github/workflows/e2e-crossplatform.yml       | 164 +++++++++---------
 .github/workflows/e2e-win.yml                 |  42 +++--
 .../e2e-tests/src/tests/twoClients.test.ts    |   1 +
 3 files changed, 112 insertions(+), 95 deletions(-)

diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml
index 89daa280b6..0d37e67200 100644
--- a/.github/workflows/e2e-crossplatform.yml
+++ b/.github/workflows/e2e-crossplatform.yml
@@ -7,87 +7,89 @@ jobs:
   linux:
     uses: ./.github/workflows/e2e-linux.yml
   windows:
-    runs-on: windows-2019
-    timeout-minutes: 180
-    env:
-      ELECTRON_CUSTOM_VERSION: 23.0.0
-      TEST_MODE: true
-      E2E: true
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: "Setup environment"
-        uses: ./.github/actions/setup-env
-        with:
-          cachePrefix: "e2e-crossplatform-windows"
-          bootstrap-packages: "@quiet/eslint-config,@quiet/logger,@quiet/common,@quiet/types,@quiet/state-manager,@quiet/backend,@quiet/identity,quiet,backend-bundle,e2e-tests"
-
-      - name: "Fetch jsign"
-        shell: bash
-        run: cd packages/desktop && curl https://zbay-binaries.s3.us-east-2.amazonaws.com/jsign/jsign-2.1.jar --output ./jsign-2.1.jar
-
-      - name: "Remove test files workaround (jest types conflicting with cypress types)"
-        run: find packages/desktop/src -name '*.test.*' -delete
-        shell: bash
-
-      - name: Before build
-        uses: ./.github/actions/before-build
-        with:
-          source-path: win32
-
-      - name: electron-builder
-        working-directory: ./packages/desktop
-        run: node_modules/.bin/electron-builder --win 
-        shell: bash
-
-      - name: Extract version
-        id: extract_version
-        uses: Saionaro/extract-package-version@v1.1.1
-        with:
-          path: packages/desktop
-
-      - name: FILE_NAME env
-        working-directory: ./packages/desktop/dist
-        run: echo "FILE_NAME=Quiet Setup ${{ steps.extract_version.outputs.version }}.exe" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
-        shell: powershell
-
-      - name: Chmod
-        working-directory: ./packages/desktop/dist
-        run: chmod +x "$FILE_NAME"
-        shell: bash
-
-      - name: "Upload built app"
-        uses: actions/upload-artifact@v2
-        with:
-          name: quiet-windows
-          path: ./packages/desktop/dist/Quiet Setup ${{ steps.extract_version.outputs.version }}.exe
-          retention-days: 2
-
-      - name: Install exe
-        run: Start-Process "Quiet Setup ${{ steps.extract_version.outputs.version }}.exe" -Wait
-        working-directory: ./packages/desktop/dist
-        shell: powershell
-
-      - name: Kill Quiet
-        run: Stop-Process -Name "Quiet" -Force
-        shell: powershell
-
-      - name: Kill tor
-        run: Stop-Process -Name "tor" -Force
-        shell: powershell
-
-      - name: Delay
-        run: Start-Sleep -Seconds 10
-        shell: powershell
-
-      - name: Run one client test
-        uses: nick-fields/retry@v2
-        with:
-          timeout_minutes: 15
-          max_attempts: 3
-          shell: bash
-          command: cd packages/e2e-tests && npm run test oneClient.test.ts
+    uses: ./.github/workflows/e2e-win.yml
+
+    # runs-on: windows-2019
+    # timeout-minutes: 180
+    # env:
+    #   ELECTRON_CUSTOM_VERSION: 23.0.0
+    #   TEST_MODE: true
+    #   E2E: true
+
+    # steps:
+    #   - uses: actions/checkout@v2
+
+    #   - name: "Setup environment"
+    #     uses: ./.github/actions/setup-env
+    #     with:
+    #       cachePrefix: "e2e-crossplatform-windows"
+    #       bootstrap-packages: "@quiet/eslint-config,@quiet/logger,@quiet/common,@quiet/types,@quiet/state-manager,@quiet/backend,@quiet/identity,quiet,backend-bundle,e2e-tests"
+
+    #   - name: "Fetch jsign"
+    #     shell: bash
+    #     run: cd packages/desktop && curl https://zbay-binaries.s3.us-east-2.amazonaws.com/jsign/jsign-2.1.jar --output ./jsign-2.1.jar
+
+    #   - name: "Remove test files workaround (jest types conflicting with cypress types)"
+    #     run: find packages/desktop/src -name '*.test.*' -delete
+    #     shell: bash
+
+    #   - name: Before build
+    #     uses: ./.github/actions/before-build
+    #     with:
+    #       source-path: win32
+
+    #   - name: electron-builder
+    #     working-directory: ./packages/desktop
+    #     run: node_modules/.bin/electron-builder --win 
+    #     shell: bash
+
+    #   - name: Extract version
+    #     id: extract_version
+    #     uses: Saionaro/extract-package-version@v1.1.1
+    #     with:
+    #       path: packages/desktop
+
+    #   - name: FILE_NAME env
+    #     working-directory: ./packages/desktop/dist
+    #     run: echo "FILE_NAME=Quiet Setup ${{ steps.extract_version.outputs.version }}.exe" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
+    #     shell: powershell
+
+    #   - name: Chmod
+    #     working-directory: ./packages/desktop/dist
+    #     run: chmod +x "$FILE_NAME"
+    #     shell: bash
+
+    #   - name: "Upload built app"
+    #     uses: actions/upload-artifact@v2
+    #     with:
+    #       name: quiet-windows
+    #       path: ./packages/desktop/dist/Quiet Setup ${{ steps.extract_version.outputs.version }}.exe
+    #       retention-days: 2
+
+    #   - name: Install exe
+    #     run: Start-Process "Quiet Setup ${{ steps.extract_version.outputs.version }}.exe" -Wait
+    #     working-directory: ./packages/desktop/dist
+    #     shell: powershell
+
+    #   - name: Kill Quiet
+    #     run: Stop-Process -Name "Quiet" -Force
+    #     shell: powershell
+
+    #   - name: Kill tor
+    #     run: Stop-Process -Name "tor" -Force
+    #     shell: powershell
+
+    #   - name: Delay
+    #     run: Start-Sleep -Seconds 10
+    #     shell: powershell
+
+    #   - name: Run one client test
+    #     uses: nick-fields/retry@v2
+    #     with:
+    #       timeout_minutes: 15
+    #       max_attempts: 3
+    #       shell: bash
+    #       command: cd packages/e2e-tests && npm run test oneClient.test.ts
 
       #   # Old prod version
       # - name: Rename latest quiet
diff --git a/.github/workflows/e2e-win.yml b/.github/workflows/e2e-win.yml
index 3955cc0e8e..d03967a883 100644
--- a/.github/workflows/e2e-win.yml
+++ b/.github/workflows/e2e-win.yml
@@ -8,6 +8,7 @@ jobs:
     env:
       ELECTRON_CUSTOM_VERSION: 23.0.0
       TEST_MODE: true
+      E2E: true
 
     steps:
       - uses: actions/checkout@v2
@@ -22,13 +23,6 @@ jobs:
         shell: bash
         run: cd packages/desktop && curl https://zbay-binaries.s3.us-east-2.amazonaws.com/jsign/jsign-2.1.jar --output ./jsign-2.1.jar
 
-      - name: "Add Windows certificate"
-        id: write_file
-        uses: TryQuiet/base64-to-file@main
-        with:
-          fileName: 'win-certificate.pfx'
-          encodedString: ${{ secrets.WIN_CSC_LINK }}
-
       - name: "Remove test files workaround (jest types conflicting with cypress types)"
         run: find packages/desktop/src -name '*.test.*' -delete
         shell: bash
@@ -39,10 +33,6 @@ jobs:
           source-path: win32
 
       - name: electron-builder
-        env:
-          CERTIFICATE_PATH: ${{ steps.write_file.outputs.filePath }}
-          WIN_CSC_KEY_PASSWORD: ${{ secrets.WIN_CSC_KEY_PASSWORD }}
-          WINDOWS_ALIAS: ${{ secrets.WIN_ALIAS }}
         working-directory: ./packages/desktop
         run: node_modules/.bin/electron-builder --win 
         shell: bash
@@ -63,14 +53,28 @@ jobs:
         run: chmod +x "$FILE_NAME"
         shell: bash
 
+      - name: "Upload built app"
+        uses: actions/upload-artifact@v2
+        with:
+          name: quiet-windows
+          path: ./packages/desktop/dist/Quiet Setup ${{ steps.extract_version.outputs.version }}.exe
+          retention-days: 2
+
       - name: Install exe
         run: Start-Process "Quiet Setup ${{ steps.extract_version.outputs.version }}.exe" -Wait
         working-directory: ./packages/desktop/dist
         shell: powershell
 
-      - name: Kill exe
+      - name: Kill Quiet
         run: Stop-Process -Name "Quiet" -Force
-        working-directory: ./packages/desktop/dist
+        shell: powershell
+
+      - name: Kill tor
+        run: Stop-Process -Name "tor" -Force
+        shell: powershell
+
+      - name: Delay
+        run: Start-Sleep -Seconds 10
         shell: powershell
 
       - name: Run one client test
@@ -78,11 +82,21 @@ jobs:
         with:
           timeout_minutes: 15
           max_attempts: 3
+          shell: bash
           command: cd packages/e2e-tests && npm run test oneClient.test.ts
 
       - name: Run two 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
+
+      - name: Run invitation link test - Includes 2 separate application clients
         uses: nick-fields/retry@v2
         with:
           timeout_minutes: 25
           max_attempts: 3
-          command: cd packages/e2e-tests && npm run test twoClients.test.ts
\ No newline at end of file
+          shell: bash
+          command: cd packages/e2e-tests && npm run test invitationLink.test.ts
\ No newline at end of file
diff --git a/packages/e2e-tests/src/tests/twoClients.test.ts b/packages/e2e-tests/src/tests/twoClients.test.ts
index 2675801216..0d5b9fff01 100644
--- a/packages/e2e-tests/src/tests/twoClients.test.ts
+++ b/packages/e2e-tests/src/tests/twoClients.test.ts
@@ -260,6 +260,7 @@ describe('Two Clients', () => {
       const channels = await sidebar.getChannelList()
       expect(channels.length).toEqual(2)
     })
+    // End of tests for Windows
     if (process.platform !== 'win32') {
       it('Leave community', async () => {
         console.log('TEST 2')

From 5f200efbd8863691ded9277be34ad31468447d1d Mon Sep 17 00:00:00 2001
From: Kacper Michalik <kacper.michalik@rumblefish.pl>
Date: Wed, 9 Aug 2023 14:54:01 +0200
Subject: [PATCH 11/14] cleanup

---
 .github/workflows/e2e-crossplatform.yml       | 118 +-----------------
 packages/desktop/scripts/sign.js              |   2 +-
 .../e2e-tests/src/tests/twoClients.test.ts    |  10 --
 3 files changed, 2 insertions(+), 128 deletions(-)

diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml
index 0d37e67200..42f4065efb 100644
--- a/.github/workflows/e2e-crossplatform.yml
+++ b/.github/workflows/e2e-crossplatform.yml
@@ -8,120 +8,4 @@ jobs:
     uses: ./.github/workflows/e2e-linux.yml
   windows:
     uses: ./.github/workflows/e2e-win.yml
-
-    # runs-on: windows-2019
-    # timeout-minutes: 180
-    # env:
-    #   ELECTRON_CUSTOM_VERSION: 23.0.0
-    #   TEST_MODE: true
-    #   E2E: true
-
-    # steps:
-    #   - uses: actions/checkout@v2
-
-    #   - name: "Setup environment"
-    #     uses: ./.github/actions/setup-env
-    #     with:
-    #       cachePrefix: "e2e-crossplatform-windows"
-    #       bootstrap-packages: "@quiet/eslint-config,@quiet/logger,@quiet/common,@quiet/types,@quiet/state-manager,@quiet/backend,@quiet/identity,quiet,backend-bundle,e2e-tests"
-
-    #   - name: "Fetch jsign"
-    #     shell: bash
-    #     run: cd packages/desktop && curl https://zbay-binaries.s3.us-east-2.amazonaws.com/jsign/jsign-2.1.jar --output ./jsign-2.1.jar
-
-    #   - name: "Remove test files workaround (jest types conflicting with cypress types)"
-    #     run: find packages/desktop/src -name '*.test.*' -delete
-    #     shell: bash
-
-    #   - name: Before build
-    #     uses: ./.github/actions/before-build
-    #     with:
-    #       source-path: win32
-
-    #   - name: electron-builder
-    #     working-directory: ./packages/desktop
-    #     run: node_modules/.bin/electron-builder --win 
-    #     shell: bash
-
-    #   - name: Extract version
-    #     id: extract_version
-    #     uses: Saionaro/extract-package-version@v1.1.1
-    #     with:
-    #       path: packages/desktop
-
-    #   - name: FILE_NAME env
-    #     working-directory: ./packages/desktop/dist
-    #     run: echo "FILE_NAME=Quiet Setup ${{ steps.extract_version.outputs.version }}.exe" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
-    #     shell: powershell
-
-    #   - name: Chmod
-    #     working-directory: ./packages/desktop/dist
-    #     run: chmod +x "$FILE_NAME"
-    #     shell: bash
-
-    #   - name: "Upload built app"
-    #     uses: actions/upload-artifact@v2
-    #     with:
-    #       name: quiet-windows
-    #       path: ./packages/desktop/dist/Quiet Setup ${{ steps.extract_version.outputs.version }}.exe
-    #       retention-days: 2
-
-    #   - name: Install exe
-    #     run: Start-Process "Quiet Setup ${{ steps.extract_version.outputs.version }}.exe" -Wait
-    #     working-directory: ./packages/desktop/dist
-    #     shell: powershell
-
-    #   - name: Kill Quiet
-    #     run: Stop-Process -Name "Quiet" -Force
-    #     shell: powershell
-
-    #   - name: Kill tor
-    #     run: Stop-Process -Name "tor" -Force
-    #     shell: powershell
-
-    #   - name: Delay
-    #     run: Start-Sleep -Seconds 10
-    #     shell: powershell
-
-    #   - name: Run one client test
-    #     uses: nick-fields/retry@v2
-    #     with:
-    #       timeout_minutes: 15
-    #       max_attempts: 3
-    #       shell: bash
-    #       command: cd packages/e2e-tests && npm run test oneClient.test.ts
-
-      #   # Old prod version
-      # - name: Rename latest quiet
-      #   run: cd $env:LOCALAPPDATA/programs; rename-item quiet quiet2
-      #   shell: powershell
-
-      # - name: Download EXE
-      #   run: curl -LO https://github.com/TryQuiet/quiet/releases/download/quiet%401.2.0/Quiet.Setup.1.2.0.exe
-      #   shell: bash
-
-      # - name: Chmod
-      #   run: chmod +x Quiet.Setup.1.2.0.exe
-      #   shell: bash
-
-      # - name: Install exe
-      #   run: Start-Process Quiet.Setup.1.2.0.exe -Wait
-      #   shell: powershell
-
-      # - name: Kill Quiet
-      #   run: Stop-Process -Name "Quiet" -Force
-      #   shell: powershell
-
-      # - name: Kill tor
-      #   run: Stop-Process -Name "tor" -Force
-      #   shell: powershell
-
-      # - name: Delay
-      #   run: Start-Sleep -Seconds 10
-      #   shell: powershell
-      #   # Old prod version
-
-      # - name: Run Backwards Compatibility test
-      #   working-directory: ./packages/e2e-tests
-      #   run: npm run test backwardsCompatibility.test.ts
-
+    
diff --git a/packages/desktop/scripts/sign.js b/packages/desktop/scripts/sign.js
index 2b3232da14..834eabf106 100644
--- a/packages/desktop/scripts/sign.js
+++ b/packages/desktop/scripts/sign.js
@@ -1,6 +1,6 @@
 exports.default = async function (configuration) {
   if (process.env.E2E) {
-    console.log('E2E workflow')
+    console.log('E2E workflow - no need to sign')
     return
   }
   console.log('config', configuration.path)
diff --git a/packages/e2e-tests/src/tests/twoClients.test.ts b/packages/e2e-tests/src/tests/twoClients.test.ts
index 0d5b9fff01..b8b20d953d 100644
--- a/packages/e2e-tests/src/tests/twoClients.test.ts
+++ b/packages/e2e-tests/src/tests/twoClients.test.ts
@@ -49,16 +49,6 @@ describe('Two Clients', () => {
     await ownerApp?.close()
   })
 
-  afterEach(async () => {
-    if (process.platform === 'win32') {
-      await new Promise<void>(resolve =>
-        setTimeout(() => {
-          resolve()
-        }, 1000)
-      )
-    }
-  })
-
   describe('Stages:', () => {
     it('Owner opens the app', async () => {
       await ownerApp.open()

From 3d6ef7e572b8a1a1e3b77e9929594292e573c646 Mon Sep 17 00:00:00 2001
From: Kacper Michalik <kacper.michalik@rumblefish.pl>
Date: Wed, 9 Aug 2023 16:10:15 +0200
Subject: [PATCH 12/14] delay 1sec before each step

---
 packages/e2e-tests/src/tests/twoClients.test.ts | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/packages/e2e-tests/src/tests/twoClients.test.ts b/packages/e2e-tests/src/tests/twoClients.test.ts
index b8b20d953d..7cb7de0fb5 100644
--- a/packages/e2e-tests/src/tests/twoClients.test.ts
+++ b/packages/e2e-tests/src/tests/twoClients.test.ts
@@ -41,6 +41,13 @@ describe('Two Clients', () => {
   const joiningUserMessages = ['Nice to meet you all', 'Nice to meet you again']
   const newChannelName = 'mid-night-club'
 
+  const sleep = async (time = 1000) =>
+    await new Promise<void>(resolve =>
+      setTimeout(() => {
+        resolve()
+      }, time)
+    )
+
   beforeAll(async () => {
     ownerApp = new App()
   })
@@ -49,6 +56,10 @@ describe('Two Clients', () => {
     await ownerApp?.close()
   })
 
+  beforeEach(async () => {
+    await sleep(1000)
+  })
+
   describe('Stages:', () => {
     it('Owner opens the app', async () => {
       await ownerApp.open()

From da8c878386919f8b286fc3c9ab56b6504dd663f1 Mon Sep 17 00:00:00 2001
From: Emi <emilia.marczyk@rumblefish.pl>
Date: Thu, 10 Aug 2023 15:15:10 +0200
Subject: [PATCH 13/14] Potential fix for heisenbug - empty redux store for
 messages in public channels

---
 .../publicChannels/publicChannels.transform.ts     | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/packages/state-manager/src/sagas/publicChannels/publicChannels.transform.ts b/packages/state-manager/src/sagas/publicChannels/publicChannels.transform.ts
index d5beea6604..9dc48960dd 100644
--- a/packages/state-manager/src/sagas/publicChannels/publicChannels.transform.ts
+++ b/packages/state-manager/src/sagas/publicChannels/publicChannels.transform.ts
@@ -1,4 +1,9 @@
-import { type ChannelMessage, type PublicChannelStatus, type PublicChannelStorage } from '@quiet/types'
+import {
+  INITIAL_CURRENT_CHANNEL_ID,
+  type ChannelMessage,
+  type PublicChannelStatus,
+  type PublicChannelStorage,
+} from '@quiet/types'
 import { type Dictionary, type EntityState } from '@reduxjs/toolkit'
 import { createTransform } from 'redux-persist'
 import { StoreKeys } from '../store.keys'
@@ -10,6 +15,7 @@ export const PublicChannelsTransform = createTransform(
     return { ...inboundState }
   },
   (outboundState: PublicChannelsState, _key: any) => {
+    console.log('OUTBOUND STATE PublicChannelsTransform')
     const generalChannelId = getGeneralChannelId(outboundState)
 
     const transformedOutboundState = { ...outboundState } as any
@@ -36,14 +42,16 @@ const getGeneralChannelId = (state: PublicChannelsState) => {
   const selectors = publicChannelsAdapter.getSelectors()
   const publicChannelStorage = selectors.selectAll(state.channels)
   const generalChannel = publicChannelStorage.find(channel => channel.name === 'general')
-  const generalChannelId = generalChannel?.id || 'general'
-
+  console.log('PublicChannelsTransform: existing general channel id', generalChannel?.id)
+  const generalChannelId = generalChannel?.id || INITIAL_CURRENT_CHANNEL_ID
+  console.log('PublicChannelsTransform: new general channel id', generalChannelId)
   return generalChannelId
 }
 
 const transformChannelsEntities = (channelsEntities: Dictionary<PublicChannelStorage>) => {
   const messagesRefactor = (messages: EntityState<ChannelMessage>) => {
     const transformedMessagesEntities = messages.entities
+    console.log('PublicChannelsTransform: transformedMessagesEntities', transformedMessagesEntities)
     for (const [key, _message] of Object.entries(transformedMessagesEntities)) {
       const message = { ..._message } as any
       if (message.channelAddress) {

From 09f0e4499601c045667d004117d49677122b07ff Mon Sep 17 00:00:00 2001
From: Kacper Michalik <kacper.michalik@rumblefish.pl>
Date: Fri, 11 Aug 2023 07:19:53 +0200
Subject: [PATCH 14/14] Publish

 - @quiet/backend@1.7.1-alpha.2
 - quiet@1.7.1-alpha.2
 - e2e-tests@1.6.1-alpha.0
 - integration-tests@1.7.1-alpha.0
 - @quiet/mobile@1.8.1-alpha.2
 - @quiet/state-manager@1.7.1-alpha.0
---
 packages/backend/CHANGELOG.md                | 8 ++++++++
 packages/backend/package-lock.json           | 4 ++--
 packages/backend/package.json                | 4 ++--
 packages/desktop/CHANGELOG.md                | 8 ++++++++
 packages/desktop/package-lock.json           | 4 ++--
 packages/desktop/package.json                | 4 ++--
 packages/e2e-tests/CHANGELOG.md              | 8 ++++++++
 packages/e2e-tests/package-lock.json         | 4 ++--
 packages/e2e-tests/package.json              | 2 +-
 packages/integration-tests/CHANGELOG.md      | 8 ++++++++
 packages/integration-tests/package-lock.json | 4 ++--
 packages/integration-tests/package.json      | 4 ++--
 packages/mobile/CHANGELOG.md                 | 8 ++++++++
 packages/mobile/android/app/build.gradle     | 4 ++--
 packages/mobile/ios/Quiet/Info.plist         | 2 +-
 packages/mobile/ios/QuietTests/Info.plist    | 2 +-
 packages/mobile/package-lock.json            | 4 ++--
 packages/mobile/package.json                 | 6 +++---
 packages/state-manager/CHANGELOG.md          | 8 ++++++++
 packages/state-manager/package-lock.json     | 4 ++--
 packages/state-manager/package.json          | 2 +-
 21 files changed, 75 insertions(+), 27 deletions(-)

diff --git a/packages/backend/CHANGELOG.md b/packages/backend/CHANGELOG.md
index 7a3b4d1093..d0c4dd002c 100644
--- a/packages/backend/CHANGELOG.md
+++ b/packages/backend/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.
 
+## [1.7.1-alpha.2](https://github.com/TryQuiet/backend/compare/@quiet/backend@1.7.1-alpha.1...@quiet/backend@1.7.1-alpha.2) (2023-08-11)
+
+**Note:** Version bump only for package @quiet/backend
+
+
+
+
+
 ## [1.7.1-alpha.1](https://github.com/TryQuiet/backend/compare/@quiet/backend@1.7.1-alpha.0...@quiet/backend@1.7.1-alpha.1) (2023-08-08)
 
 **Note:** Version bump only for package @quiet/backend
diff --git a/packages/backend/package-lock.json b/packages/backend/package-lock.json
index f64b430ca1..1d35058b82 100644
--- a/packages/backend/package-lock.json
+++ b/packages/backend/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@quiet/backend",
-  "version": "1.7.1-alpha.1",
+  "version": "1.7.1-alpha.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@quiet/backend",
-      "version": "1.7.1-alpha.1",
+      "version": "1.7.1-alpha.2",
       "license": "MIT",
       "dependencies": {
         "@chainsafe/libp2p-gossipsub": "6.1.0",
diff --git a/packages/backend/package.json b/packages/backend/package.json
index a4bf116e7c..920453c715 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@quiet/backend",
-	"version": "1.7.1-alpha.1",
+	"version": "1.7.1-alpha.2",
 	"description": "tlg-manager",
 	"types": "lib/index.d.ts",
 	"type": "module",
@@ -54,7 +54,7 @@
 		"@nestjs/schematics": "^10.0.0",
 		"@nestjs/testing": "^10.0.0",
 		"@quiet/eslint-config": "^1.1.0",
-		"@quiet/state-manager": "^1.7.0",
+		"@quiet/state-manager": "^1.7.1-alpha.0",
 		"@types/crypto-js": "^4.0.2",
 		"@types/express": "^4.17.9",
 		"@types/jest": "28.1.8",
diff --git a/packages/desktop/CHANGELOG.md b/packages/desktop/CHANGELOG.md
index 9ae82ae6ff..631157be8b 100644
--- a/packages/desktop/CHANGELOG.md
+++ b/packages/desktop/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.
 
+## [1.7.1-alpha.2](https://github.com/TryQuiet/quiet/compare/quiet@1.7.1-alpha.1...quiet@1.7.1-alpha.2) (2023-08-11)
+
+**Note:** Version bump only for package quiet
+
+
+
+
+
 ## [1.7.1-alpha.1](https://github.com/TryQuiet/quiet/compare/quiet@1.7.1-alpha.0...quiet@1.7.1-alpha.1) (2023-08-08)
 
 **Note:** Version bump only for package quiet
diff --git a/packages/desktop/package-lock.json b/packages/desktop/package-lock.json
index 057d7e52d2..5835b92819 100644
--- a/packages/desktop/package-lock.json
+++ b/packages/desktop/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "quiet",
-  "version": "1.7.1-alpha.1",
+  "version": "1.7.1-alpha.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "quiet",
-      "version": "1.7.1-alpha.1",
+      "version": "1.7.1-alpha.2",
       "license": "ISC",
       "dependencies": {
         "@electron/remote": "^2.0.8",
diff --git a/packages/desktop/package.json b/packages/desktop/package.json
index d91667e1d6..0c63f97f59 100644
--- 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": "1.7.1-alpha.1",
+  "version": "1.7.1-alpha.2",
   "description": "Decentralized team chat",
   "main": "dist/main/main.js",
   "scripts": {
@@ -155,7 +155,7 @@
     "@mui/material": "~5.10.15",
     "@quiet/eslint-config": "^1.1.0",
     "@quiet/identity": "^1.6.0",
-    "@quiet/state-manager": "^1.7.0",
+    "@quiet/state-manager": "^1.7.1-alpha.0",
     "@redux-saga/types": "^1.1.0",
     "@reduxjs/toolkit": "^1.9.1",
     "@sentry/browser": "^6.19.7",
diff --git a/packages/e2e-tests/CHANGELOG.md b/packages/e2e-tests/CHANGELOG.md
index 1aa06d9f35..d0cad42231 100644
--- a/packages/e2e-tests/CHANGELOG.md
+++ b/packages/e2e-tests/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.
 
+## [1.6.1-alpha.0](https://github.com/TryQuiet/quiet/compare/e2e-tests@1.6.0...e2e-tests@1.6.1-alpha.0) (2023-08-11)
+
+**Note:** Version bump only for package e2e-tests
+
+
+
+
+
 # [1.6.0](https://github.com/ZbayApp/monorepo/compare/e2e-tests@1.5.1-alpha.0...e2e-tests@1.6.0) (2023-07-28)
 
 **Note:** Version bump only for package e2e-tests
diff --git a/packages/e2e-tests/package-lock.json b/packages/e2e-tests/package-lock.json
index d46b417f41..b01360e5e3 100644
--- a/packages/e2e-tests/package-lock.json
+++ b/packages/e2e-tests/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "e2e-tests",
-  "version": "1.6.0",
+  "version": "1.6.1-alpha.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "e2e-tests",
-      "version": "1.6.0",
+      "version": "1.6.1-alpha.0",
       "license": "ISC",
       "dependencies": {
         "cross-env": "^5.2.0",
diff --git a/packages/e2e-tests/package.json b/packages/e2e-tests/package.json
index 7b0f52faff..2afe6204fa 100644
--- a/packages/e2e-tests/package.json
+++ b/packages/e2e-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "e2e-tests",
-  "version": "1.6.0",
+  "version": "1.6.1-alpha.0",
   "description": "For running end to end tests we use  Selenium WebDriver (https://www.selenium.dev/documentation/webdriver/) with Electron ChromeDriver (https://www.npmjs.com/package/electron-chromedriver) in Jest",
   "main": "index.js",
   "scripts": {
diff --git a/packages/integration-tests/CHANGELOG.md b/packages/integration-tests/CHANGELOG.md
index e83d8b598a..0dac82410b 100644
--- a/packages/integration-tests/CHANGELOG.md
+++ b/packages/integration-tests/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.
 
+## [1.7.1-alpha.0](https://github.com/TryQuiet/quiet/compare/integration-tests@1.7.0...integration-tests@1.7.1-alpha.0) (2023-08-11)
+
+**Note:** Version bump only for package integration-tests
+
+
+
+
+
 # [1.7.0](https://github.com/ZbayApp/monorepo/compare/integration-tests@1.6.1-alpha.0...integration-tests@1.7.0) (2023-07-28)
 
 **Note:** Version bump only for package integration-tests
diff --git a/packages/integration-tests/package-lock.json b/packages/integration-tests/package-lock.json
index 8d6ccc64fa..11fd5ec09d 100644
--- a/packages/integration-tests/package-lock.json
+++ b/packages/integration-tests/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "integration-tests",
-  "version": "1.7.0",
+  "version": "1.7.1-alpha.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "integration-tests",
-      "version": "1.7.0",
+      "version": "1.7.1-alpha.0",
       "license": "ISC",
       "dependencies": {
         "@peculiar/webcrypto": "1.4.3",
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
index 9a518d9273..e11e70d9c7 100644
--- a/packages/integration-tests/package.json
+++ b/packages/integration-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "integration-tests",
-  "version": "1.7.0",
+  "version": "1.7.1-alpha.0",
   "description": "",
   "types": "lib/index.d.ts",
   "main": "lib/index.js",
@@ -35,7 +35,7 @@
     "@peculiar/webcrypto": "1.4.3",
     "@quiet/identity": "^1.6.0",
     "@quiet/logger": "^1.4.0",
-    "@quiet/state-manager": "^1.7.0",
+    "@quiet/state-manager": "^1.7.1-alpha.0",
     "@reduxjs/toolkit": "^1.6.1",
     "commander": "^9.1.0",
     "debug": "^4.3.2",
diff --git a/packages/mobile/CHANGELOG.md b/packages/mobile/CHANGELOG.md
index 4e82477857..751c3da8c7 100644
--- a/packages/mobile/CHANGELOG.md
+++ b/packages/mobile/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.
 
+## [1.8.1-alpha.2](https://github.com/TryQuiet/quiet/compare/@quiet/mobile@1.8.1-alpha.1...@quiet/mobile@1.8.1-alpha.2) (2023-08-11)
+
+**Note:** Version bump only for package @quiet/mobile
+
+
+
+
+
 ## [1.8.1-alpha.1](https://github.com/TryQuiet/quiet/compare/@quiet/mobile@1.8.1-alpha.0...@quiet/mobile@1.8.1-alpha.1) (2023-08-08)
 
 **Note:** Version bump only for package @quiet/mobile
diff --git a/packages/mobile/android/app/build.gradle b/packages/mobile/android/app/build.gradle
index 1d9ea5b14b..2f61991a18 100644
--- a/packages/mobile/android/app/build.gradle
+++ b/packages/mobile/android/app/build.gradle
@@ -166,8 +166,8 @@ android {
         applicationId "com.quietmobile"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 297
-        versionName "1.8.1-alpha.1"
+        versionCode 298
+        versionName "1.8.1-alpha.2"
         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
index b74639b6ef..3ab0a85241 100644
--- a/packages/mobile/ios/Quiet/Info.plist
+++ b/packages/mobile/ios/Quiet/Info.plist
@@ -34,7 +34,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>287</string>
+	<string>288</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false />
 	<key>LSRequiresIPhoneOS</key>
diff --git a/packages/mobile/ios/QuietTests/Info.plist b/packages/mobile/ios/QuietTests/Info.plist
index b7893aa103..d2e9320833 100644
--- a/packages/mobile/ios/QuietTests/Info.plist
+++ b/packages/mobile/ios/QuietTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>288</string>
+	<string>289</string>
 </dict>
 </plist>
diff --git a/packages/mobile/package-lock.json b/packages/mobile/package-lock.json
index 412ba8f54f..f6ac098cb2 100644
--- a/packages/mobile/package-lock.json
+++ b/packages/mobile/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@quiet/mobile",
-  "version": "1.8.1-alpha.1",
+  "version": "1.8.1-alpha.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@quiet/mobile",
-      "version": "1.8.1-alpha.1",
+      "version": "1.8.1-alpha.2",
       "dependencies": {
         "@peculiar/webcrypto": "^1.4.3",
         "@react-native-clipboard/clipboard": "^1.11.2",
diff --git a/packages/mobile/package.json b/packages/mobile/package.json
index b2b2868e6f..41623ce2a8 100644
--- a/packages/mobile/package.json
+++ b/packages/mobile/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@quiet/mobile",
-  "version": "1.8.1-alpha.1",
+  "version": "1.8.1-alpha.2",
   "scripts": {
     "build": "tsc -p tsconfig.build.json --noEmit",
     "storybook-android": "ENVFILE=.env.storybook react-native run-android --variant=storybookDebug --appIdSuffix=storybook.debug",
@@ -22,10 +22,10 @@
   },
   "dependencies": {
     "@peculiar/webcrypto": "^1.4.3",
-    "@quiet/backend": "^1.7.1-alpha.1",
+    "@quiet/backend": "^1.7.1-alpha.2",
     "@quiet/common": "^1.6.0",
     "@quiet/identity": "^1.6.0",
-    "@quiet/state-manager": "^1.7.0",
+    "@quiet/state-manager": "^1.7.1-alpha.0",
     "@quiet/types": "^1.6.0",
     "@react-native-clipboard/clipboard": "^1.11.2",
     "@react-navigation/native": "^6.0.0",
diff --git a/packages/state-manager/CHANGELOG.md b/packages/state-manager/CHANGELOG.md
index a46732e796..149e4fb93a 100644
--- a/packages/state-manager/CHANGELOG.md
+++ b/packages/state-manager/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.
 
+## [1.7.1-alpha.0](https://github.com/TryQuiet/quiet/compare/@quiet/state-manager@1.6.1-alpha.0...@quiet/state-manager@1.7.1-alpha.0) (2023-08-11)
+
+**Note:** Version bump only for package @quiet/state-manager
+
+
+
+
+
 # [1.7.0](https://github.com/ZbayApp/monorepo/compare/@quiet/state-manager@1.6.1-alpha.0...@quiet/state-manager@1.7.0) (2023-07-28)
 
 **Note:** Version bump only for package @quiet/state-manager
diff --git a/packages/state-manager/package-lock.json b/packages/state-manager/package-lock.json
index c409df0000..84e1c5b6c6 100644
--- a/packages/state-manager/package-lock.json
+++ b/packages/state-manager/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@quiet/state-manager",
-  "version": "1.7.0",
+  "version": "1.7.1-alpha.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@quiet/state-manager",
-      "version": "1.7.0",
+      "version": "1.7.1-alpha.0",
       "license": "ISC",
       "dependencies": {
         "@reduxjs/toolkit": "^1.9.1",
diff --git a/packages/state-manager/package.json b/packages/state-manager/package.json
index ab9b45c81a..e57bf22329 100644
--- a/packages/state-manager/package.json
+++ b/packages/state-manager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@quiet/state-manager",
-  "version": "1.7.0",
+  "version": "1.7.1-alpha.0",
   "description": "",
   "main": "lib/index.js",
   "scripts": {