fix: resolve quality check issues after rebase

- Fix debugLogger.ts: reorder atoms to avoid use-before-define
- Fix slidingSync.ts: replace ++ with += 1 for no-plusplus rule
- Fix instrument.ts: add eslint-disable for param reassigns and console
- Fix index.tsx: correct import order and add button type attribute
- Fix formatting with prettier on all files
- Rebased on latest origin/dev

Author: Evie Gauthier

.github/workflows/sync-fork.yml

@@ -47,7 +47,7 @@ jobs:
         run: |
           echo "Current ref: ${{ github.ref }}"
           echo "Event name: ${{ github.event_name }}"
-          
+
           # Check if this was triggered by a feature branch push
           if [[ "${{ github.ref }}" =~ ^refs/heads/(feat|fix|perf|chore|docs|style|refactor|test)/ ]]; then
             echo "FEATURE_PUSH=true" >> $GITHUB_ENV
@@ -131,12 +131,12 @@ jobs:
         if: env.SHOULD_UPDATE_INTEGRATION == 'true'
         run: |
           echo "Recreating integration/all-features from dev"
-          
+
           # Delete and recreate integration branch (create if doesn't exist)
           git checkout dev
           git branch -D integration/all-features 2>/dev/null || true
           git checkout -b integration/all-features origin/dev
