clean code

Author: Kriys94

packages/core-backend/src/AccountActivityService.ts

@@ -615,27 +615,5 @@ export class AccountActivityService {
       'BackendWebSocketService:removeChannelCallback',
       `system-notifications.v1.${this.#options.subscriptionNamespace}`,
     );
-
-    // Unregister action handlers to prevent stale references
-    this.#messenger.unregisterActionHandler(
-      'AccountActivityService:subscribeAccounts',
-    );
-    this.#messenger.unregisterActionHandler(
-      'AccountActivityService:unsubscribeAccounts',
-    );
-
-    // Clear our own event subscriptions (events we publish)
-    this.#messenger.clearEventSubscriptions(
-      'AccountActivityService:transactionUpdated',
-    );
-    this.#messenger.clearEventSubscriptions(
-      'AccountActivityService:balanceUpdated',
-    );
-    this.#messenger.clearEventSubscriptions(
-      'AccountActivityService:subscriptionError',
-    );
-    this.#messenger.clearEventSubscriptions(
-      'AccountActivityService:statusChanged',
-    );
   }
 }

packages/core-backend/src/BackendWebSocketService.test.ts

@@ -630,14 +630,18 @@ describe('BackendWebSocketService', () => {
           mockWs.simulateClose(1000, 'Normal closure');
           await completeAsyncOperations(0);
 
-          // Service should be in ERROR state (non-recoverable)
-          expect(service.getConnectionInfo().state).toBe(WebSocketState.ERROR);
+          // Service should be in DISCONNECTED state (normal closure, not an error)
+          expect(service.getConnectionInfo().state).toBe(
+            WebSocketState.DISCONNECTED,
+          );
 
           // Advance time - should NOT attempt reconnection
           await completeAsyncOperations(200);
 
-          // Should still be in ERROR state
-          expect(service.getConnectionInfo().state).toBe(WebSocketState.ERROR);
+          // Should still be in DISCONNECTED state (no reconnection for normal closures)
+          expect(service.getConnectionInfo().state).toBe(
+            WebSocketState.DISCONNECTED,
+          );
         },
       );
     });

packages/core-backend/src/BackendWebSocketService.ts

@@ -1086,12 +1086,10 @@ export class BackendWebSocketService {
     const shouldReconnect = this.#shouldReconnectOnClose(event.code);
 
     if (shouldReconnect) {
-      log('Connection lost unexpectedly, will attempt reconnection');
+      log('Connection lost unexpectedly, will attempt reconnection', {
+        code: event.code,
+      });
       this.#scheduleReconnect();
-    } else {
-      // Non-recoverable error - set error state
-      log('Non-recoverable error', { code: event.code });
-      this.#setState(WebSocketState.ERROR);
     }
   }