Fixup

packages/backend/src/nest/connections-manager/connections-manager.service.ts

@@ -223,7 +223,11 @@ export class ConnectionsManagerService extends EventEmitter implements OnModuleI
     }
   }
 
-  public async closeAllServices(options: { saveTor: boolean } = { saveTor: false }) {
+  public async closeAllServices(
+    options: { saveTor: boolean; purgeLocalDb: boolean } = { saveTor: false, purgeLocalDb: false }
+  ) {
+    this.logger('Closing services')
+
     await this.closeSocket()
 
     if (this.tor && !options.saveTor) {
@@ -241,7 +245,11 @@ export class ConnectionsManagerService extends EventEmitter implements OnModuleI
       await this.libp2pService.close()
     }
     if (this.localDbService) {
-      this.logger('Closing local storage')
+      if (options.purgeLocalDb) {
+        this.logger('Purging local DB')
+        await this.localDbService.purge()
+      }
+      this.logger('Closing local DB')
       await this.localDbService.close()
     }
   }
@@ -285,31 +293,14 @@ export class ConnectionsManagerService extends EventEmitter implements OnModuleI
   public async leaveCommunity() {
     this.logger('Running leaveCommunity')
 
-    await this.closeSocket()
-
-    if (this.storageService) {
-      this.logger('Stopping OrbitDB')
-      await this.storageService.stopOrbitDb()
-    }
-
-    if (this.libp2pService) {
-      this.logger('Stopping libp2p')
-      await this.libp2pService.close()
-    }
-
-    if (this.localDbService) {
-      this.logger('Purging local DB')
-      await this.localDbService.purge()
-      this.logger('Closing local DB')
-      await this.localDbService.close()
-    }
-
-    this.logger('Resetting tor')
-    this.tor.resetHiddenServices()
+    await this.closeAllServices({ saveTor: true, purgeLocalDb: true })
 
     this.logger('Purging data')
     await this.purgeData()
 
+    this.logger('Resetting Tor')
+    this.tor.resetHiddenServices()
+
     this.logger('Resetting state')
     await this.resetState()
 

packages/mobile/src/store/init/startConnection/startConnection.saga.ts

@@ -2,6 +2,7 @@ import { io } from 'socket.io-client'
 import {
   select,
   put,
+  putResolve,
   call,
   cancel,
   fork,

packages/mobile/src/store/nativeServices/leaveCommunity/leaveCommunity.saga.ts

@@ -1,4 +1,4 @@
-import { select, call, put } from 'typed-redux-saga'
+import { select, call, putResolve } from 'typed-redux-saga'
 import { app } from '@quiet/state-manager'
 import { persistor } from '../../store'
 import { nativeServicesActions } from '../nativeServices.slice'