fix: correct store data injecting #1847

TryQuiet · Nov 14, 2023 · 905f0af · 905f0af
1 parent b00fb79
commit 905f0af
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 19 deletions.
diff --git a/packages/desktop/src/renderer/index.tsx b/packages/desktop/src/renderer/index.tsx
@@ -22,7 +22,7 @@ ipcRenderer.on('force-save-state', async _event => {
 
 ipcRenderer.on('invitation', (_event, invitation) => {
   console.log('invitation', invitation, 'dispatching action')
-  store.dispatch(communities.actions.handleInvitationCodes(invitation.codes))
+  store.dispatch(communities.actions.customProtocol(invitation.codes))
 })
 
 const container = document.getElementById('root')

diff --git a/packages/desktop/src/renderer/sagas/index.saga.ts b/packages/desktop/src/renderer/sagas/index.saga.ts
@@ -1,13 +1,13 @@
 import { communities } from '@quiet/state-manager'
 import { all, takeEvery } from 'redux-saga/effects'
-import { handleInvitationCodeSaga } from './invitation/handleInvitationCode.saga'
+import { customProtocolSaga } from './invitation/customProtocol.saga'
 import { startConnectionSaga } from './socket/socket.saga'
 import { socketActions } from './socket/socket.slice'
 
 export default function* root(): Generator {
   const dataPort = new URLSearchParams(window.location.search).get('dataPort') || ''
   yield all([
-    takeEvery(communities.actions.handleInvitationCodes.type, handleInvitationCodeSaga),
+    takeEvery(communities.actions.customProtocol.type, customProtocolSaga),
     startConnectionSaga(
       socketActions.startConnection({
         dataPort: parseInt(dataPort),

diff --git a/...itation/handleInvitationCode.saga.test.ts → ...as/invitation/customProtocol.saga.test.ts b/...itation/handleInvitationCode.saga.test.ts → ...as/invitation/customProtocol.saga.test.ts
@@ -2,7 +2,7 @@ import { communities, getFactory, Store } from '@quiet/state-manager'
 import { Community, CommunityOwnership, CreateNetworkPayload, InvitationPair } from '@quiet/types'
 import { FactoryGirl } from 'factory-girl'
 import { expectSaga } from 'redux-saga-test-plan'
-import { handleInvitationCodeSaga } from './handleInvitationCode.saga'
+import { customProtocolSaga } from './customProtocol.saga'
 import { SocketState } from '../socket/socket.slice'
 import { prepareStore } from '../../testUtils/prepareStore'
 import { StoreKeys } from '../../store/store.keys'
@@ -39,7 +39,7 @@ describe('Handle invitation code', () => {
       ownership: CommunityOwnership.User,
       peers: validInvitationPair,
     }
-    await expectSaga(handleInvitationCodeSaga, communities.actions.handleInvitationCodes(validInvitationPair))
+    await expectSaga(customProtocolSaga, communities.actions.customProtocol(validInvitationPair))
       .withState(store.getState())
       .put(communities.actions.createNetwork(payload))
       .run()
@@ -52,7 +52,7 @@ describe('Handle invitation code', () => {
       peers: validInvitationPair,
     }
 
-    await expectSaga(handleInvitationCodeSaga, communities.actions.handleInvitationCodes(validInvitationPair))
+    await expectSaga(customProtocolSaga, communities.actions.customProtocol(validInvitationPair))
       .withState(store.getState())
       .put(
         modalsActions.openModal({
@@ -73,7 +73,7 @@ describe('Handle invitation code', () => {
       peers: [],
     }
 
-    await expectSaga(handleInvitationCodeSaga, communities.actions.handleInvitationCodes([]))
+    await expectSaga(customProtocolSaga, communities.actions.customProtocol([]))
       .withState(store.getState())
       .put(communities.actions.clearInvitationCodes())
       .put(

diff --git a/...s/invitation/handleInvitationCode.saga.ts → ...r/sagas/invitation/customProtocol.saga.ts b/...s/invitation/handleInvitationCode.saga.ts → ...r/sagas/invitation/customProtocol.saga.ts
@@ -6,8 +6,8 @@ import { socketSelectors } from '../socket/socket.selectors'
 import { ModalName } from '../modals/modals.types'
 import { modalsActions } from '../modals/modals.slice'
 
-export function* handleInvitationCodeSaga(
-  action: PayloadAction<ReturnType<typeof communities.actions.handleInvitationCodes>['payload']>
+export function* customProtocolSaga(
+  action: PayloadAction<ReturnType<typeof communities.actions.customProtocol>['payload']>
 ): Generator {
   while (true) {
     const connected = yield* select(socketSelectors.isConnected)
@@ -17,8 +17,8 @@ export function* handleInvitationCodeSaga(
     yield* delay(500)
   }
 
-  const currentCommunityId = yield* select(communities.selectors.currentCommunityId)
-  if (currentCommunityId) {
+  const community = yield* select(communities.selectors.currentCommunity)
+  if (community) {
     yield* put(
       modalsActions.openModal({
         name: ModalName.warningModal,

diff --git a/packages/desktop/src/rtl-tests/customProtocol.test.tsx b/packages/desktop/src/rtl-tests/customProtocol.test.tsx
@@ -69,7 +69,7 @@ describe('Opening app through custom protocol', () => {
       { peerId: 'abcdef', onionAddress: 'bidrmzr3ee6qa2vvrlcnqvvvsk2gmjktcqkunba326parszr44gibwyd' },
     ]
 
-    store.dispatch(communities.actions.handleInvitationCodes(invitationCodes))
+    store.dispatch(communities.actions.customProtocol(invitationCodes))
 
     store.dispatch(modalsActions.openModal({ name: ModalName.joinCommunityModal }))
 

diff --git a/packages/desktop/src/rtl-tests/deep.linking.test.tsx b/packages/desktop/src/rtl-tests/deep.linking.test.tsx
@@ -38,13 +38,13 @@ describe('Deep linking', () => {
       },
     ]
 
-    store.dispatch(communities.actions.handleInvitationCodes(validPair))
+    store.dispatch(communities.actions.customProtocol(validPair))
     await act(async () => {})
 
     const originalNetwork = communities.selectors.currentCommunity(store.getState())
 
     // Redo the action to provoke renewed saga runs
-    store.dispatch(communities.actions.handleInvitationCodes(validPair))
+    store.dispatch(communities.actions.customProtocol(validPair))
     await act(async () => {})
 
     const currentNetwork = communities.selectors.currentCommunity(store.getState())
@@ -53,12 +53,12 @@ describe('Deep linking', () => {
 
     expect(actions).toMatchInlineSnapshot(`
       Array [
-        "Communities/handleInvitationCodes",
+        "Communities/customProtocol",
         "Communities/createNetwork",
         "Communities/setInvitationCodes",
         "Communities/addNewCommunity",
         "Communities/setCurrentCommunity",
-        "Communities/handleInvitationCodes",
+        "Communities/customProtocol",
         "Modals/openModal",
       ]
     `)

diff --git a/packages/state-manager/src/sagas/communities/communities.slice.ts b/packages/state-manager/src/sagas/communities/communities.slice.ts
@@ -93,9 +93,7 @@ export const communitiesSlice = createSlice({
         },
       })
     },
-    handleInvitationCodes: (state, action: PayloadAction<InvitationPair[]>) => {
-      state.invitationCodes = action.payload
-    },
+    customProtocol: (state, _action: PayloadAction<InvitationPair[]>) => state,
     setInvitationCodes: (state, action: PayloadAction<InvitationPair[]>) => {
       state.invitationCodes = action.payload
     },