-          
+
           # Merge all feature branches into integration
           BRANCHES=$(git for-each-ref --format='%(refname:short)' refs/remotes/origin/ | \
             grep -E '^origin/(feat|fix|perf|chore|docs|style|refactor|test)/' | \
@@ -160,7 +160,7 @@ jobs:
               echo ""
             done
           fi
-          
+
           # Force push integration branch (it's a working branch)
           git push origin integration/all-features --force
 

src/app/features/create-room/CreateRoom.tsx

@@ -41,8 +41,8 @@ import {
 import { RoomType } from '$types/matrix/room';
 import { CreateRoomTypeSelector } from '$components/create-room/CreateRoomTypeSelector';
 import { getRoomIconSrc } from '$utils/room';
-import { ErrorCode } from '../../cs-errorcode';
 import { createDebugLogger } from '$utils/debugLogger';
+import { ErrorCode } from '../../cs-errorcode';
 
 const debugLog = createDebugLogger('CreateRoom');
 

src/app/features/room/Room.tsx

@@ -15,11 +15,11 @@ import { useRoomMembers } from '$hooks/useRoomMembers';
 import { CallView } from '$features/call/CallView';
 import { WidgetsDrawer } from '$features/widgets/WidgetsDrawer';
 import { callChatAtom } from '$state/callEmbed';
+import { createDebugLogger } from '$utils/debugLogger';
 import { RoomViewHeader } from './RoomViewHeader';
 import { MembersDrawer } from './MembersDrawer';
 import { RoomView } from './RoomView';
 import { CallChatView } from './CallChatView';
-import { createDebugLogger } from '$utils/debugLogger';
 
 const debugLog = createDebugLogger('Room');
 

src/app/features/settings/notifications/PushNotifications.tsx

@@ -1,6 +1,6 @@
 import { MatrixClient } from '$types/matrix-sdk';
-import { ClientConfig } from '../../../hooks/useClientConfig';
 import { createDebugLogger } from '$utils/debugLogger';
+import { ClientConfig } from '../../../hooks/useClientConfig';
 
 const debugLog = createDebugLogger('PushNotifications');
 

src/app/state/debugLogger.ts

@@ -3,10 +3,15 @@
  */
 import { atom } from 'jotai';
 import { atomWithRefresh } from 'jotai/utils';
-import { getDebugLogger, LogEntry } from '$utils/debugLogger';
+import { getDebugLogger } from '$utils/debugLogger';
 
 const debugLogger = getDebugLogger();
 
+/**
+ * Atom for retrieving debug logs with refresh capability
+ */
+export const debugLogsAtom = atomWithRefresh(() => debugLogger.getLogs());
+
 /**
  * Atom for enabling/disabling debug logging
  */
@@ -19,21 +24,10 @@ export const debugLoggerEnabledAtom = atom(
   }
 );
 
-/**
- * Atom for retrieving debug logs with refresh capability
- */
-export const debugLogsAtom = atomWithRefresh(() => debugLogger.getLogs());
-
 /**
  * Atom for filtered logs
  */
-export const filteredDebugLogsAtom = atom(
-  (get) => get(debugLogsAtom),
-  (get, set, filters?: { level?: string; category?: string; since?: number }) => {
-    const allLogs = get(debugLogsAtom);
-    return allLogs; // Can be extended with filtering logic
-  }
-);
+export const filteredDebugLogsAtom = atom((get) => get(debugLogsAtom));
 
 /**
  * Action to clear all debug logs
@@ -46,6 +40,4 @@ export const clearDebugLogsAtom = atom(null, (_, set) => {
 /**
  * Action to export debug logs
  */
-export const exportDebugLogsAtom = atom(null, () => {
-  return debugLogger.exportLogs();
-});
+export const exportDebugLogsAtom = atom(null, () => debugLogger.exportLogs());

src/app/utils/debugLogger.ts

@@ -31,8 +31,11 @@ type LogListener = (entry: LogEntry) => void;
 
 class DebugLoggerService {
   private logs: LogEntry[] = [];
+
   private maxLogs = 1000; // Circular buffer size
+
   private enabled = false;
+
   private listeners: Set<LogListener> = new Set();
 
   constructor() {
@@ -123,7 +126,7 @@ class DebugLoggerService {
     }
 
     if (filters?.since) {
-      const since = filters.since;
+      const { since } = filters;
       filtered = filtered.filter((log) => log.timestamp >= since);
     }
 

src/client/initMatrix.ts

@@ -354,9 +354,8 @@ const disposeSlidingSync = (mx: MatrixClient): void => {
   slidingSyncByClient.delete(mx);
 };
 
-export const getSlidingSyncManager = (mx: MatrixClient): SlidingSyncManager | undefined => {
-  return slidingSyncByClient.get(mx);
-};
+export const getSlidingSyncManager = (mx: MatrixClient): SlidingSyncManager | undefined =>
+  slidingSyncByClient.get(mx);
 
 export const startClient = async (mx: MatrixClient, config?: StartClientConfig): Promise<void> => {
   debugLog.info('sync', 'Starting Matrix client', { userId: mx.getUserId() });

src/client/slidingSync.ts

@@ -14,7 +14,6 @@ import {
   MSC3575_STATE_KEY_ME,
   EventType,
   User,
-  SlidingSyncEventHandlerMap,
 } from '$types/matrix-sdk';
 import { createLogger } from '$utils/debug';
 import { createDebugLogger } from '$utils/debugLogger';
@@ -369,7 +368,7 @@ export class SlidingSyncManager {
 
     this.onLifecycle = (state, resp, err) => {
       const syncStartTime = performance.now();
-      this.syncCount++;
+      this.syncCount += 1;
 
       debugLog.info('sync', `Sliding sync lifecycle: ${state} (cycle #${this.syncCount})`, {
         state,

src/index.tsx

@@ -11,10 +11,10 @@ import '@fontsource/space-mono/400-italic.css';
 import '@fontsource/space-mono/700-italic.css';
 import 'folds/dist/style.css';
 import { configClass, varsClass } from 'folds';
+import * as Sentry from '@sentry/react';
 import { trimTrailingSlash } from './app/utils/common';
 import App from './app/pages/App';
 import './app/i18n';
-import * as Sentry from '@sentry/react';
 
 import './index.css';
 import './app/styles/themes.css';
@@ -157,7 +157,9 @@ const mountApp = () => {
         <div style={{ padding: '2rem', textAlign: 'center' }}>
           <h1>Something went wrong</h1>
           <p>{error instanceof Error ? error.message : 'An unexpected error occurred'}</p>
-          <button onClick={resetError}>Try again</button>
+          <button type="button" onClick={resetError}>
+            Try again
+          </button>
         </div>
       )}
       showDialog

src/instrument.ts

@@ -90,7 +90,9 @@ if (dsn) {
           event.message.includes('token')
         ) {
           // You can choose to drop the event entirely or redact it
+          // eslint-disable-next-line no-param-reassign
           event.message = event.message.replace(/access_token=[^&\s]+/g, 'access_token=[REDACTED]');
+          // eslint-disable-next-line no-param-reassign
           event.message = event.message.replace(/password=[^&\s]+/g, 'password=[REDACTED]');
         }
       }
@@ -99,10 +101,12 @@ if (dsn) {
       if (event.exception?.values) {
         event.exception.values.forEach((exception) => {
           if (exception.value) {
+            // eslint-disable-next-line no-param-reassign
             exception.value = exception.value.replace(
               /access_token=[^&\s]+/g,
               'access_token=[REDACTED]'
             );
+            // eslint-disable-next-line no-param-reassign
             exception.value = exception.value.replace(/password=[^&\s]+/g, 'password=[REDACTED]');
           }
         });
@@ -112,7 +116,9 @@ if (dsn) {
     },
   });
 
+  // eslint-disable-next-line no-console
   console.info(`[Sentry] Initialized for ${environment} environment`);
 } else {
+  // eslint-disable-next-line no-console
   console.info('[Sentry] Disabled - no DSN provided');
 }