Merge branch 'develop' of github.com:TryQuiet/quiet into bug/csrs-add…

…ed-many-times
TryQuiet · Nov 21, 2023 · 85a9da8 · 85a9da8
2 parents fc6eb2a + 8d35350
commit 85a9da8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 14 deletions.
diff --git 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.6"><strong>Downloads</strong></a> | 
+    <a href="https://github.com/TryQuiet/quiet/releases/tag/quiet%401.9.7"><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.6) 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.7) 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).
 

diff --git a/packages/state-manager/src/sagas/identity/saveUserCsr/saveUserCsr.saga.test.ts b/packages/state-manager/src/sagas/identity/saveUserCsr/saveUserCsr.saga.test.ts
@@ -41,7 +41,7 @@ describe('saveUserCsr', () => {
         combineReducers({
           [StoreKeys.Communities]: communitiesReducer,
           [StoreKeys.Identity]: identityReducer,
-          [StoreKeys.Users]: usersReducer
+          [StoreKeys.Users]: usersReducer,
         }),
         {
           [StoreKeys.Communities]: {
@@ -59,20 +59,19 @@ describe('saveUserCsr', () => {
             identities: identityAdapter.setAll(identityAdapter.getInitialState(), [identity]),
           },
           [StoreKeys.Users]: {
-            ...new UsersState()
-          }
+            ...new UsersState(),
+          },
         }
       )
       .apply(socket, socket.emit, [
         SocketActionTypes.SAVE_USER_CSR,
         {
-          csr: identity.userCsr?.userCsr
+          csr: identity.userCsr?.userCsr,
         },
       ])
       .run()
   })
   test("do not save user csr if it's already included in csrs list", async () => {
-
     const socket = { emit: jest.fn(), on: jest.fn() } as unknown as Socket
 
     const community =
@@ -90,7 +89,7 @@ describe('saveUserCsr', () => {
         combineReducers({
           [StoreKeys.Communities]: communitiesReducer,
           [StoreKeys.Identity]: identityReducer,
-          [StoreKeys.Users]: usersReducer
+          [StoreKeys.Users]: usersReducer,
         }),
         {
           [StoreKeys.Communities]: {
@@ -109,15 +108,14 @@ describe('saveUserCsr', () => {
           },
           [StoreKeys.Users]: {
             ...new UsersState(),
-            csrs: certificatesAdapter.setAll(certificatesAdapter.getInitialState(), [identity.userCsr?.pkcs10.pkcs10])
-          }
+            csrs: certificatesAdapter.setAll(certificatesAdapter.getInitialState(), [identity.userCsr?.pkcs10.pkcs10]),
+          },
         }
       )
-      .not
-      .apply(socket, socket.emit, [
+      .not.apply(socket, socket.emit, [
         SocketActionTypes.SAVE_USER_CSR,
         {
-          csr: identity.userCsr?.userCsr
+          csr: identity.userCsr?.userCsr,
         },
       ])
       .run()

diff --git a/packages/state-manager/src/sagas/identity/saveUserCsr/saveUserCsr.saga.ts b/packages/state-manager/src/sagas/identity/saveUserCsr/saveUserCsr.saga.ts
@@ -22,4 +22,4 @@ export function* saveUserCsrSaga(socket: Socket): Generator {
   }
   console.log(`Send ${SocketActionTypes.SAVE_USER_CSR}`)
   yield* apply(socket, socket.emit, applyEmitParams(SocketActionTypes.SAVE_USER_CSR, payload))
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,4 +22,4 @@ export function* saveUserCsrSaga(socket: Socket): Generator { @@
       }
       console.log(`Send ${SocketActionTypes.SAVE_USER_CSR}`)
       yield* apply(socket, socket.emit, applyEmitParams(SocketActionTypes.SAVE_USER_CSR, payload))
-    }
+    }