From d6302b691937e9d088b50e212fafcfee002fdc0b Mon Sep 17 00:00:00 2001
From: Kacper-RF <111343884+Kacper-RF@users.noreply.github.com>
Date: Wed, 11 Oct 2023 13:09:46 +0200
Subject: [PATCH 01/13] Invite settings screen looks strange with long link
 (#1936)

bug/Invite settings screen looks strange with long link
---
 CHANGELOG.md                                                  | 4 ++++
 .../components/Settings/Tabs/Invite/Invite.component.test.tsx | 2 +-
 .../components/Settings/Tabs/Invite/Invite.component.tsx      | 3 ++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4cb544ef23..637c866c11 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+[unreleased]
+
+* Shorter dots-placeholder for invite link
+
 
 [Unreleased]
 
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
index abdd1b2118..926d0e39fe 100644
--- 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"
diff --git a/packages/desktop/src/renderer/components/Settings/Tabs/Invite/Invite.component.tsx b/packages/desktop/src/renderer/components/Settings/Tabs/Invite/Invite.component.tsx
index 70a6d698fd..7aae2bd012 100644
--- a/packages/desktop/src/renderer/components/Settings/Tabs/Invite/Invite.component.tsx
+++ b/packages/desktop/src/renderer/components/Settings/Tabs/Invite/Invite.component.tsx
@@ -82,6 +82,7 @@ export const InviteComponent: FC<InviteComponentProps> = ({
   revealInputValue,
   handleClickInputReveal,
 }) => {
+  const hiddenInvitationLink = invitationLink.slice(0, 90).replace(/./g, '•')
   return (
     <StyledGrid container direction='column'>
       <Grid container item justifyContent='space-between' alignItems='center' className={classes.titleDiv}>
@@ -102,7 +103,7 @@ export const InviteComponent: FC<InviteComponentProps> = ({
           </Typography>
           <Grid item className={classes.linkContainer}>
             <Typography variant='body2' className={classes.link} data-testid='invitation-link'>
-              {revealInputValue ? invitationLink : invitationLink?.replace(/./g, '•')}
+              {revealInputValue ? invitationLink : hiddenInvitationLink}
             </Typography>
             <IconButton
               data-testid='show-invitation-link'

From 21ea6762bea470b608f3d6e0a1bdb4eadafaedcf Mon Sep 17 00:00:00 2001
From: Lucas Leblow <lucas@quiet.chat>
Date: Wed, 11 Oct 2023 07:34:00 -0600
Subject: [PATCH 02/13] Fix back merge of master into develop

It appears this file didn't make it back to develop
---
 ...ppStore_comquietmobile.mobileprovision.gpg | Bin 7879 -> 7879 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/.github/secrets/match_AppStore_comquietmobile.mobileprovision.gpg b/.github/secrets/match_AppStore_comquietmobile.mobileprovision.gpg
index 27f3a9a0384cd6a5f10843141fbde0d31291e0bf..4f35bf8199ab2b0badb8c54aa39eecb1cdb2f622 100644
GIT binary patch
literal 7879
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

literal 7879
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


From 9aa44b8769fa28aada6b0cc28f1820a2634cac04 Mon Sep 17 00:00:00 2001
From: Wiktor Sieprawski <wiktor.sieprawski@rumblefish.pl>
Date: Wed, 11 Oct 2023 15:40:15 +0200
Subject: [PATCH 03/13] Fix/mobile init redirection (#1956)

* fix: move extra responsibility away from redirection saga

* chore: display errors during on-the-go-events

* test: correct rntl tests

* fix: navigation methods

* test: duplicated username warning

* fix: lint
---
 packages/mobile/src/RootNavigation.ts         |  7 ++
 .../PossibleImpersonationAttack.component.tsx |  2 +-
 .../PossibleImpersonationAttack.test.tsx      |  2 +-
 .../ChannelList/ChannelList.screen.tsx        | 29 +++++++-
 .../UsernameTaken/UsernameTaken.screen.tsx    | 12 ++--
 .../showNotification.saga.test.ts             |  6 +-
 .../navigation/navigation.master.saga.ts      |  2 +
 .../store/navigation/navigation.selectors.ts  |  2 +-
 .../src/store/navigation/navigation.slice.ts  | 11 +--
 .../src/store/navigation/pop/pop.saga.ts      |  8 +++
 .../redirection/redirection.saga.ts           | 28 +-------
 .../src/tests/duplicateUsername.test.tsx      | 68 +++++++++++++++++++
 .../possibleImpersonationAttack.test.tsx      | 32 +++------
 .../src/sagas/identity/identity.selectors.ts  |  6 +-
 14 files changed, 144 insertions(+), 71 deletions(-)
 create mode 100644 packages/mobile/src/store/navigation/pop/pop.saga.ts
 create mode 100644 packages/mobile/src/tests/duplicateUsername.test.tsx

diff --git a/packages/mobile/src/RootNavigation.ts b/packages/mobile/src/RootNavigation.ts
index e0a512d014..e9069aaf2c 100644
--- a/packages/mobile/src/RootNavigation.ts
+++ b/packages/mobile/src/RootNavigation.ts
@@ -17,3 +17,10 @@ export const replaceScreen = <Params extends Record<string, unknown>>(screen: Sc
     navigationRef.dispatch(StackActions.replace(screen, params))
   }
 }
+
+export const pop = (): void => {
+  if (navigationRef.isReady()) {
+    // @ts-ignore
+    navigationRef.dispatch(StackActions.pop())
+  }
+}
diff --git a/packages/mobile/src/components/PossibleImpersonationAttack/PossibleImpersonationAttack.component.tsx b/packages/mobile/src/components/PossibleImpersonationAttack/PossibleImpersonationAttack.component.tsx
index 883a41fbbb..5899f6b117 100644
--- a/packages/mobile/src/components/PossibleImpersonationAttack/PossibleImpersonationAttack.component.tsx
+++ b/packages/mobile/src/components/PossibleImpersonationAttack/PossibleImpersonationAttack.component.tsx
@@ -40,7 +40,7 @@ const PossibleImpersonationAttackComponent: React.FC<PossibleImpersonationAttack
   return (
     <View
       style={{ flex: 1, backgroundColor: defaultTheme.palette.background.white }}
-      data-testid={'possible-impersonation-attack-component'}
+      testID={'possible-impersonation-attack-component'}
     >
       <Appbar title={'Warning!'} back={handleBackButton} crossBackIcon />
       <View style={classes.mainWrapper}>
diff --git a/packages/mobile/src/components/PossibleImpersonationAttack/PossibleImpersonationAttack.test.tsx b/packages/mobile/src/components/PossibleImpersonationAttack/PossibleImpersonationAttack.test.tsx
index 002fca33a6..088afdc2e7 100644
--- a/packages/mobile/src/components/PossibleImpersonationAttack/PossibleImpersonationAttack.test.tsx
+++ b/packages/mobile/src/components/PossibleImpersonationAttack/PossibleImpersonationAttack.test.tsx
@@ -14,13 +14,13 @@ describe('PossibleImpersonationAttack component', () => {
 
     expect(toJSON()).toMatchInlineSnapshot(`
       <View
-        data-testid="possible-impersonation-attack-component"
         style={
           {
             "backgroundColor": "#ffffff",
             "flex": 1,
           }
         }
+        testID="possible-impersonation-attack-component"
       >
         <View
           style={
diff --git a/packages/mobile/src/screens/ChannelList/ChannelList.screen.tsx b/packages/mobile/src/screens/ChannelList/ChannelList.screen.tsx
index bf8e3613be..a82dee3c3a 100644
--- a/packages/mobile/src/screens/ChannelList/ChannelList.screen.tsx
+++ b/packages/mobile/src/screens/ChannelList/ChannelList.screen.tsx
@@ -1,7 +1,8 @@
-import React, { FC, useCallback } from 'react'
+import React, { FC, useCallback, useEffect } from 'react'
 import { useDispatch, useSelector } from 'react-redux'
 
-import { communities, publicChannels } from '@quiet/state-manager'
+import { communities, identity, users, publicChannels } from '@quiet/state-manager'
+import { getChannelNameFromChannelId } from '@quiet/common'
 
 import { ChannelList as ChannelListComponent } from '../../components/ChannelList/ChannelList.component'
 import { ChannelTileProps } from '../../components/ChannelTile/ChannelTile.types'
@@ -12,11 +13,31 @@ import { formatMessageDisplayDate } from '../../utils/functions/formatMessageDis
 
 import { useContextMenu } from '../../hooks/useContextMenu'
 import { MenuName } from '../../const/MenuNames.enum'
-import { getChannelNameFromChannelId } from '@quiet/common'
 
 export const ChannelListScreen: FC = () => {
   const dispatch = useDispatch()
 
+  const usernameTaken = useSelector(identity.selectors.usernameTaken)
+  const duplicateCerts = useSelector(users.selectors.duplicateCerts)
+
+  useEffect(() => {
+    if (usernameTaken) {
+      dispatch(
+        navigationActions.navigation({
+          screen: ScreenNames.UsernameTakenScreen,
+        })
+      )
+    }
+
+    if (duplicateCerts) {
+      dispatch(
+        navigationActions.navigation({
+          screen: ScreenNames.PossibleImpersonationAttackScreen,
+        })
+      )
+    }
+  }, [dispatch, usernameTaken, duplicateCerts])
+
   const redirect = useCallback(
     (id: string) => {
       dispatch(
@@ -34,10 +55,12 @@ export const ChannelListScreen: FC = () => {
   )
 
   const community = useSelector(communities.selectors.currentCommunity)
+
   const channelsStatusSorted = useSelector(publicChannels.selectors.channelsStatusSorted)
 
   const tiles = channelsStatusSorted.map(status => {
     const newestMessage = status.newestMessage
+
     const message = newestMessage?.message || '...'
     const date = newestMessage?.createdAt ? formatMessageDisplayDate(newestMessage.createdAt) : undefined
 
diff --git a/packages/mobile/src/screens/UsernameTaken/UsernameTaken.screen.tsx b/packages/mobile/src/screens/UsernameTaken/UsernameTaken.screen.tsx
index 9e2b3dcaed..46e0549983 100644
--- a/packages/mobile/src/screens/UsernameTaken/UsernameTaken.screen.tsx
+++ b/packages/mobile/src/screens/UsernameTaken/UsernameTaken.screen.tsx
@@ -9,17 +9,17 @@ import { navigationActions } from '../../store/navigation/navigation.slice'
 
 const UsernameTakenScreen: React.FC<UsernameTakenScreenProps> = () => {
   const dispatch = useDispatch()
+
   const currentIdentity = useSelector(identity.selectors.currentIdentity)
+
   const usernameRegistered = currentIdentity?.userCertificate != null
-  const error = useSelector(errors.selectors.registrarErrors)
+
   const registeredUsers = useSelector(users.selectors.certificatesMapping)
 
+  const error = useSelector(errors.selectors.registrarErrors)
+
   const handleBackButton = useCallback(() => {
-    dispatch(
-      navigationActions.replaceScreen({
-        screen: ScreenNames.ChannelListScreen,
-      })
-    )
+    dispatch(navigationActions.pop())
   }, [dispatch])
 
   const handleAction = (nickname: string) => {
diff --git a/packages/mobile/src/store/nativeServices/showNotification/showNotification.saga.test.ts b/packages/mobile/src/store/nativeServices/showNotification/showNotification.saga.test.ts
index 8ede98660d..9265012dd4 100644
--- a/packages/mobile/src/store/nativeServices/showNotification/showNotification.saga.test.ts
+++ b/packages/mobile/src/store/nativeServices/showNotification/showNotification.saga.test.ts
@@ -129,7 +129,7 @@ describe('showNotificationSaga', () => {
           },
           [StoreKeys.Navigation]: {
             ...new NavigationState(),
-            currentScreen: ScreenNames.ChannelScreen,
+            backStack: [ScreenNames.ChannelScreen],
           },
         }
       )
@@ -174,7 +174,7 @@ describe('showNotificationSaga', () => {
           },
           [StoreKeys.Navigation]: {
             ...new NavigationState(),
-            currentScreen: ScreenNames.ChannelScreen,
+            backStack: [ScreenNames.ChannelScreen],
           },
         }
       )
@@ -213,7 +213,7 @@ describe('showNotificationSaga', () => {
           },
           [StoreKeys.Navigation]: {
             ...new NavigationState(),
-            currentScreen: ScreenNames.ChannelScreen,
+            backStack: [ScreenNames.ChannelScreen],
           },
         }
       )
diff --git a/packages/mobile/src/store/navigation/navigation.master.saga.ts b/packages/mobile/src/store/navigation/navigation.master.saga.ts
index 9867a9e006..6735316601 100644
--- a/packages/mobile/src/store/navigation/navigation.master.saga.ts
+++ b/packages/mobile/src/store/navigation/navigation.master.saga.ts
@@ -3,11 +3,13 @@ import { navigationActions } from './navigation.slice'
 import { redirectionSaga } from './redirection/redirection.saga'
 import { navigationSaga } from './navigation/navigation.saga'
 import { replaceScreenSaga } from './replaceScreen/replaceScreen.saga'
+import { popSaga } from './pop/pop.saga'
 
 export function* navigationMasterSaga(): Generator {
   yield all([
     takeEvery(navigationActions.redirection.type, redirectionSaga),
     takeEvery(navigationActions.navigation.type, navigationSaga),
     takeEvery(navigationActions.replaceScreen.type, replaceScreenSaga),
+    takeEvery(navigationActions.pop.type, popSaga),
   ])
 }
diff --git a/packages/mobile/src/store/navigation/navigation.selectors.ts b/packages/mobile/src/store/navigation/navigation.selectors.ts
index b180fb2d58..4553b47f44 100644
--- a/packages/mobile/src/store/navigation/navigation.selectors.ts
+++ b/packages/mobile/src/store/navigation/navigation.selectors.ts
@@ -5,7 +5,7 @@ import { CreatedSelectors, StoreState } from '../store.types'
 
 const navigationSlice: CreatedSelectors[StoreKeys.Navigation] = (state: StoreState) => state[StoreKeys.Navigation]
 
-export const currentScreen = createSelector(navigationSlice, reducerState => reducerState.currentScreen)
+export const currentScreen = createSelector(navigationSlice, reducerState => reducerState.backStack.slice(-1)[0])
 
 export const contextMenuVisibility = (menu: MenuName) =>
   createSelector(navigationSlice, reducerState => {
diff --git a/packages/mobile/src/store/navigation/navigation.slice.ts b/packages/mobile/src/store/navigation/navigation.slice.ts
index 6a1d1a1b43..fd9b45717a 100644
--- a/packages/mobile/src/store/navigation/navigation.slice.ts
+++ b/packages/mobile/src/store/navigation/navigation.slice.ts
@@ -4,7 +4,7 @@ import { ScreenNames } from '../../const/ScreenNames.enum'
 import { MenuName } from '../../const/MenuNames.enum'
 
 export class NavigationState {
-  public currentScreen: ScreenNames = ScreenNames.SplashScreen
+  public backStack: ScreenNames[] = [ScreenNames.SplashScreen]
   public confirmationBox: ConfirmationBox = {
     open: false,
     args: {},
@@ -53,16 +53,19 @@ export const navigationSlice = createSlice({
     redirection: state => state,
     navigation: (state, action: PayloadAction<NavigationPayload>) => {
       const { screen } = action.payload
-      state.currentScreen = screen
+      state.backStack.push(screen)
     },
     // Replace screen overrides last screen in backstack
     replaceScreen: (state, action: PayloadAction<NavigationPayload>) => {
       const { screen } = action.payload
-      state.currentScreen = screen
+      state.backStack.pop()
+      state.backStack.push(screen)
+    },
+    pop: state => {
+      state.backStack.pop()
     },
     setPendingNavigation: (state, action: PayloadAction<PendingNavigationPayload>) => {
       const { screen } = action.payload
-      state.currentScreen = screen
       state.pendingNavigation = screen
     },
     clearPendingNavigation: state => {
diff --git a/packages/mobile/src/store/navigation/pop/pop.saga.ts b/packages/mobile/src/store/navigation/pop/pop.saga.ts
new file mode 100644
index 0000000000..b7dc6fa416
--- /dev/null
+++ b/packages/mobile/src/store/navigation/pop/pop.saga.ts
@@ -0,0 +1,8 @@
+import { PayloadAction } from '@reduxjs/toolkit'
+import { call } from 'typed-redux-saga'
+import { navigationActions } from '../navigation.slice'
+import { pop } from '../../../RootNavigation'
+
+export function* popSaga(_action: PayloadAction<ReturnType<typeof navigationActions.pop>['payload']>): Generator {
+  yield* call(pop)
+}
diff --git a/packages/mobile/src/store/navigation/redirection/redirection.saga.ts b/packages/mobile/src/store/navigation/redirection/redirection.saga.ts
index f05f04593d..a2f60b5519 100644
--- a/packages/mobile/src/store/navigation/redirection/redirection.saga.ts
+++ b/packages/mobile/src/store/navigation/redirection/redirection.saga.ts
@@ -3,7 +3,7 @@ import { initSelectors } from '../../init/init.selectors'
 import { navigationSelectors } from '../navigation.selectors'
 import { navigationActions } from '../navigation.slice'
 import { ScreenNames } from '../../../const/ScreenNames.enum'
-import { identity, publicChannels, users } from '@quiet/state-manager'
+import { identity } from '@quiet/state-manager'
 import { initActions } from '../../init/init.slice'
 
 export function* redirectionSaga(): Generator {
@@ -25,34 +25,10 @@ export function* redirectionSaga(): Generator {
     return
   }
 
-  const isUsernameTaken = yield* select(identity.selectors.usernameTaken)
-
-  if (isUsernameTaken) {
-    yield* put(
-      navigationActions.replaceScreen({
-        screen: ScreenNames.UsernameTakenScreen,
-      })
-    )
-  }
-
-  const duplicateCerts = yield* select(users.selectors.duplicateCerts)
-
-  if (duplicateCerts) {
-    yield* put(
-      navigationActions.replaceScreen({
-        screen: ScreenNames.PossibleImpersonationAttackScreen,
-      })
-    )
-    return
-  }
-
   // If user belongs to a community, let him directly into the app
-  // Check while QA session!
-  const currentChannelDisplayableMessages = yield* select(publicChannels.selectors.currentChannelMessagesMergedBySender)
-  const areMessagesLoaded = Object.values(currentChannelDisplayableMessages).length > 0
   const communityMembership = yield* select(identity.selectors.communityMembership)
 
-  if (communityMembership && areMessagesLoaded) {
+  if (communityMembership) {
     yield* put(
       navigationActions.replaceScreen({
         screen: ScreenNames.ChannelListScreen,
diff --git a/packages/mobile/src/tests/duplicateUsername.test.tsx b/packages/mobile/src/tests/duplicateUsername.test.tsx
new file mode 100644
index 0000000000..769b3ebcfc
--- /dev/null
+++ b/packages/mobile/src/tests/duplicateUsername.test.tsx
@@ -0,0 +1,68 @@
+import React from 'react'
+import '@testing-library/jest-native/extend-expect'
+import MockedSocket from 'socket.io-mock'
+import { ioMock } from '../setupTests'
+import { prepareStore } from './utils/prepareStore'
+import { renderComponent } from './utils/renderComponent'
+import { FactoryGirl } from 'factory-girl'
+import { getFactory, communities, identity, users } from '@quiet/state-manager'
+import { ScreenNames } from '../const/ScreenNames.enum'
+import { initActions } from '../store/init/init.slice'
+import { ChannelListScreen } from '../screens/ChannelList/ChannelList.screen'
+import { navigationSelectors } from '../store/navigation/navigation.selectors'
+import { navigationActions } from '../store/navigation/navigation.slice'
+
+describe('Duplicate username warning', () => {
+  let socket: MockedSocket
+
+  let factory: FactoryGirl
+
+  beforeEach(async () => {
+    socket = new MockedSocket()
+    ioMock.mockImplementation(() => socket)
+  })
+
+  it("Display prompt for username change if it's already taken", async () => {
+    const { store, root } = await prepareStore({}, socket)
+
+    store.dispatch(initActions.setStoreReady())
+
+    factory = await getFactory(store)
+
+    const community = await factory.create<ReturnType<typeof communities.actions.addNewCommunity>['payload']>(
+      'Community'
+    )
+
+    const alice = (
+      await factory.build<typeof identity.actions.addNewIdentity>('Identity', {
+        id: community.id,
+        nickname: 'alice',
+      })
+    ).payload
+
+    store.dispatch(
+      users.actions.storeUserCertificate({
+        certificate: alice.userCertificate || 'certificate_alice',
+      })
+    )
+
+    await factory.create<ReturnType<typeof identity.actions.addNewIdentity>['payload']>('Identity', {
+      id: community.id,
+      nickname: 'alice',
+      userCertificate: null,
+    })
+
+    store.dispatch(navigationActions.navigation({ screen: ScreenNames.ChannelListScreen }))
+
+    renderComponent(<ChannelListScreen />, store)
+
+    // Confirm there's duplication of usernames
+    const usernameTaken = identity.selectors.usernameTaken(store.getState())
+    expect(usernameTaken).toBe(true)
+
+    const currentScreen = navigationSelectors.currentScreen(store.getState())
+    expect(currentScreen).toBe(ScreenNames.UsernameTakenScreen)
+
+    root?.cancel()
+  })
+})
diff --git a/packages/mobile/src/tests/possibleImpersonationAttack.test.tsx b/packages/mobile/src/tests/possibleImpersonationAttack.test.tsx
index d427c06030..80e8b4963e 100644
--- a/packages/mobile/src/tests/possibleImpersonationAttack.test.tsx
+++ b/packages/mobile/src/tests/possibleImpersonationAttack.test.tsx
@@ -1,17 +1,15 @@
 import React from 'react'
 import '@testing-library/jest-native/extend-expect'
-import { act } from '@testing-library/react-native'
 import MockedSocket from 'socket.io-mock'
 import { ioMock } from '../setupTests'
 import { prepareStore } from './utils/prepareStore'
 import { renderComponent } from './utils/renderComponent'
 import { FactoryGirl } from 'factory-girl'
 import { getFactory, communities, identity, users } from '@quiet/state-manager'
-import { navigationActions } from '../store/navigation/navigation.slice'
-import { PossibleImpersonationAttackScreen } from '../screens/PossibleImpersonationAttack/PossibleImpersonationAttack.screen'
 import { ScreenNames } from '../const/ScreenNames.enum'
-import { navigationSelectors } from '../store/navigation/navigation.selectors'
+import { ChannelListScreen } from '../screens/ChannelList/ChannelList.screen'
 import { initActions } from '../store/init/init.slice'
+import { navigationSelectors } from '../store/navigation/navigation.selectors'
 
 describe('Possible Impersonation Attack', () => {
   let socket: MockedSocket
@@ -23,9 +21,11 @@ describe('Possible Impersonation Attack', () => {
     ioMock.mockImplementation(() => socket)
   })
 
-  it('Open modal when certifcates are duplicated', async () => {
+  it('Display warning when certifcates are duplicated', async () => {
     const { store, root } = await prepareStore({}, socket)
+
     store.dispatch(initActions.setStoreReady())
+
     factory = await getFactory(store)
 
     const community = await factory.create<ReturnType<typeof communities.actions.addNewCommunity>['payload']>(
@@ -37,17 +37,6 @@ describe('Possible Impersonation Attack', () => {
       nickname: 'alice',
     })
 
-    const route: { key: string; name: ScreenNames.PossibleImpersonationAttackScreen; path?: string | undefined } = {
-      key: '',
-      name: ScreenNames.PossibleImpersonationAttackScreen,
-    }
-    renderComponent(
-      <>
-        <PossibleImpersonationAttackScreen route={route} />
-      </>,
-      store
-    )
-
     const cert1 =
       'MIIDeDCCAx6gAwIBAgIGAYr6Jw3hMAoGCCqGSM49BAMCMA8xDTALBgNVBAMTBGZyZmQwHhcNMjMxMDA0MTAwNjE4WhcNMzAwMTMxMjMwMDAwWjBJMUcwRQYDVQQDEz5tenhydWhyNWJzdGt3dmp3eWJnZ2Y2M2Jma2dreWw0aWs0bG5lanN1YnFlaG9td3Vpbm43d3JxZC5vbmlvbjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABGcKhXLUNjkS9+xd0hYfJBOA7bXB5LwZojhzgBQps3SW/CSR6ABiAuirdP0x/byxTXSkZY23lBkvc5CqMjWe3lWjggIqMIICJjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIAgDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwggFHBgkqhkiG9w0BCQwEggE4BIIBNAXhwXxmLy7Gg5uonlWXiqRUimGLj2cPbAoK9DnKHkcohqdLvEzyz6rM7KBewO068fag0d/PR0uh37Oyb7d/JAbBjhJmf8wOl2HfLTThPEEH8isy3bxHXx4Ir5prVVk1zx8UiXtPAu6gK41FY5Oin6SpV07MBewqQGcbCovcbBSwkp6EXmLXPOGgmpFlQf5CNGIs3YqPD+Ll1vn8Lq5QIGCa210Pq/T65mrPsXVAw2vJO6DFRIAGrAF5VxDS8G2dSwnDnje+bD2NO8qlfwFdO3bkDeheOqZXCSxlPA6q1bY34qYR2zrwSiQCjRiCQjifRCmF2Jg4ojzLGUL0pKdvi+8fDQXollmazh5boJWN9GRy+1sDLTk01cW2kF7esew5PlDi8kX0v2hY+XsR5eQga1j3MkXkMBgGCisGAQQBg4wbAgEEChMIdXNlcm5hbWUwPQYJKwYBAgEPAwEBBDATLlFtUHF6THFheFk1UmI4VlpjM1VuZmlXZXRxVDZKWkp6SnRjWVFXNmhXTENvRXIwSQYDVR0RBEIwQII+bXp4cnVocjVic3Rrd3Zqd3liZ2dmNjNiZmtna3lsNGlrNGxuZWpzdWJxZWhvbXd1aW5uN3dycWQub25pb24wCgYIKoZIzj0EAwIDSAAwRQIhAJx4YX8KtOA4WGAWzW0M7FvuoblNOb370521GsfuHfbMAiBEYQ4l074oUEF2DTVK1agJlhMR5USRxav5xEpx2ujMeA=='
 
@@ -66,17 +55,14 @@ describe('Possible Impersonation Attack', () => {
       })
     )
 
-    await act(async () => {})
-
-    store.dispatch(navigationActions.redirection())
-
-    await act(async () => {})
+    renderComponent(<ChannelListScreen />, store)
 
     const duplicateCerts = users.selectors.duplicateCerts(store.getState())
-    const currentScreen = navigationSelectors.currentScreen(store.getState())
+    expect(duplicateCerts).toBe(true)
 
+    const currentScreen = navigationSelectors.currentScreen(store.getState())
     expect(currentScreen).toBe(ScreenNames.PossibleImpersonationAttackScreen)
-    expect(duplicateCerts).toBeTruthy()
+
     root?.cancel()
   })
 })
diff --git a/packages/state-manager/src/sagas/identity/identity.selectors.ts b/packages/state-manager/src/sagas/identity/identity.selectors.ts
index 9004adb288..8e9b48cc98 100644
--- a/packages/state-manager/src/sagas/identity/identity.selectors.ts
+++ b/packages/state-manager/src/sagas/identity/identity.selectors.ts
@@ -2,7 +2,7 @@ import { StoreKeys } from '../store.keys'
 import { createSelector } from '@reduxjs/toolkit'
 import { identityAdapter } from './identity.adapter'
 import { type CreatedSelectors, type StoreState } from '../store.types'
-import { communitiesSelectors, selectCommunities } from '../communities/communities.selectors'
+import { communitiesSelectors, selectCommunities, currentCommunity } from '../communities/communities.selectors'
 import { certificatesMapping } from '../users/users.selectors'
 
 const identitySlice: CreatedSelectors[StoreKeys.Identity] = (state: StoreState) => state[StoreKeys.Identity]
@@ -22,8 +22,8 @@ export const currentIdentity = createSelector(
   }
 )
 
-export const communityMembership = createSelector(currentIdentity, identity => {
-  return Boolean(identity?.userCsr)
+export const communityMembership = createSelector(currentIdentity, currentCommunity, (identity, community) => {
+  return Boolean(identity?.userCsr && community?.name)
 })
 
 export const hasCertificate = createSelector(currentIdentity, identity => {

From 8572c46717783fb1f799a684f4b8d92047a5920f Mon Sep 17 00:00:00 2001
From: Kacper Michalik <kacper.michalik@rumblefish.pl>
Date: Wed, 11 Oct 2023 19:03:31 +0200
Subject: [PATCH 04/13] Publish

 - @quiet/backend@2.0.1-alpha.4
 - @quiet/desktop@2.0.1-alpha.4
 - e2e-tests@2.0.1-alpha.4
 - integration-tests@2.0.1-alpha.4
 - @quiet/mobile@2.0.1-alpha.4
 - @quiet/state-manager@2.0.1-alpha.4
---
 packages/backend/CHANGELOG.md                | 11 +++++++++++
 packages/backend/package-lock.json           |  5 ++---
 packages/backend/package.json                |  4 ++--
 packages/desktop/CHANGELOG.md                | 11 +++++++++++
 packages/desktop/package-lock.json           |  4 ++--
 packages/desktop/package.json                |  4 ++--
 packages/e2e-tests/CHANGELOG.md              | 11 +++++++++++
 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                 | 11 +++++++++++
 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, 87 insertions(+), 28 deletions(-)

diff --git a/packages/backend/CHANGELOG.md b/packages/backend/CHANGELOG.md
index 54e056f02a..9469f6046c 100644
--- a/packages/backend/CHANGELOG.md
+++ b/packages/backend/CHANGELOG.md
@@ -3,6 +3,17 @@
 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/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
index 72f441ec71..8713fdb8de 100644
--- a/packages/backend/package-lock.json
+++ b/packages/backend/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@quiet/backend",
-  "version": "2.0.1-alpha.3",
+  "version": "2.0.1-alpha.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@quiet/backend",
-      "version": "2.0.1-alpha.3",
+      "version": "2.0.1-alpha.4",
       "license": "MIT",
       "dependencies": {
         "@chainsafe/libp2p-gossipsub": "6.1.0",
@@ -79,7 +79,6 @@
         "fetch-mock-jest": "^1.5.1",
         "jest": "^29.4.2",
         "mock-fs": "^5.1.2",
-        "run-script-os": "1.1.6",
         "tmp": "^0.2.1",
         "ts-jest": "^29.0.3",
         "ts-loader": "9.4.2",
diff --git a/packages/backend/package.json b/packages/backend/package.json
index e630615fe7..d699e70872 100644
--- 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.4",
 	"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": "^2.0.1-alpha.3",
-		"@quiet/state-manager": "^2.0.1-alpha.3",
+		"@quiet/state-manager": "^2.0.1-alpha.4",
 		"@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 f1199a7b77..dd5ce9273e 100644
--- a/packages/desktop/CHANGELOG.md
+++ b/packages/desktop/CHANGELOG.md
@@ -3,6 +3,17 @@
 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/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
index ba2119ec07..44a2fcd4de 100644
--- a/packages/desktop/package-lock.json
+++ b/packages/desktop/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@quiet/desktop",
-  "version": "2.0.1-alpha.3",
+  "version": "2.0.1-alpha.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@quiet/desktop",
-      "version": "2.0.1-alpha.3",
+      "version": "2.0.1-alpha.4",
       "license": "ISC",
       "dependencies": {
         "@electron/remote": "^2.0.8",
diff --git a/packages/desktop/package.json b/packages/desktop/package.json
index e1dbad1d49..357d4c2ed9 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": "2.0.1-alpha.3",
+  "version": "2.0.1-alpha.4",
   "description": "Decentralized team chat",
   "main": "dist/main/main.js",
   "scripts": {
@@ -157,7 +157,7 @@
     "@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/state-manager": "^2.0.1-alpha.4",
     "@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 d4eee5aed9..6be440bd69 100644
--- a/packages/e2e-tests/CHANGELOG.md
+++ b/packages/e2e-tests/CHANGELOG.md
@@ -3,6 +3,17 @@
 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/e2e-tests@2.0.1-alpha.3...e2e-tests@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/e2e-tests@2.0.1-alpha.2...e2e-tests@2.0.1-alpha.3) (2023-10-10)
 
 **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 834bfe5799..ffac273d6f 100644
--- a/packages/e2e-tests/package-lock.json
+++ b/packages/e2e-tests/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "e2e-tests",
-  "version": "2.0.1-alpha.3",
+  "version": "2.0.1-alpha.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "e2e-tests",
-      "version": "2.0.1-alpha.3",
+      "version": "2.0.1-alpha.4",
       "license": "ISC",
       "dependencies": {
         "cross-env": "^5.2.0",
diff --git a/packages/e2e-tests/package.json b/packages/e2e-tests/package.json
index 79144ad280..0229a13773 100644
--- a/packages/e2e-tests/package.json
+++ b/packages/e2e-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "e2e-tests",
-  "version": "2.0.1-alpha.3",
+  "version": "2.0.1-alpha.4",
   "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",
   "private": true,
diff --git a/packages/integration-tests/CHANGELOG.md b/packages/integration-tests/CHANGELOG.md
index 4c986badc1..0f511437eb 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.
 
+## [2.0.1-alpha.4](https://github.com/TryQuiet/quiet/compare/integration-tests@2.0.1-alpha.3...integration-tests@2.0.1-alpha.4) (2023-10-11)
+
+**Note:** Version bump only for package integration-tests
+
+
+
+
+
 ## [2.0.1-alpha.3](https://github.com/TryQuiet/quiet/compare/integration-tests@2.0.1-alpha.2...integration-tests@2.0.1-alpha.3) (2023-10-10)
 
 **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 1d3a5c84e0..68326fe6a7 100644
--- a/packages/integration-tests/package-lock.json
+++ b/packages/integration-tests/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "integration-tests",
-  "version": "2.0.1-alpha.3",
+  "version": "2.0.1-alpha.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "integration-tests",
-      "version": "2.0.1-alpha.3",
+      "version": "2.0.1-alpha.4",
       "license": "ISC",
       "dependencies": {
         "@peculiar/webcrypto": "1.4.3",
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
index c76d268840..64f5cf5bea 100644
--- a/packages/integration-tests/package.json
+++ b/packages/integration-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "integration-tests",
-  "version": "2.0.1-alpha.3",
+  "version": "2.0.1-alpha.4",
   "description": "",
   "types": "lib/index.d.ts",
   "main": "lib/index.js",
@@ -36,7 +36,7 @@
     "@peculiar/webcrypto": "1.4.3",
     "@quiet/identity": "^2.0.1-alpha.3",
     "@quiet/logger": "^2.0.1-alpha.3",
-    "@quiet/state-manager": "^2.0.1-alpha.3",
+    "@quiet/state-manager": "^2.0.1-alpha.4",
     "@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 566e7d9dcd..14f1a2a493 100644
--- a/packages/mobile/CHANGELOG.md
+++ b/packages/mobile/CHANGELOG.md
@@ -3,6 +3,17 @@
 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/mobile@2.0.1-alpha.3...@quiet/mobile@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/mobile@2.0.1-alpha.2...@quiet/mobile@2.0.1-alpha.3) (2023-10-10)
 
 **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 e597ad6eea..64eb6e8811 100644
--- a/packages/mobile/android/app/build.gradle
+++ b/packages/mobile/android/app/build.gradle
@@ -169,8 +169,8 @@ android {
         applicationId "com.quietmobile"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 341
-        versionName "2.0.1-alpha.3"
+        versionCode 342
+        versionName "2.0.1-alpha.4"
         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 0e2193d0ca..03c8eea2f9 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>321</string>
+	<string>322</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 1be92e1ecd..8b7925f0ad 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>321</string>
+	<string>322</string>
 </dict>
 </plist>
diff --git a/packages/mobile/package-lock.json b/packages/mobile/package-lock.json
index 1e4bcbbd6a..9a2cd844bb 100644
--- a/packages/mobile/package-lock.json
+++ b/packages/mobile/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@quiet/mobile",
-  "version": "2.0.1-alpha.3",
+  "version": "2.0.1-alpha.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@quiet/mobile",
-      "version": "2.0.1-alpha.3",
+      "version": "2.0.1-alpha.4",
       "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 d3bfc92bac..527048c1d5 100644
--- a/packages/mobile/package.json
+++ b/packages/mobile/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@quiet/mobile",
-  "version": "2.0.1-alpha.3",
+  "version": "2.0.1-alpha.4",
   "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": "^2.0.1-alpha.3",
+    "@quiet/backend": "^2.0.1-alpha.4",
     "@quiet/common": "^2.0.1-alpha.3",
     "@quiet/identity": "^2.0.1-alpha.3",
-    "@quiet/state-manager": "^2.0.1-alpha.3",
+    "@quiet/state-manager": "^2.0.1-alpha.4",
     "@quiet/types": "^2.0.1-alpha.3",
     "@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 b2db960fd5..3f60481117 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.
 
+## [2.0.1-alpha.4](https://github.com/TryQuiet/quiet/compare/@quiet/state-manager@2.0.1-alpha.3...@quiet/state-manager@2.0.1-alpha.4) (2023-10-11)
+
+**Note:** Version bump only for package @quiet/state-manager
+
+
+
+
+
 ## [2.0.1-alpha.3](https://github.com/TryQuiet/quiet/compare/@quiet/state-manager@2.0.1-alpha.2...@quiet/state-manager@2.0.1-alpha.3) (2023-10-10)
 
 **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 f656d50c45..e6d49e397b 100644
--- a/packages/state-manager/package-lock.json
+++ b/packages/state-manager/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@quiet/state-manager",
-  "version": "2.0.1-alpha.3",
+  "version": "2.0.1-alpha.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@quiet/state-manager",
-      "version": "2.0.1-alpha.3",
+      "version": "2.0.1-alpha.4",
       "license": "ISC",
       "dependencies": {
         "@reduxjs/toolkit": "^1.9.1",
diff --git a/packages/state-manager/package.json b/packages/state-manager/package.json
index 174becc579..9b18a45440 100644
--- a/packages/state-manager/package.json
+++ b/packages/state-manager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@quiet/state-manager",
-  "version": "2.0.1-alpha.3",
+  "version": "2.0.1-alpha.4",
   "description": "",
   "main": "lib/index.js",
   "private": true,

From 728a0aceff3e40d256d0907a6e69846643f4a16f Mon Sep 17 00:00:00 2001
From: siepra <wiktor.siepra@gmail.com>
Date: Thu, 12 Oct 2023 08:43:10 +0200
Subject: [PATCH 05/13] fix: change NDK configuration on CI

---
 .github/workflows/mobile-deploy-android.yaml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/mobile-deploy-android.yaml b/.github/workflows/mobile-deploy-android.yaml
index 7326b8ac49..42f96aefb2 100644
--- a/.github/workflows/mobile-deploy-android.yaml
+++ b/.github/workflows/mobile-deploy-android.yaml
@@ -39,14 +39,14 @@ jobs:
         with:
           bootstrap-packages: "@quiet/eslint-config,@quiet/logger,@quiet/common,@quiet/types,@quiet/state-manager,@quiet/backend,@quiet/identity,@quiet/mobile,backend-bundle"
 
-      - 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
+          ndk.path=${{ steps.setup-ndk.outputs.ndk-path }}\n\
+          " > ./packages/mobile/android/local.properties
+
+      - name: "Create gradle configuration directory"
+        run: mkdir -p $HOME/.gradle
       
       - name: "Prepare signing configuration"
         run: |

From 6e7859ba688c887aa3426930fbaceb5ac40a6f38 Mon Sep 17 00:00:00 2001
From: siepra <wiktor.siepra@gmail.com>
Date: Thu, 12 Oct 2023 08:48:29 +0200
Subject: [PATCH 06/13] Publish

 - backend-bundle@2.0.1-alpha.4
 - @quiet/backend@2.0.1-alpha.5
 - @quiet/common@2.0.1-alpha.4
 - @quiet/desktop@2.0.1-alpha.5
 - e2e-tests@2.0.1-alpha.5
 - @quiet/eslint-config@2.0.1-alpha.4
 - @quiet/identity@2.0.1-alpha.4
 - integration-tests@2.0.1-alpha.5
 - @quiet/logger@2.0.1-alpha.4
 - @quiet/mobile@2.0.1-alpha.5
 - @quiet/state-manager@2.0.1-alpha.5
 - @quiet/types@2.0.1-alpha.4
---
 packages/backend-bundle/CHANGELOG.md            |  8 ++++++++
 packages/backend-bundle/package-lock.json       |  4 ++--
 packages/backend-bundle/package.json            |  2 +-
 packages/backend/CHANGELOG.md                   |  8 ++++++++
 packages/backend/package-lock.json              |  4 ++--
 packages/backend/package.json                   | 14 +++++++-------
 packages/common/CHANGELOG.md                    |  8 ++++++++
 packages/common/package-lock.json               |  4 ++--
 packages/common/package.json                    |  6 +++---
 packages/desktop/CHANGELOG.md                   |  8 ++++++++
 packages/desktop/package-lock.json              |  4 ++--
 packages/desktop/package.json                   | 16 ++++++++--------
 packages/e2e-tests/CHANGELOG.md                 |  8 ++++++++
 packages/e2e-tests/package-lock.json            |  4 ++--
 packages/e2e-tests/package.json                 | 12 ++++++------
 packages/eslint-config-custom/CHANGELOG.md      |  8 ++++++++
 packages/eslint-config-custom/package-lock.json |  4 ++--
 packages/eslint-config-custom/package.json      |  2 +-
 packages/identity/CHANGELOG.md                  |  8 ++++++++
 packages/identity/package-lock.json             |  4 ++--
 packages/identity/package.json                  |  8 ++++----
 packages/integration-tests/CHANGELOG.md         |  8 ++++++++
 packages/integration-tests/package-lock.json    |  4 ++--
 packages/integration-tests/package.json         | 10 +++++-----
 packages/logger/CHANGELOG.md                    |  8 ++++++++
 packages/logger/package-lock.json               |  4 ++--
 packages/logger/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                    | 14 +++++++-------
 packages/state-manager/CHANGELOG.md             |  8 ++++++++
 packages/state-manager/package-lock.json        |  4 ++--
 packages/state-manager/package.json             | 12 ++++++------
 packages/types/CHANGELOG.md                     |  8 ++++++++
 packages/types/package-lock.json                |  4 ++--
 packages/types/package.json                     |  4 ++--
 39 files changed, 176 insertions(+), 80 deletions(-)

diff --git a/packages/backend-bundle/CHANGELOG.md b/packages/backend-bundle/CHANGELOG.md
index 52bf9d5316..67dcd1d34e 100644
--- 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
index a921e84b70..e9ddad833f 100644
--- a/packages/backend-bundle/package-lock.json
+++ b/packages/backend-bundle/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "backend-bundle",
-  "version": "2.0.1-alpha.3",
+  "version": "2.0.1-alpha.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "backend-bundle",
-      "version": "2.0.1-alpha.3",
+      "version": "2.0.1-alpha.4",
       "license": "ISC"
     }
   }
diff --git a/packages/backend-bundle/package.json b/packages/backend-bundle/package.json
index dd5cbb62da..567fbb7f47 100644
--- 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
index 9469f6046c..8ed8354cf7 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.
 
+## [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)
 
 
diff --git a/packages/backend/package-lock.json b/packages/backend/package-lock.json
index 8713fdb8de..3041a3c245 100644
--- a/packages/backend/package-lock.json
+++ b/packages/backend/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@quiet/backend",
-  "version": "2.0.1-alpha.4",
+  "version": "2.0.1-alpha.5",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@quiet/backend",
-      "version": "2.0.1-alpha.4",
+      "version": "2.0.1-alpha.5",
       "license": "MIT",
       "dependencies": {
         "@chainsafe/libp2p-gossipsub": "6.1.0",
diff --git a/packages/backend/package.json b/packages/backend/package.json
index d699e70872..a78b05f636 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@quiet/backend",
-	"version": "2.0.1-alpha.4",
+	"version": "2.0.1-alpha.5",
 	"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.4",
+		"@quiet/eslint-config": "^2.0.1-alpha.4",
+		"@quiet/state-manager": "^2.0.1-alpha.5",
 		"@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
index e6d79f70cf..d6ed3f912d 100644
--- 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
index 5c07f1fc24..e3ab0a7f16 100644
--- a/packages/common/package-lock.json
+++ b/packages/common/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@quiet/common",
-  "version": "2.0.1-alpha.3",
+  "version": "2.0.1-alpha.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@quiet/common",
-      "version": "2.0.1-alpha.3",
+      "version": "2.0.1-alpha.4",
       "license": "ISC",
       "dependencies": {
         "cross-env": "^5.2.0",
diff --git a/packages/common/package.json b/packages/common/package.json
index e745994166..f9f6eb49f0 100644
--- 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,7 +18,7 @@
     "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",
@@ -26,7 +26,7 @@
     "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
index dd5ce9273e..d3de5b51b6 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.
 
+## [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)
 
 
diff --git a/packages/desktop/package-lock.json b/packages/desktop/package-lock.json
index 44a2fcd4de..6dbf869507 100644
--- a/packages/desktop/package-lock.json
+++ b/packages/desktop/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@quiet/desktop",
-  "version": "2.0.1-alpha.4",
+  "version": "2.0.1-alpha.5",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@quiet/desktop",
-      "version": "2.0.1-alpha.4",
+      "version": "2.0.1-alpha.5",
       "license": "ISC",
       "dependencies": {
         "@electron/remote": "^2.0.8",
diff --git a/packages/desktop/package.json b/packages/desktop/package.json
index 357d4c2ed9..ae568cc1f2 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": "2.0.1-alpha.4",
+  "version": "2.0.1-alpha.5",
   "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.4",
+    "@quiet/eslint-config": "^2.0.1-alpha.4",
+    "@quiet/identity": "^2.0.1-alpha.4",
+    "@quiet/state-manager": "^2.0.1-alpha.5",
     "@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 6be440bd69..300bb334f6 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.
 
+## [2.0.1-alpha.5](https://github.com/TryQuiet/quiet/compare/e2e-tests@2.0.1-alpha.4...e2e-tests@2.0.1-alpha.5) (2023-10-12)
+
+**Note:** Version bump only for package e2e-tests
+
+
+
+
+
 ## [2.0.1-alpha.4](https://github.com/TryQuiet/quiet/compare/e2e-tests@2.0.1-alpha.3...e2e-tests@2.0.1-alpha.4) (2023-10-11)
 
 
diff --git a/packages/e2e-tests/package-lock.json b/packages/e2e-tests/package-lock.json
index ffac273d6f..600129fb9b 100644
--- a/packages/e2e-tests/package-lock.json
+++ b/packages/e2e-tests/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "e2e-tests",
-  "version": "2.0.1-alpha.4",
+  "version": "2.0.1-alpha.5",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "e2e-tests",
-      "version": "2.0.1-alpha.4",
+      "version": "2.0.1-alpha.5",
       "license": "ISC",
       "dependencies": {
         "cross-env": "^5.2.0",
diff --git a/packages/e2e-tests/package.json b/packages/e2e-tests/package.json
index 0229a13773..d62ba08f73 100644
--- a/packages/e2e-tests/package.json
+++ b/packages/e2e-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "e2e-tests",
-  "version": "2.0.1-alpha.4",
+  "version": "2.0.1-alpha.5",
   "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",
   "private": true,
@@ -16,7 +16,7 @@
     "test:watch": "jest --watchAll"
   },
   "devDependencies": {
-    "@quiet/eslint-config": "^2.0.1-alpha.3",
+    "@quiet/eslint-config": "^2.0.1-alpha.4",
     "@types/jest": "^29.2.6",
     "@types/selenium-webdriver": "^4.1.10",
     "babel-jest": "^29.3.1",
@@ -24,10 +24,10 @@
     "typescript": "^4.9.3"
   },
   "dependencies": {
-    "@quiet/common": "^2.0.1-alpha.3",
-    "@quiet/logger": "^2.0.1-alpha.3",
-    "@quiet/types": "^2.0.1-alpha.3",
-    "backend-bundle": "^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",
+    "backend-bundle": "^2.0.1-alpha.4",
     "cross-env": "^5.2.0",
     "electron-chromedriver": "22.0.0",
     "get-port": "^5.1.1",
diff --git a/packages/eslint-config-custom/CHANGELOG.md b/packages/eslint-config-custom/CHANGELOG.md
index 84de66834f..56de984fa0 100644
--- a/packages/eslint-config-custom/CHANGELOG.md
+++ b/packages/eslint-config-custom/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/eslint-config@2.0.1-alpha.3...@quiet/eslint-config@2.0.1-alpha.4) (2023-10-12)
+
+**Note:** Version bump only for package @quiet/eslint-config
+
+
+
+
+
 ## [2.0.1-alpha.3](https://github.com/TryQuiet/quiet/compare/@quiet/eslint-config@2.0.1-alpha.2...@quiet/eslint-config@2.0.1-alpha.3) (2023-10-10)
 
 **Note:** Version bump only for package @quiet/eslint-config
diff --git a/packages/eslint-config-custom/package-lock.json b/packages/eslint-config-custom/package-lock.json
index 7f69ed2527..7c81d46f3f 100644
--- a/packages/eslint-config-custom/package-lock.json
+++ b/packages/eslint-config-custom/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@quiet/eslint-config",
-  "version": "2.0.1-alpha.3",
+  "version": "2.0.1-alpha.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@quiet/eslint-config",
-      "version": "2.0.1-alpha.3",
+      "version": "2.0.1-alpha.4",
       "devDependencies": {
         "@typescript-eslint/eslint-plugin": "5.59.11",
         "@typescript-eslint/parser": "^5.59.11",
diff --git a/packages/eslint-config-custom/package.json b/packages/eslint-config-custom/package.json
index c4acd50d10..7ef50c20f2 100644
--- a/packages/eslint-config-custom/package.json
+++ b/packages/eslint-config-custom/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@quiet/eslint-config",
   "main": "index.js",
-  "version": "2.0.1-alpha.3",
+  "version": "2.0.1-alpha.4",
   "private": true,
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "5.59.11",
diff --git a/packages/identity/CHANGELOG.md b/packages/identity/CHANGELOG.md
index 2cfee34d0c..71d037ae07 100644
--- a/packages/identity/CHANGELOG.md
+++ b/packages/identity/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/identity/compare/@quiet/identity@2.0.1-alpha.3...@quiet/identity@2.0.1-alpha.4) (2023-10-12)
+
+**Note:** Version bump only for package @quiet/identity
+
+
+
+
+
 ## [2.0.1-alpha.3](https://github.com/TryQuiet/identity/compare/@quiet/identity@2.0.1-alpha.2...@quiet/identity@2.0.1-alpha.3) (2023-10-10)
 
 **Note:** Version bump only for package @quiet/identity
diff --git a/packages/identity/package-lock.json b/packages/identity/package-lock.json
index 21d687ab3a..97a3174726 100644
--- a/packages/identity/package-lock.json
+++ b/packages/identity/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@quiet/identity",
-  "version": "2.0.1-alpha.3",
+  "version": "2.0.1-alpha.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@quiet/identity",
-      "version": "2.0.1-alpha.3",
+      "version": "2.0.1-alpha.4",
       "license": "MIT",
       "dependencies": {
         "@peculiar/webcrypto": "1.4.3",
diff --git a/packages/identity/package.json b/packages/identity/package.json
index c8ae5a0afe..2a28560067 100644
--- a/packages/identity/package.json
+++ b/packages/identity/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@quiet/identity",
-  "version": "2.0.1-alpha.3",
+  "version": "2.0.1-alpha.4",
   "description": "Quiet tools for creating certificates and signing messages",
   "main": "lib/index.js",
   "types": "lib/index.d.js",
@@ -50,9 +50,9 @@
   },
   "dependencies": {
     "@peculiar/webcrypto": "1.4.3",
-    "@quiet/eslint-config": "^2.0.1-alpha.3",
-    "@quiet/logger": "^2.0.1-alpha.3",
-    "@quiet/types": "^2.0.1-alpha.3",
+    "@quiet/eslint-config": "^2.0.1-alpha.4",
+    "@quiet/logger": "^2.0.1-alpha.4",
+    "@quiet/types": "^2.0.1-alpha.4",
     "pkijs": "^3.0.8"
   },
   "devDependencies": {
diff --git a/packages/integration-tests/CHANGELOG.md b/packages/integration-tests/CHANGELOG.md
index 0f511437eb..4fd46af801 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.
 
+## [2.0.1-alpha.5](https://github.com/TryQuiet/quiet/compare/integration-tests@2.0.1-alpha.4...integration-tests@2.0.1-alpha.5) (2023-10-12)
+
+**Note:** Version bump only for package integration-tests
+
+
+
+
+
 ## [2.0.1-alpha.4](https://github.com/TryQuiet/quiet/compare/integration-tests@2.0.1-alpha.3...integration-tests@2.0.1-alpha.4) (2023-10-11)
 
 **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 68326fe6a7..74d29c22c8 100644
--- a/packages/integration-tests/package-lock.json
+++ b/packages/integration-tests/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "integration-tests",
-  "version": "2.0.1-alpha.4",
+  "version": "2.0.1-alpha.5",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "integration-tests",
-      "version": "2.0.1-alpha.4",
+      "version": "2.0.1-alpha.5",
       "license": "ISC",
       "dependencies": {
         "@peculiar/webcrypto": "1.4.3",
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
index 64f5cf5bea..47b0310925 100644
--- a/packages/integration-tests/package.json
+++ b/packages/integration-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "integration-tests",
-  "version": "2.0.1-alpha.4",
+  "version": "2.0.1-alpha.5",
   "description": "",
   "types": "lib/index.d.ts",
   "main": "lib/index.js",
@@ -23,7 +23,7 @@
     "@babel/core": "^7.22.5",
     "@babel/preset-env": "^7.22.5",
     "@babel/preset-typescript": "^7.22.5",
-    "@quiet/eslint-config": "^2.0.1-alpha.3",
+    "@quiet/eslint-config": "^2.0.1-alpha.4",
     "@types/jest": "^26.0.24",
     "@types/redux-saga": "^0.10.5",
     "@types/tmp": "^0.2.2",
@@ -34,9 +34,9 @@
   },
   "dependencies": {
     "@peculiar/webcrypto": "1.4.3",
-    "@quiet/identity": "^2.0.1-alpha.3",
-    "@quiet/logger": "^2.0.1-alpha.3",
-    "@quiet/state-manager": "^2.0.1-alpha.4",
+    "@quiet/identity": "^2.0.1-alpha.4",
+    "@quiet/logger": "^2.0.1-alpha.4",
+    "@quiet/state-manager": "^2.0.1-alpha.5",
     "@reduxjs/toolkit": "^1.6.1",
     "commander": "^9.1.0",
     "debug": "^4.3.2",
diff --git a/packages/logger/CHANGELOG.md b/packages/logger/CHANGELOG.md
index 396956f138..4d7f2fb11a 100644
--- a/packages/logger/CHANGELOG.md
+++ b/packages/logger/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/logger@2.0.1-alpha.3...@quiet/logger@2.0.1-alpha.4) (2023-10-12)
+
+**Note:** Version bump only for package @quiet/logger
+
+
+
+
+
 ## [2.0.1-alpha.3](https://github.com/TryQuiet/quiet/compare/@quiet/logger@2.0.1-alpha.2...@quiet/logger@2.0.1-alpha.3) (2023-10-10)
 
 **Note:** Version bump only for package @quiet/logger
diff --git a/packages/logger/package-lock.json b/packages/logger/package-lock.json
index ea38fbf170..26f0a432d5 100644
--- a/packages/logger/package-lock.json
+++ b/packages/logger/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@quiet/logger",
-  "version": "2.0.1-alpha.3",
+  "version": "2.0.1-alpha.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@quiet/logger",
-      "version": "2.0.1-alpha.3",
+      "version": "2.0.1-alpha.4",
       "license": "ISC",
       "dependencies": {
         "cross-env": "^5.2.0",
diff --git a/packages/logger/package.json b/packages/logger/package.json
index 774721e12e..3b808d53fd 100644
--- a/packages/logger/package.json
+++ b/packages/logger/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@quiet/logger",
-  "version": "2.0.1-alpha.3",
+  "version": "2.0.1-alpha.4",
   "description": "Logger",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -17,7 +17,7 @@
     "rmDist": "rimraf lib/"
   },
   "devDependencies": {
-    "@quiet/eslint-config": "^2.0.1-alpha.3",
+    "@quiet/eslint-config": "^2.0.1-alpha.4",
     "@types/debug": "^4.1.7",
     "@types/node": "^17.0.21",
     "typescript": "^4.9.3"
diff --git a/packages/mobile/CHANGELOG.md b/packages/mobile/CHANGELOG.md
index 14f1a2a493..d2f380aabe 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.
 
+## [2.0.1-alpha.5](https://github.com/TryQuiet/quiet/compare/@quiet/mobile@2.0.1-alpha.4...@quiet/mobile@2.0.1-alpha.5) (2023-10-12)
+
+**Note:** Version bump only for package @quiet/mobile
+
+
+
+
+
 ## [2.0.1-alpha.4](https://github.com/TryQuiet/quiet/compare/@quiet/mobile@2.0.1-alpha.3...@quiet/mobile@2.0.1-alpha.4) (2023-10-11)
 
 
diff --git a/packages/mobile/android/app/build.gradle b/packages/mobile/android/app/build.gradle
index 64eb6e8811..494620742a 100644
--- a/packages/mobile/android/app/build.gradle
+++ b/packages/mobile/android/app/build.gradle
@@ -169,8 +169,8 @@ android {
         applicationId "com.quietmobile"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 342
-        versionName "2.0.1-alpha.4"
+        versionCode 343
+        versionName "2.0.1-alpha.5"
         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 03c8eea2f9..fabbc295c9 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>322</string>
+	<string>323</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 8b7925f0ad..1d46743f36 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>322</string>
+	<string>323</string>
 </dict>
 </plist>
diff --git a/packages/mobile/package-lock.json b/packages/mobile/package-lock.json
index 9a2cd844bb..62f3ade186 100644
--- a/packages/mobile/package-lock.json
+++ b/packages/mobile/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@quiet/mobile",
-  "version": "2.0.1-alpha.4",
+  "version": "2.0.1-alpha.5",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@quiet/mobile",
-      "version": "2.0.1-alpha.4",
+      "version": "2.0.1-alpha.5",
       "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 527048c1d5..1457bcc46c 100644
--- a/packages/mobile/package.json
+++ b/packages/mobile/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@quiet/mobile",
-  "version": "2.0.1-alpha.4",
+  "version": "2.0.1-alpha.5",
   "scripts": {
     "build": "tsc -p tsconfig.build.json --noEmit",
     "storybook-android": "ENVFILE=.env.storybook react-native run-android --variant=storybookDebug --appIdSuffix=storybook.debug",
@@ -22,11 +22,11 @@
   },
   "dependencies": {
     "@peculiar/webcrypto": "^1.4.3",
-    "@quiet/backend": "^2.0.1-alpha.4",
-    "@quiet/common": "^2.0.1-alpha.3",
-    "@quiet/identity": "^2.0.1-alpha.3",
-    "@quiet/state-manager": "^2.0.1-alpha.4",
-    "@quiet/types": "^2.0.1-alpha.3",
+    "@quiet/backend": "^2.0.1-alpha.5",
+    "@quiet/common": "^2.0.1-alpha.4",
+    "@quiet/identity": "^2.0.1-alpha.4",
+    "@quiet/state-manager": "^2.0.1-alpha.5",
+    "@quiet/types": "^2.0.1-alpha.4",
     "@react-native-clipboard/clipboard": "^1.11.2",
     "@react-navigation/native": "^6.0.0",
     "@react-navigation/native-stack": "^6.9.0",
@@ -82,7 +82,7 @@
     "@babel/plugin-transform-flow-strip-types": "^7.22.5",
     "@babel/preset-env": "^7.22.5",
     "@babel/runtime": "^7.22.5",
-    "@quiet/eslint-config": "^2.0.1-alpha.3",
+    "@quiet/eslint-config": "^2.0.1-alpha.4",
     "@react-native-async-storage/async-storage": "^1.18.1",
     "@react-native-community/eslint-config": "^2.0.0",
     "@react-native-community/push-notification-ios": "^1.10.1",
diff --git a/packages/state-manager/CHANGELOG.md b/packages/state-manager/CHANGELOG.md
index 3f60481117..374dea0999 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.
 
+## [2.0.1-alpha.5](https://github.com/TryQuiet/quiet/compare/@quiet/state-manager@2.0.1-alpha.4...@quiet/state-manager@2.0.1-alpha.5) (2023-10-12)
+
+**Note:** Version bump only for package @quiet/state-manager
+
+
+
+
+
 ## [2.0.1-alpha.4](https://github.com/TryQuiet/quiet/compare/@quiet/state-manager@2.0.1-alpha.3...@quiet/state-manager@2.0.1-alpha.4) (2023-10-11)
 
 **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 e6d49e397b..3cec3a31e9 100644
--- a/packages/state-manager/package-lock.json
+++ b/packages/state-manager/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@quiet/state-manager",
-  "version": "2.0.1-alpha.4",
+  "version": "2.0.1-alpha.5",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@quiet/state-manager",
-      "version": "2.0.1-alpha.4",
+      "version": "2.0.1-alpha.5",
       "license": "ISC",
       "dependencies": {
         "@reduxjs/toolkit": "^1.9.1",
diff --git a/packages/state-manager/package.json b/packages/state-manager/package.json
index 9b18a45440..f5994670d8 100644
--- a/packages/state-manager/package.json
+++ b/packages/state-manager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@quiet/state-manager",
-  "version": "2.0.1-alpha.4",
+  "version": "2.0.1-alpha.5",
   "description": "",
   "main": "lib/index.js",
   "private": true,
@@ -23,9 +23,9 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@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",
     "@reduxjs/toolkit": "^1.9.1",
     "factory-girl": "^5.0.4",
     "get-port": "^5.1.1",
@@ -44,8 +44,8 @@
     "@babel/preset-env": "^7.22.5",
     "@babel/preset-typescript": "^7.22.5",
     "@peculiar/webcrypto": "1.4.3",
-    "@quiet/eslint-config": "^2.0.1-alpha.3",
-    "@quiet/identity": "^2.0.1-alpha.3",
+    "@quiet/eslint-config": "^2.0.1-alpha.4",
+    "@quiet/identity": "^2.0.1-alpha.4",
     "@types/factory-girl": "^5.0.8",
     "@types/jest": "^26.0.24",
     "@types/luxon": "^2.0.0",
diff --git a/packages/types/CHANGELOG.md b/packages/types/CHANGELOG.md
index 4e45aa8f7b..81dff1e244 100644
--- a/packages/types/CHANGELOG.md
+++ b/packages/types/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/types@2.0.1-alpha.3...@quiet/types@2.0.1-alpha.4) (2023-10-12)
+
+**Note:** Version bump only for package @quiet/types
+
+
+
+
+
 ## [2.0.1-alpha.3](https://github.com/TryQuiet/quiet/compare/@quiet/types@2.0.1-alpha.2...@quiet/types@2.0.1-alpha.3) (2023-10-10)
 
 **Note:** Version bump only for package @quiet/types
diff --git a/packages/types/package-lock.json b/packages/types/package-lock.json
index a678fa5b49..edfa66cb7f 100644
--- a/packages/types/package-lock.json
+++ b/packages/types/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@quiet/types",
-  "version": "2.0.1-alpha.3",
+  "version": "2.0.1-alpha.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@quiet/types",
-      "version": "2.0.1-alpha.3",
+      "version": "2.0.1-alpha.4",
       "license": "ISC",
       "dependencies": {
         "cross-env": "^5.2.0",
diff --git a/packages/types/package.json b/packages/types/package.json
index e5e9212465..39e3644734 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@quiet/types",
-  "version": "2.0.1-alpha.3",
+  "version": "2.0.1-alpha.4",
   "description": "Common monorepo types",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -18,7 +18,7 @@
     "rmDist": "rimraf lib/"
   },
   "devDependencies": {
-    "@quiet/eslint-config": "^2.0.1-alpha.3",
+    "@quiet/eslint-config": "^2.0.1-alpha.4",
     "@reduxjs/toolkit": "^1.9.1",
     "@types/jest": "^26.0.23",
     "@types/node": "^17.0.21",

From 2e0fe01c16d5f904050b592680c6c295420866d4 Mon Sep 17 00:00:00 2001
From: Wiktor Sieprawski <wiktor.sieprawski@rumblefish.pl>
Date: Thu, 12 Oct 2023 11:23:13 +0200
Subject: [PATCH 07/13] Fix/android detox tests (#1958)

* fix: android detox tests

* chore: add workflow for android e2e

* fix: set NDK path in local.properties

---------

Co-authored-by: github@zbay.llc <github@zbay.llc>
---
 .github/workflows/e2e-ios.yml       |  2 +-
 .github/workflows/e2e.android.yml   | 40 +++++++++++++++++++++++++++++
 packages/mobile/.detoxrc.js         |  2 +-
 packages/mobile/e2e/starter.test.js |  2 +-
 packages/mobile/e2e/utils/press.js  | 13 ++--------
 packages/mobile/e2e/utils/write.js  | 11 +-------
 6 files changed, 46 insertions(+), 24 deletions(-)
 create mode 100644 .github/workflows/e2e.android.yml

diff --git a/.github/workflows/e2e-ios.yml b/.github/workflows/e2e-ios.yml
index 91c81888e1..ca0933e2d4 100644
--- a/.github/workflows/e2e-ios.yml
+++ b/.github/workflows/e2e-ios.yml
@@ -8,7 +8,7 @@ on:
 jobs:
   detox:
     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/e2e.android.yml b/.github/workflows/e2e.android.yml
new file mode 100644
index 0000000000..055b6fa994
--- /dev/null
+++ b/.github/workflows/e2e.android.yml
@@ -0,0 +1,40 @@
+name: E2E Android
+
+on:
+  pull_request:
+    paths:
+      - packages/mobile/**
+
+jobs:
+  detox:
+    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: Set NDK path in local.properties
+        run: |
+          printf "\
+          ndk.path=${{ env.NDK_PATH }}\n\
+          " > packages/mobile/android/local.properties
+
+      - 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/packages/mobile/.detoxrc.js b/packages/mobile/.detoxrc.js
index b5832f5d0e..a03e86f3a9 100644
--- a/packages/mobile/.detoxrc.js
+++ b/packages/mobile/.detoxrc.js
@@ -77,7 +77,7 @@ module.exports = {
     emulator_ci: {
       type: 'android.emulator',
       device: {
-        avdName: 'Pixel_3a_API_34_arm64-v8a',
+        avdName: 'Pixel_7_API_31',
       },
     },
   },
diff --git a/packages/mobile/e2e/starter.test.js b/packages/mobile/e2e/starter.test.js
index 1f63dd13b5..f2ce45c703 100644
--- a/packages/mobile/e2e/starter.test.js
+++ b/packages/mobile/e2e/starter.test.js
@@ -21,7 +21,7 @@ describe('User', () => {
   test('should see join community screen', async () => {
     await waitFor(element(by.text('Join community')))
       .toBeVisible()
-      .withTimeout(LONG)
+      .withTimeout(STARTUP)
 
     const componentName = 'join-community-component'
     await checkVisualRegression(componentName)
diff --git a/packages/mobile/e2e/utils/press.js b/packages/mobile/e2e/utils/press.js
index dfd392a3f1..01189a95e6 100644
--- a/packages/mobile/e2e/utils/press.js
+++ b/packages/mobile/e2e/utils/press.js
@@ -1,14 +1,5 @@
-import info from './info'
-
-const { ios } = info
-
-const press = async (element, double = false) => {
-  if (ios) {
-    await element.tap()
-  } else {
-    if (double) await element.longPress() // Idle
-    await element.longPress()
-  }
+const press = async (element) => {
+  await element.tap()
 }
 
 export default press
diff --git a/packages/mobile/e2e/utils/write.js b/packages/mobile/e2e/utils/write.js
index 0d6014f509..0c2af647d0 100644
--- a/packages/mobile/e2e/utils/write.js
+++ b/packages/mobile/e2e/utils/write.js
@@ -1,14 +1,5 @@
-import info from './info'
-
-const { ios } = info
-
 const write = async (element, text) => {
-  if (ios) {
-    await element.typeText(text)
-  } else {
-    await element.longPress()
-    await element.typeText(text)
-  }
+  await element.typeText(text)
 }
 
 export default write

From 025007911219a210f4afd71673ecc8a4129a1f12 Mon Sep 17 00:00:00 2001
From: Wiktor Sieprawski <wiktor.sieprawski@rumblefish.pl>
Date: Thu, 12 Oct 2023 11:45:24 +0200
Subject: [PATCH 08/13] chore: require detox before building mobile apps
 (#1959)

---
 .github/workflows/{e2e.android.yml => e2e-android.yml} | 2 +-
 .github/workflows/e2e-ios.yml                          | 2 +-
 .github/workflows/mobile-deploy-android.yaml           | 1 +
 .github/workflows/mobile-deploy-ios.yml                | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)
 rename .github/workflows/{e2e.android.yml => e2e-android.yml} (98%)

diff --git a/.github/workflows/e2e.android.yml b/.github/workflows/e2e-android.yml
similarity index 98%
rename from .github/workflows/e2e.android.yml
rename to .github/workflows/e2e-android.yml
index 055b6fa994..7853946af9 100644
--- a/.github/workflows/e2e.android.yml
+++ b/.github/workflows/e2e-android.yml
@@ -6,7 +6,7 @@ on:
       - packages/mobile/**
 
 jobs:
-  detox:
+  detox-android:
     timeout-minutes: 10
     runs-on: [self-hosted, macOS, ARM64, android]
 
diff --git a/.github/workflows/e2e-ios.yml b/.github/workflows/e2e-ios.yml
index ca0933e2d4..5d4331fc5b 100644
--- a/.github/workflows/e2e-ios.yml
+++ b/.github/workflows/e2e-ios.yml
@@ -6,7 +6,7 @@ on:
       - packages/mobile/**
 
 jobs:
-  detox:
+  detox-ios:
     timeout-minutes: 10
     runs-on: [self-hosted, macOS, ARM64, iOS]
 
diff --git a/.github/workflows/mobile-deploy-android.yaml b/.github/workflows/mobile-deploy-android.yaml
index 42f96aefb2..6afb5c4cbd 100644
--- 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')
diff --git a/.github/workflows/mobile-deploy-ios.yml b/.github/workflows/mobile-deploy-ios.yml
index 98bd9caee7..8fd8f8ca62 100644
--- 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')

From a1d341c9257d3fee93678655741d2ef7eb101c6c Mon Sep 17 00:00:00 2001
From: Wiktor Sieprawski <wiktor.sieprawski@rumblefish.pl>
Date: Thu, 12 Oct 2023 15:32:29 +0200
Subject: [PATCH 09/13] fix: fallback to gradle.properties for ndk path (#1960)

* fix: fallback to gradle.properties for ndk path

* fix: use ndk.dir instead of ndk.path

* fix: get ndk path from gradle.properties
---
 .github/workflows/e2e-android.yml              |  6 ------
 .github/workflows/mobile-deploy-android.yaml   | 10 +++++-----
 packages/mobile/android-environment/Dockerfile |  2 --
 packages/mobile/android/app/build.gradle       |  7 +++++--
 4 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/e2e-android.yml b/.github/workflows/e2e-android.yml
index 7853946af9..2a97f7add3 100644
--- a/.github/workflows/e2e-android.yml
+++ b/.github/workflows/e2e-android.yml
@@ -23,12 +23,6 @@ jobs:
           git lfs install
           git lfs pull
 
-      - name: Set NDK path in local.properties
-        run: |
-          printf "\
-          ndk.path=${{ env.NDK_PATH }}\n\
-          " > packages/mobile/android/local.properties
-
       - name: Build Detox
         run: |
           cd packages/mobile
diff --git a/.github/workflows/mobile-deploy-android.yaml b/.github/workflows/mobile-deploy-android.yaml
index 6afb5c4cbd..9755e926dd 100644
--- a/.github/workflows/mobile-deploy-android.yaml
+++ b/.github/workflows/mobile-deploy-android.yaml
@@ -40,15 +40,15 @@ jobs:
         with:
           bootstrap-packages: "@quiet/eslint-config,@quiet/logger,@quiet/common,@quiet/types,@quiet/state-manager,@quiet/backend,@quiet/identity,@quiet/mobile,backend-bundle"
 
+      - 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\
-          " > ./packages/mobile/android/local.properties
+          NDK_PATH=${{ steps.setup-ndk.outputs.ndk-path }}\n\
+          " > $HOME/.gradle/gradle.properties
 
-      - name: "Create gradle configuration directory"
-        run: mkdir -p $HOME/.gradle
-      
       - name: "Prepare signing configuration"
         run: |
           printf "\
diff --git a/packages/mobile/android-environment/Dockerfile b/packages/mobile/android-environment/Dockerfile
index 2131e5f36a..fc705ee813 100644
--- a/packages/mobile/android-environment/Dockerfile
+++ b/packages/mobile/android-environment/Dockerfile
@@ -37,6 +37,4 @@ RUN mkdir /home/node/.gradle
 RUN chown -R 1000:1000 /home/node/.gradle
 RUN echo NDK_PATH=/usr/lib/android-sdk/android-ndk-r21e >> /home/node/.gradle/gradle.properties
 
-RUN npm i -g lerna@^4.0.0 rf-lerna
-
 WORKDIR /app/packages/mobile
diff --git a/packages/mobile/android/app/build.gradle b/packages/mobile/android/app/build.gradle
index 494620742a..1d7236d73a 100644
--- a/packages/mobile/android/app/build.gradle
+++ b/packages/mobile/android/app/build.gradle
@@ -140,10 +140,13 @@ def reactNativeArchitectures() {
 }
 
 Properties properties = new Properties()
-properties.load(project.rootProject.file('local.properties').newDataInputStream())
+def localPropertiesFile = project.rootProject.file('local.properties')
+if (localPropertiesFile.exists()) {
+    properties.load(localPropertiesFile.newDataInputStream())
+}
 
 android {
-    ndkPath properties.getProperty('ndk.dir')
+    ndkPath properties.getProperty('ndk.dir', project.property('NDK_PATH'))
 
     ndkVersion rootProject.ext.ndkVersion
 

From 6b3567cee3889b03b9d263c9ba3706eb4e3ad0ea Mon Sep 17 00:00:00 2001
From: Kacper Michalik <kacper.michalik@rumblefish.pl>
Date: Thu, 12 Oct 2023 16:56:09 +0200
Subject: [PATCH 10/13] update readme

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 9ad4eff562..be52d08eba 100644
--- 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).
 

From ef9496375dd372437b6f1c7d817bd958e221e854 Mon Sep 17 00:00:00 2001
From: Wiktor Sieprawski <wiktor.sieprawski@rumblefish.pl>
Date: Fri, 13 Oct 2023 09:41:28 +0200
Subject: [PATCH 11/13] chore: trigger detox on push (#1964)

* chore: trigger detox on push
---
 .github/workflows/e2e-android.yml | 2 +-
 .github/workflows/e2e-ios.yml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/e2e-android.yml b/.github/workflows/e2e-android.yml
index 2a97f7add3..1181a13983 100644
--- a/.github/workflows/e2e-android.yml
+++ b/.github/workflows/e2e-android.yml
@@ -1,7 +1,7 @@
 name: E2E Android
 
 on:
-  pull_request:
+  push:
     paths:
       - packages/mobile/**
 
diff --git a/.github/workflows/e2e-ios.yml b/.github/workflows/e2e-ios.yml
index 5d4331fc5b..a834ada8e7 100644
--- a/.github/workflows/e2e-ios.yml
+++ b/.github/workflows/e2e-ios.yml
@@ -1,7 +1,7 @@
 name: E2E iOS
 
 on:
-  pull_request:
+  push:
     paths:
       - packages/mobile/**
 

From f85230d31d96a773edc4125c4e86cdf41b6002c3 Mon Sep 17 00:00:00 2001
From: Kacper-RF <111343884+Kacper-RF@users.noreply.github.com>
Date: Fri, 13 Oct 2023 15:25:46 +0200
Subject: [PATCH 12/13] Fix/joining by QR code and not showing username taken
 screen for user who has unique name (#1962)

* fix:fixed mobile bugs - joining by QR code and not showing username taken screen for user who has unique name

* test:fix splash screen test

* test:fix component styles

* test:fix snapshots

* fix:remove params.code from splash screen

* fix:problem with path and race condition in state manager

* fix:state manager tests

* fix:update certificate saga
---
 CHANGELOG.md                                  |  5 ++-
 .../Duplicated/DuplicatedUsername.test.tsx    |  2 +-
 .../UserLabel/UserLabel.component.tsx         |  2 +-
 .../components/UserLabel/UserLabel.test.tsx   |  2 +-
 packages/mobile/src/route.params.ts           |  4 +--
 .../src/screens/Splash/Splash.screen.tsx      |  8 +++--
 .../mobile/src/tests/splash.screen.test.tsx   |  6 ++--
 .../communities/communities.selectors.test.ts |  6 ++++
 .../updateCertificate.saga.ts                 | 32 +++++++++----------
 .../src/sagas/users/users.slice.test.ts       |  6 ++++
 .../src/sagas/users/users.slice.ts            |  4 ++-
 11 files changed, 45 insertions(+), 32 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 637c866c11..9a0e5e3cdb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,8 @@
 [unreleased]
 
-* Shorter dots-placeholder for invite link
-
+* Fixed mobile bugs - joining by QR code and not showing username taken screen for user who has unique name
 
-[Unreleased]
+* Shorter dots-placeholder for invite link
 
 * Revert adjusting bootstrap scripts for developing on Windows
 
diff --git a/packages/mobile/src/components/UserLabel/Duplicated/DuplicatedUsername.test.tsx b/packages/mobile/src/components/UserLabel/Duplicated/DuplicatedUsername.test.tsx
index ce162d56d7..d6d1ca16bb 100644
--- a/packages/mobile/src/components/UserLabel/Duplicated/DuplicatedUsername.test.tsx
+++ b/packages/mobile/src/components/UserLabel/Duplicated/DuplicatedUsername.test.tsx
@@ -282,8 +282,8 @@ describe('DuplicatedUsername component', () => {
                   style={
                     {
                       "height": 12,
+                      "marginLeft": 4,
                       "marginRight": 4,
-                      "merginLeft": 4,
                       "width": 13,
                     }
                   }
diff --git a/packages/mobile/src/components/UserLabel/UserLabel.component.tsx b/packages/mobile/src/components/UserLabel/UserLabel.component.tsx
index 537d098910..9e289a0aa1 100644
--- a/packages/mobile/src/components/UserLabel/UserLabel.component.tsx
+++ b/packages/mobile/src/components/UserLabel/UserLabel.component.tsx
@@ -38,7 +38,7 @@ const classes = StyleSheet.create({
     width: 13,
     height: 12,
     marginRight: 4,
-    merginLeft: 4,
+    marginLeft: 4,
   },
 })
 
diff --git a/packages/mobile/src/components/UserLabel/UserLabel.test.tsx b/packages/mobile/src/components/UserLabel/UserLabel.test.tsx
index 28e4c81a4f..5bd06882de 100644
--- a/packages/mobile/src/components/UserLabel/UserLabel.test.tsx
+++ b/packages/mobile/src/components/UserLabel/UserLabel.test.tsx
@@ -62,8 +62,8 @@ describe('UserLabel component', () => {
             style={
               {
                 "height": 12,
+                "marginLeft": 4,
                 "marginRight": 4,
-                "merginLeft": 4,
                 "width": 13,
               }
             }
diff --git a/packages/mobile/src/route.params.ts b/packages/mobile/src/route.params.ts
index 2813798728..8221547080 100644
--- a/packages/mobile/src/route.params.ts
+++ b/packages/mobile/src/route.params.ts
@@ -4,9 +4,7 @@ import { ScreenNames } from './const/ScreenNames.enum'
 
 // eslint-disable-next-line
 export type RootStackParamList = {
-  [ScreenNames.SplashScreen]: {
-    code?: string
-  }
+  [ScreenNames.SplashScreen]: undefined
   [ScreenNames.JoinCommunityScreen]: {
     code?: string
   }
diff --git a/packages/mobile/src/screens/Splash/Splash.screen.tsx b/packages/mobile/src/screens/Splash/Splash.screen.tsx
index 5df07a9160..f5e55d6435 100644
--- a/packages/mobile/src/screens/Splash/Splash.screen.tsx
+++ b/packages/mobile/src/screens/Splash/Splash.screen.tsx
@@ -11,15 +11,19 @@ export const SplashScreen: FC<SplashScreenProps> = ({ route }) => {
   const ready = useSelector(initSelectors.ready)
 
   useEffect(() => {
-    const code = route.params?.code
+    let code = route.path
 
     // Screen hasn't been open through a link
     if (!code) return
 
+    if (code.charAt(0) === '?') {
+      code = code.slice(1, code.length)
+    }
+
     if (ready) {
       dispatch(initActions.deepLink(code))
     }
-  }, [ready, route.params?.code])
+  }, [ready, route.path])
 
   return <Splash />
 }
diff --git a/packages/mobile/src/tests/splash.screen.test.tsx b/packages/mobile/src/tests/splash.screen.test.tsx
index 2b2970ef1e..c84567b89d 100644
--- a/packages/mobile/src/tests/splash.screen.test.tsx
+++ b/packages/mobile/src/tests/splash.screen.test.tsx
@@ -25,12 +25,10 @@ describe('Splash screen', () => {
     const invitationCode =
       'QmZoiJNAvCffeEHBjk766nLuKVdkxkAT7wfFJDPPLsbKSE=y7yczmugl2tekami7sbdz5pfaemvx7bahwthrdvcbzw5vex2crsr26qd'
 
-    const route: { key: string; name: ScreenNames.SplashScreen; params: { code?: string } } = {
+    const route: { key: string; name: ScreenNames.SplashScreen; path: string } = {
       key: '',
       name: ScreenNames.SplashScreen,
-      params: {
-        code: invitationCode,
-      },
+      path: invitationCode,
     }
 
     renderComponent(
diff --git a/packages/state-manager/src/sagas/communities/communities.selectors.test.ts b/packages/state-manager/src/sagas/communities/communities.selectors.test.ts
index 966e5cd3f2..50233bbe90 100644
--- a/packages/state-manager/src/sagas/communities/communities.selectors.test.ts
+++ b/packages/state-manager/src/sagas/communities/communities.selectors.test.ts
@@ -125,6 +125,12 @@ describe('communitiesSelectors', () => {
         certificates: [identity.userCertificate || ''],
       })
     )
+
+    store.dispatch(
+      usersActions.setAllCerts({
+        certificates: [identity.userCertificate || ''],
+      })
+    )
     const ownerNickname = communitiesSelectors.ownerNickname(store.getState())
     expect(ownerNickname).toEqual(identity.nickname)
   })
diff --git a/packages/state-manager/src/sagas/identity/updateCertificate/updateCertificate.saga.ts b/packages/state-manager/src/sagas/identity/updateCertificate/updateCertificate.saga.ts
index a03438bd5d..350307a1af 100644
--- a/packages/state-manager/src/sagas/identity/updateCertificate/updateCertificate.saga.ts
+++ b/packages/state-manager/src/sagas/identity/updateCertificate/updateCertificate.saga.ts
@@ -5,29 +5,29 @@ import { identitySelectors } from '../identity.selectors'
 import { loadCSR, pubKeyMatch } from '@quiet/identity'
 import { identityActions } from '../identity.slice'
 import { communitiesSelectors } from '../../communities/communities.selectors'
+import { usersActions } from '../../users/users.slice'
 
 export function* updateCertificateSaga(action: PayloadAction<SendCertificatesResponse>): Generator {
   const certificate = yield* select(identitySelectors.hasCertificate)
   const communityId = yield* select(communitiesSelectors.currentCommunityId)
-
-  if (certificate) return
-
   const csr = yield* select(identitySelectors.csr)
 
-  if (!csr?.userCsr) return
+  if (!certificate && csr?.userCsr) {
+    const parsedCsr = yield* call(loadCSR, csr?.userCsr)
 
-  const parsedCsr = yield* call(loadCSR, csr?.userCsr)
+    const cert = action.payload.certificates.find(cert => {
+      if (pubKeyMatch(cert, parsedCsr)) return cert
+    })
 
-  const cert = action.payload.certificates.find(cert => {
-    if (pubKeyMatch(cert, parsedCsr)) return cert
-  })
-
-  if (cert) {
-    yield* put(
-      identityActions.storeUserCertificate({
-        userCertificate: cert,
-        communityId,
-      })
-    )
+    if (cert) {
+      yield* put(
+        identityActions.storeUserCertificate({
+          userCertificate: cert,
+          communityId,
+        })
+      )
+    }
   }
+
+  yield* put(usersActions.setAllCerts(action.payload))
 }
diff --git a/packages/state-manager/src/sagas/users/users.slice.test.ts b/packages/state-manager/src/sagas/users/users.slice.test.ts
index 8beaa59807..aeb64ea22a 100644
--- a/packages/state-manager/src/sagas/users/users.slice.test.ts
+++ b/packages/state-manager/src/sagas/users/users.slice.test.ts
@@ -60,6 +60,12 @@ describe('users reducer', () => {
       })
     )
 
+    store.dispatch(
+      usersActions.setAllCerts({
+        certificates: [userCertString],
+      })
+    )
+
     const certificates = usersSelectors.certificates(store.getState())
 
     expect(certificates[userPubKey]).toEqual(parsedCert)
diff --git a/packages/state-manager/src/sagas/users/users.slice.ts b/packages/state-manager/src/sagas/users/users.slice.ts
index 75e56531f3..27ecdf1e65 100644
--- a/packages/state-manager/src/sagas/users/users.slice.ts
+++ b/packages/state-manager/src/sagas/users/users.slice.ts
@@ -17,7 +17,9 @@ export const usersSlice = createSlice({
     storeUserCertificate: (state, action: PayloadAction<{ certificate: string }>) => {
       certificatesAdapter.addOne(state.certificates, parseCertificate(action.payload.certificate))
     },
-    responseSendCertificates: (state, action: PayloadAction<SendCertificatesResponse>) => {
+    responseSendCertificates: (state, action: PayloadAction<SendCertificatesResponse>) => {},
+
+    setAllCerts: (state, action: PayloadAction<SendCertificatesResponse>) => {
       certificatesAdapter.setAll(
         state.certificates,
         Object.values(action.payload.certificates).map(item => {

From a4132fad268ed5c5fcae86371cb98a2ddcddc868 Mon Sep 17 00:00:00 2001
From: Kacper Michalik <kacper.michalik@rumblefish.pl>
Date: Fri, 13 Oct 2023 15:27:14 +0200
Subject: [PATCH 13/13] Publish

 - @quiet/backend@2.0.1-alpha.6
 - @quiet/desktop@2.0.1-alpha.6
 - integration-tests@2.0.1-alpha.6
 - @quiet/mobile@2.0.1-alpha.6
 - @quiet/state-manager@2.0.1-alpha.6
---
 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/integration-tests/CHANGELOG.md      |  8 ++++++++
 packages/integration-tests/package-lock.json |  4 ++--
 packages/integration-tests/package.json      |  4 ++--
 packages/mobile/CHANGELOG.md                 | 11 +++++++++++
 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 +-
 18 files changed, 67 insertions(+), 24 deletions(-)

diff --git a/packages/backend/CHANGELOG.md b/packages/backend/CHANGELOG.md
index 8ed8354cf7..cbae8af270 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.
 
+## [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
diff --git a/packages/backend/package-lock.json b/packages/backend/package-lock.json
index 3041a3c245..5443150edb 100644
--- a/packages/backend/package-lock.json
+++ b/packages/backend/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@quiet/backend",
-  "version": "2.0.1-alpha.5",
+  "version": "2.0.1-alpha.6",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@quiet/backend",
-      "version": "2.0.1-alpha.5",
+      "version": "2.0.1-alpha.6",
       "license": "MIT",
       "dependencies": {
         "@chainsafe/libp2p-gossipsub": "6.1.0",
diff --git a/packages/backend/package.json b/packages/backend/package.json
index a78b05f636..43ca6f284b 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@quiet/backend",
-	"version": "2.0.1-alpha.5",
+	"version": "2.0.1-alpha.6",
 	"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": "^2.0.1-alpha.4",
-		"@quiet/state-manager": "^2.0.1-alpha.5",
+		"@quiet/state-manager": "^2.0.1-alpha.6",
 		"@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 d3de5b51b6..2f10326d8c 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.
 
+## [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
diff --git a/packages/desktop/package-lock.json b/packages/desktop/package-lock.json
index 6dbf869507..0c4f635c1e 100644
--- a/packages/desktop/package-lock.json
+++ b/packages/desktop/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@quiet/desktop",
-  "version": "2.0.1-alpha.5",
+  "version": "2.0.1-alpha.6",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@quiet/desktop",
-      "version": "2.0.1-alpha.5",
+      "version": "2.0.1-alpha.6",
       "license": "ISC",
       "dependencies": {
         "@electron/remote": "^2.0.8",
diff --git a/packages/desktop/package.json b/packages/desktop/package.json
index ae568cc1f2..a70e79cd71 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": "2.0.1-alpha.5",
+  "version": "2.0.1-alpha.6",
   "description": "Decentralized team chat",
   "main": "dist/main/main.js",
   "scripts": {
@@ -157,7 +157,7 @@
     "@mui/material": "~5.10.15",
     "@quiet/eslint-config": "^2.0.1-alpha.4",
     "@quiet/identity": "^2.0.1-alpha.4",
-    "@quiet/state-manager": "^2.0.1-alpha.5",
+    "@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/integration-tests/CHANGELOG.md b/packages/integration-tests/CHANGELOG.md
index 4fd46af801..31d63bc5d3 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.
 
+## [2.0.1-alpha.6](https://github.com/TryQuiet/quiet/compare/integration-tests@2.0.1-alpha.5...integration-tests@2.0.1-alpha.6) (2023-10-13)
+
+**Note:** Version bump only for package integration-tests
+
+
+
+
+
 ## [2.0.1-alpha.5](https://github.com/TryQuiet/quiet/compare/integration-tests@2.0.1-alpha.4...integration-tests@2.0.1-alpha.5) (2023-10-12)
 
 **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 74d29c22c8..f33a0eb837 100644
--- a/packages/integration-tests/package-lock.json
+++ b/packages/integration-tests/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "integration-tests",
-  "version": "2.0.1-alpha.5",
+  "version": "2.0.1-alpha.6",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "integration-tests",
-      "version": "2.0.1-alpha.5",
+      "version": "2.0.1-alpha.6",
       "license": "ISC",
       "dependencies": {
         "@peculiar/webcrypto": "1.4.3",
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
index 47b0310925..c12675588f 100644
--- a/packages/integration-tests/package.json
+++ b/packages/integration-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "integration-tests",
-  "version": "2.0.1-alpha.5",
+  "version": "2.0.1-alpha.6",
   "description": "",
   "types": "lib/index.d.ts",
   "main": "lib/index.js",
@@ -36,7 +36,7 @@
     "@peculiar/webcrypto": "1.4.3",
     "@quiet/identity": "^2.0.1-alpha.4",
     "@quiet/logger": "^2.0.1-alpha.4",
-    "@quiet/state-manager": "^2.0.1-alpha.5",
+    "@quiet/state-manager": "^2.0.1-alpha.6",
     "@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 d2f380aabe..c1f9eb0bcb 100644
--- a/packages/mobile/CHANGELOG.md
+++ b/packages/mobile/CHANGELOG.md
@@ -3,6 +3,17 @@
 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/mobile@2.0.1-alpha.5...@quiet/mobile@2.0.1-alpha.6) (2023-10-13)
+
+
+### Bug Fixes
+
+* fallback to gradle.properties for ndk path ([#1960](https://github.com/TryQuiet/quiet/issues/1960)) ([a1d341c](https://github.com/TryQuiet/quiet/commit/a1d341c9257d3fee93678655741d2ef7eb101c6c))
+
+
+
+
+
 ## [2.0.1-alpha.5](https://github.com/TryQuiet/quiet/compare/@quiet/mobile@2.0.1-alpha.4...@quiet/mobile@2.0.1-alpha.5) (2023-10-12)
 
 **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 1d7236d73a..5e9c2970c7 100644
--- a/packages/mobile/android/app/build.gradle
+++ b/packages/mobile/android/app/build.gradle
@@ -172,8 +172,8 @@ android {
         applicationId "com.quietmobile"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 343
-        versionName "2.0.1-alpha.5"
+        versionCode 344
+        versionName "2.0.1-alpha.6"
         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 fabbc295c9..1c617e3992 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>323</string>
+	<string>324</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 1d46743f36..368eecda94 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>323</string>
+	<string>324</string>
 </dict>
 </plist>
diff --git a/packages/mobile/package-lock.json b/packages/mobile/package-lock.json
index 62f3ade186..fec1d6042b 100644
--- a/packages/mobile/package-lock.json
+++ b/packages/mobile/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@quiet/mobile",
-  "version": "2.0.1-alpha.5",
+  "version": "2.0.1-alpha.6",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@quiet/mobile",
-      "version": "2.0.1-alpha.5",
+      "version": "2.0.1-alpha.6",
       "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 1457bcc46c..14d28d8808 100644
--- a/packages/mobile/package.json
+++ b/packages/mobile/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@quiet/mobile",
-  "version": "2.0.1-alpha.5",
+  "version": "2.0.1-alpha.6",
   "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": "^2.0.1-alpha.5",
+    "@quiet/backend": "^2.0.1-alpha.6",
     "@quiet/common": "^2.0.1-alpha.4",
     "@quiet/identity": "^2.0.1-alpha.4",
-    "@quiet/state-manager": "^2.0.1-alpha.5",
+    "@quiet/state-manager": "^2.0.1-alpha.6",
     "@quiet/types": "^2.0.1-alpha.4",
     "@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 374dea0999..44344e4dff 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.
 
+## [2.0.1-alpha.6](https://github.com/TryQuiet/quiet/compare/@quiet/state-manager@2.0.1-alpha.5...@quiet/state-manager@2.0.1-alpha.6) (2023-10-13)
+
+**Note:** Version bump only for package @quiet/state-manager
+
+
+
+
+
 ## [2.0.1-alpha.5](https://github.com/TryQuiet/quiet/compare/@quiet/state-manager@2.0.1-alpha.4...@quiet/state-manager@2.0.1-alpha.5) (2023-10-12)
 
 **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 3cec3a31e9..0913130be1 100644
--- a/packages/state-manager/package-lock.json
+++ b/packages/state-manager/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@quiet/state-manager",
-  "version": "2.0.1-alpha.5",
+  "version": "2.0.1-alpha.6",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@quiet/state-manager",
-      "version": "2.0.1-alpha.5",
+      "version": "2.0.1-alpha.6",
       "license": "ISC",
       "dependencies": {
         "@reduxjs/toolkit": "^1.9.1",
diff --git a/packages/state-manager/package.json b/packages/state-manager/package.json
index f5994670d8..c2980dd535 100644
--- a/packages/state-manager/package.json
+++ b/packages/state-manager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@quiet/state-manager",
-  "version": "2.0.1-alpha.5",
+  "version": "2.0.1-alpha.6",
   "description": "",
   "main": "lib/index.js",
   "private": true,