fix: mobile deep link saga - check if invitation code is parseable be…

…fore handling it to joincommunityscreen
TryQuiet · Oct 25, 2023 · ffdd901 · ffdd901
1 parent c00c8f9
commit ffdd901
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 14 deletions.
diff --git a/packages/mobile/src/store/init/deepLink/deepLink.saga.test.ts b/packages/mobile/src/store/init/deepLink/deepLink.saga.test.ts
@@ -3,15 +3,13 @@ import { combineReducers } from '@reduxjs/toolkit'
 import { reducers } from '../../root.reducer'
 import { Store } from '../../store.types'
 import { prepareStore } from '../../../tests/utils/prepareStore'
-import { communities, connection, getInvitationCodes, identity } from '@quiet/state-manager'
+import { communities, connection, identity } from '@quiet/state-manager'
 import { initActions } from '../init.slice'
 import { navigationActions } from '../../navigation/navigation.slice'
 import { ScreenNames } from '../../../const/ScreenNames.enum'
 import { deepLinkSaga } from './deepLink.saga'
 import { type Community, CommunityOwnership, ConnectionProcessInfo, type Identity, InvitationData } from '@quiet/types'
-import { Site, composeInvitationShareUrl } from '@quiet/common'
-import { appImages } from '../../../assets'
-import { replaceScreen } from '../../../RootNavigation'
+import { composeInvitationShareUrl } from '@quiet/common'
 
 describe('deepLinkSaga', () => {
   let store: Store
@@ -136,6 +134,18 @@ describe('deepLinkSaga', () => {
     await expectSaga(deepLinkSaga, initActions.deepLink(validCode))
       .withReducer(reducer)
       .withState(store.getState())
+      .put.like({
+        action: {
+          type: navigationActions.replaceScreen.type,
+          payload: {
+            screen: ScreenNames.ErrorScreen,
+            params: {
+              title: 'You already belong to a community',
+              message: "We're sorry but for now you can only be a member of a single community at a time",
+            },
+          },
+        },
+      })
       .not.put(
         communities.actions.createNetwork({
           ownership: CommunityOwnership.User,
@@ -166,6 +176,18 @@ describe('deepLinkSaga', () => {
     await expectSaga(deepLinkSaga, initActions.deepLink(invalidCode))
       .withReducer(reducer)
       .withState(store.getState())
+      .put.like({
+        action: {
+          type: navigationActions.replaceScreen.type,
+          payload: {
+            screen: ScreenNames.ErrorScreen,
+            params: {
+              title: 'Invalid invitation link',
+              message: 'Please check your invitation link and try again',
+            },
+          },
+        },
+      })
       .not.put(
         communities.actions.createNetwork({
           ownership: CommunityOwnership.User,

diff --git a/packages/mobile/src/store/init/deepLink/deepLink.saga.ts b/packages/mobile/src/store/init/deepLink/deepLink.saga.ts
@@ -41,20 +41,11 @@ export function* deepLinkSaga(action: PayloadAction<ReturnType<typeof initAction
     return
   }
 
-  yield* put(
-    navigationActions.replaceScreen({
-      screen: ScreenNames.JoinCommunityScreen,
-      params: {
-        code,
-      },
-    })
-  )
-
   let data: InvitationData
   try {
     data = getInvitationCodes(code)
   } catch (e) {
-    console.error(e.message)
+    console.warn(e.message)
     yield* put(
       navigationActions.replaceScreen({
         screen: ScreenNames.ErrorScreen,
@@ -69,6 +60,15 @@ export function* deepLinkSaga(action: PayloadAction<ReturnType<typeof initAction
     return
   }
 
+  yield* put(
+    navigationActions.replaceScreen({
+      screen: ScreenNames.JoinCommunityScreen,
+      params: {
+        code,
+      },
+    })
+  )
+
   const payload: CreateNetworkPayload = {
     ownership: CommunityOwnership.User,
     peers: data.pairs,