diff --git a/backend/.env.example b/backend/.env.example
index 4391e10..b69d729 100644
--- a/backend/.env.example
+++ b/backend/.env.example
@@ -50,3 +50,4 @@ UEX_BACKOFF_BASE_MS=1000
 UEX_RATE_LIMIT_PAUSE_MS=2000
 UEX_ENDPOINTS_PAUSE_MS=2000
 UEX_API_KEY=
+
diff --git a/backend/.eslintrc.js b/backend/.eslintrc.js
index 259de13..bee2c17 100644
--- a/backend/.eslintrc.js
+++ b/backend/.eslintrc.js
@@ -20,6 +20,6 @@ module.exports = {
     '@typescript-eslint/interface-name-prefix': 'off',
     '@typescript-eslint/explicit-function-return-type': 'off',
     '@typescript-eslint/explicit-module-boundary-types': 'off',
-    '@typescript-eslint/no-explicit-any': 'off',
+    '@typescript-eslint/no-explicit-any': 'error',
   },
 };
diff --git a/backend/data-source.js b/backend/data-source.js
index c6cc9a4..6a84687 100644
--- a/backend/data-source.js
+++ b/backend/data-source.js
@@ -1,24 +1,24 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
 exports.AppDataSource = void 0;
-require("dotenv/config");
-const typeorm_1 = require("typeorm");
-const user_entity_1 = require("./src/modules/users/user.entity");
+require('dotenv/config');
+const typeorm_1 = require('typeorm');
+const user_entity_1 = require('./src/modules/users/user.entity');
 exports.AppDataSource = new typeorm_1.DataSource({
-    type: 'postgres',
-    host: process.env.DATABASE_HOST,
-    port: parseInt(process.env.DATABASE_PORT || '0'),
-    username: process.env.DATABASE_USER,
-    password: process.env.DATABASE_PASSWORD,
-    database: process.env.DATABASE_NAME,
-    entities: [user_entity_1.User],
-    migrations: ['src/migrations/*.ts'],
-    synchronize: false,
+  type: 'postgres',
+  host: process.env.DATABASE_HOST,
+  port: parseInt(process.env.DATABASE_PORT || '0'),
+  username: process.env.DATABASE_USER,
+  password: process.env.DATABASE_PASSWORD,
+  database: process.env.DATABASE_NAME,
+  entities: [user_entity_1.User],
+  migrations: ['src/migrations/*.ts'],
+  synchronize: false,
 });
 exports.AppDataSource.initialize()
-    .then(() => {
+  .then(() => {
     console.log('Data Source has been initialized!');
-})
-    .catch((err) => {
+  })
+  .catch((err) => {
     console.error('Error during Data Source initialization:', err);
-});
+  });
diff --git a/backend/eslint.config.js b/backend/eslint.config.js
index 5aeba67..561b499 100644
--- a/backend/eslint.config.js
+++ b/backend/eslint.config.js
@@ -10,7 +10,7 @@ const compat = new FlatCompat({
 module.exports = [
   ...compat.extends(
     'plugin:@typescript-eslint/recommended',
-    'plugin:prettier/recommended'
+    'plugin:prettier/recommended',
   ),
   {
     files: ['src/**/*.ts'],
@@ -26,11 +26,14 @@ module.exports = [
       '@typescript-eslint/interface-name-prefix': 'off',
       '@typescript-eslint/explicit-function-return-type': 'off',
       '@typescript-eslint/explicit-module-boundary-types': 'off',
-      '@typescript-eslint/no-explicit-any': 'off',
-      '@typescript-eslint/no-unused-vars': ['error', {
-        argsIgnorePattern: '^_',
-        varsIgnorePattern: '^_',
-      }],
+      '@typescript-eslint/no-explicit-any': 'error',
+      '@typescript-eslint/no-unused-vars': [
+        'error',
+        {
+          argsIgnorePattern: '^_',
+          varsIgnorePattern: '^_',
+        },
+      ],
     },
   },
   {
@@ -45,11 +48,14 @@ module.exports = [
       '@typescript-eslint/interface-name-prefix': 'off',
       '@typescript-eslint/explicit-function-return-type': 'off',
       '@typescript-eslint/explicit-module-boundary-types': 'off',
-      '@typescript-eslint/no-explicit-any': 'off',
-      '@typescript-eslint/no-unused-vars': ['error', {
-        argsIgnorePattern: '^_',
-        varsIgnorePattern: '^_',
-      }],
+      '@typescript-eslint/no-explicit-any': 'error',
+      '@typescript-eslint/no-unused-vars': [
+        'error',
+        {
+          argsIgnorePattern: '^_',
+          varsIgnorePattern: '^_',
+        },
+      ],
     },
   },
 ];
diff --git a/backend/src/app.module.ts b/backend/src/app.module.ts
index c42646a..3d33418 100644
--- a/backend/src/app.module.ts
+++ b/backend/src/app.module.ts
@@ -92,10 +92,12 @@ if (!isTest) {
           });
           console.log('✅ Redis cache connected successfully');
           return { store };
-        } catch (error: any) {
+        } catch (error: unknown) {
+          const errorMessage =
+            error instanceof Error ? error.message : String(error);
           console.warn(
             '⚠️  Redis connection failed, using in-memory cache:',
-            error?.message || error,
+            errorMessage,
           );
           // Fall back to in-memory cache if Redis is not available
           return {
diff --git a/backend/src/common/filters/http-exception.filter.ts b/backend/src/common/filters/http-exception.filter.ts
index 8273540..3c9423a 100644
--- a/backend/src/common/filters/http-exception.filter.ts
+++ b/backend/src/common/filters/http-exception.filter.ts
@@ -7,6 +7,12 @@ import {
 } from '@nestjs/common';
 import { Request, Response } from 'express';
 
+interface HttpExceptionResponse {
+  message?: string | string[];
+  errors?: unknown;
+  [key: string]: unknown;
+}
+
 @Catch(HttpException)
 export class HttpExceptionFilter implements ExceptionFilter {
   catch(exception: HttpException, host: ArgumentsHost) {
@@ -16,21 +22,28 @@ export class HttpExceptionFilter implements ExceptionFilter {
     const status = exception.getStatus();
     const exceptionResponse = exception.getResponse();
 
+    let message: string | string[] = 'An error occurred';
+    let errors: unknown = undefined;
+
+    if (typeof exceptionResponse === 'string') {
+      message = exceptionResponse;
+    } else if (
+      typeof exceptionResponse === 'object' &&
+      exceptionResponse !== null
+    ) {
+      const typedResponse = exceptionResponse as HttpExceptionResponse;
+      message = typedResponse.message || 'An error occurred';
+      errors = typedResponse.errors;
+    }
+
     const errorResponse = {
       success: false,
       statusCode: status,
       timestamp: new Date().toISOString(),
       path: request.url,
       method: request.method,
-      message:
-        typeof exceptionResponse === 'string'
-          ? exceptionResponse
-          : (exceptionResponse as any).message || 'An error occurred',
-      errors:
-        typeof exceptionResponse === 'object' &&
-        (exceptionResponse as any).errors
-          ? (exceptionResponse as any).errors
-          : undefined,
+      message,
+      errors,
     };
 
     response.status(status).json(errorResponse);
diff --git a/backend/src/common/guards/throttler.guard.ts b/backend/src/common/guards/throttler.guard.ts
index 5570d4a..b6ec743 100644
--- a/backend/src/common/guards/throttler.guard.ts
+++ b/backend/src/common/guards/throttler.guard.ts
@@ -16,8 +16,8 @@ import { Request } from 'express';
  */
 @Injectable()
 export class CustomThrottlerGuard extends ThrottlerGuard {
-  protected async getTracker(req: Record<string, any>): Promise<string> {
-    const request = req as Request;
+  protected async getTracker(req: Record<string, unknown>): Promise<string> {
+    const request = req as unknown as Request;
     // req.ips is populated by Express only when trust proxy is configured;
     // it contains the full chain of forwarded IPs with spoofed entries stripped.
     // Fall back to req.ip (the direct connection address) when not behind a proxy.
diff --git a/backend/src/common/interceptors/audit-log.interceptor.ts b/backend/src/common/interceptors/audit-log.interceptor.ts
index 72dc9d2..7a9789f 100644
--- a/backend/src/common/interceptors/audit-log.interceptor.ts
+++ b/backend/src/common/interceptors/audit-log.interceptor.ts
@@ -13,6 +13,24 @@ import {
   AuditLogMetadata,
 } from '../decorators/audit-log.decorator';
 
+interface AuditLogResponse {
+  id?: number | string;
+  [key: string]: unknown;
+}
+
+interface AuditLogRequest {
+  user?: {
+    userId?: number;
+    username?: string;
+  };
+  params?: Record<string, string>;
+  query?: Record<string, unknown>;
+  method: string;
+  url: string;
+  ip: string;
+  headers: Record<string, string | string[] | undefined>;
+}
+
 @Injectable()
 export class AuditLogInterceptor implements NestInterceptor {
   constructor(
@@ -20,7 +38,7 @@ export class AuditLogInterceptor implements NestInterceptor {
     private auditLogsService: AuditLogsService,
   ) {}
 
-  intercept(context: ExecutionContext, next: CallHandler): Observable<any> {
+  intercept(context: ExecutionContext, next: CallHandler): Observable<unknown> {
     const auditMetadata = this.reflector.getAllAndOverride<AuditLogMetadata>(
       AUDIT_LOG_KEY,
       [context.getHandler(), context.getClass()],
@@ -30,35 +48,64 @@ export class AuditLogInterceptor implements NestInterceptor {
       return next.handle();
     }
 
-    const request = context.switchToHttp().getRequest();
+    const request = context.switchToHttp().getRequest() as AuditLogRequest;
     const user = request.user;
     const { action, entityType } = auditMetadata;
 
     return next.handle().pipe(
-      tap(async (response) => {
+      tap((response: unknown) => {
+        const isPlainObject =
+          typeof response === 'object' &&
+          response !== null &&
+          !Array.isArray(response);
+        const typedResponse = isPlainObject
+          ? (response as AuditLogResponse)
+          : undefined;
+
         // Extract entity ID from response or params
-        const entityId =
-          response?.id ||
+        let entityId: number | undefined;
+        const rawEntityId =
+          typedResponse?.id ||
           request.params?.id ||
           request.params?.organizationId ||
           request.params?.roleId;
 
-        await this.auditLogsService.log({
-          userId: user?.userId,
-          username: user?.username,
-          action,
-          entityType,
-          entityId: entityId ? parseInt(entityId, 10) : undefined,
-          metadata: {
-            method: request.method,
-            url: request.url,
-            params: request.params,
-            query: request.query,
-          },
-          newValues: response,
-          ipAddress: request.ip,
-          userAgent: request.headers['user-agent'],
-        });
+        if (rawEntityId !== undefined) {
+          if (typeof rawEntityId === 'number') {
+            entityId = Number.isNaN(rawEntityId) ? undefined : rawEntityId;
+          } else if (
+            typeof rawEntityId === 'string' &&
+            /^\d+$/.test(rawEntityId)
+          ) {
+            entityId = parseInt(rawEntityId, 10);
+          }
+          // Non-numeric IDs (e.g. UUIDs) are intentionally left as undefined
+          // to avoid silent truncation like parseInt('1e3...') → 1.
+        }
+
+        this.auditLogsService
+          .log({
+            userId: user?.userId,
+            username: user?.username,
+            action,
+            entityType,
+            entityId,
+            metadata: {
+              method: request.method,
+              url: request.url,
+              params: request.params,
+              query: request.query,
+            },
+            newValues: typedResponse,
+            ipAddress: request.ip,
+            userAgent:
+              typeof request.headers['user-agent'] === 'string'
+                ? request.headers['user-agent']
+                : undefined,
+          })
+          .catch(() => {
+            // Audit log failures must not affect the response pipeline
+          });
       }),
     );
   }
diff --git a/backend/src/common/types/query-params.type.ts b/backend/src/common/types/query-params.type.ts
new file mode 100644
index 0000000..855736c
--- /dev/null
+++ b/backend/src/common/types/query-params.type.ts
@@ -0,0 +1,8 @@
+export interface QueryParams {
+  [key: string]: string | string[] | QueryParams | QueryParams[] | undefined;
+}
+
+/** Narrows a query param value to string | undefined, ignoring arrays/objects. */
+export function asString(value: QueryParams[string]): string | undefined {
+  return typeof value === 'string' ? value : undefined;
+}
diff --git a/backend/src/database/seeds/database-seeder.service.spec.ts b/backend/src/database/seeds/database-seeder.service.spec.ts
index a589a37..04f0e9d 100644
--- a/backend/src/database/seeds/database-seeder.service.spec.ts
+++ b/backend/src/database/seeds/database-seeder.service.spec.ts
@@ -155,49 +155,67 @@ describe('DatabaseSeederService', () => {
         .spyOn(gamesRepository, 'findOne')
         .mockResolvedValueOnce(null) // First game check (sc)
         .mockResolvedValueOnce(null) // Second game check (sq42)
-        .mockResolvedValueOnce(mockGame as any) // Get sc game for org creation
+        .mockResolvedValueOnce(mockGame as unknown as Game) // Get sc game for org creation
         .mockResolvedValueOnce(null); // Org check
 
-      jest.spyOn(gamesRepository, 'create').mockReturnValue(mockGame as any);
-      jest.spyOn(gamesRepository, 'save').mockResolvedValue(mockGame as any);
+      jest
+        .spyOn(gamesRepository, 'create')
+        .mockReturnValue(mockGame as unknown as Game);
+      jest
+        .spyOn(gamesRepository, 'save')
+        .mockResolvedValue(mockGame as unknown as Game);
 
       jest.spyOn(rolesRepository, 'findOne').mockResolvedValue(null);
-      jest.spyOn(rolesRepository, 'create').mockReturnValue(mockRole as any);
-      jest.spyOn(rolesRepository, 'save').mockResolvedValue(mockRole as any);
+      jest
+        .spyOn(rolesRepository, 'create')
+        .mockReturnValue(mockRole as unknown as Role);
+      jest
+        .spyOn(rolesRepository, 'save')
+        .mockResolvedValue(mockRole as unknown as Role);
 
       jest.spyOn(organizationsRepository, 'findOne').mockResolvedValue(null);
       jest
         .spyOn(organizationsRepository, 'create')
-        .mockReturnValue(mockOrganization as any);
+        .mockReturnValue(mockOrganization as unknown as Organization);
       jest
         .spyOn(organizationsRepository, 'save')
-        .mockResolvedValue(mockOrganization as any);
+        .mockResolvedValue(mockOrganization as unknown as Organization);
 
       jest.spyOn(usersRepository, 'findOne').mockResolvedValue(null);
-      jest.spyOn(usersRepository, 'create').mockReturnValue(mockUser as any);
-      jest.spyOn(usersRepository, 'save').mockResolvedValue(mockUser as any);
+      jest
+        .spyOn(usersRepository, 'create')
+        .mockReturnValue(mockUser as unknown as User);
+      jest
+        .spyOn(usersRepository, 'save')
+        .mockResolvedValue(mockUser as unknown as User);
 
       jest.spyOn(userOrgRolesRepository, 'findOne').mockResolvedValue(null);
       jest
         .spyOn(userOrgRolesRepository, 'create')
-        .mockReturnValue(mockUserOrgRole as any);
+        .mockReturnValue(mockUserOrgRole as unknown as UserOrganizationRole);
       jest
         .spyOn(userOrgRolesRepository, 'save')
-        .mockResolvedValue(mockUserOrgRole as any);
+        .mockResolvedValue(mockUserOrgRole as unknown as UserOrganizationRole);
 
       await expect(service.seedAll()).resolves.toBeUndefined();
     });
 
     it('should handle existing data gracefully', async () => {
-      jest.spyOn(gamesRepository, 'findOne').mockResolvedValue(mockGame as any);
-      jest.spyOn(rolesRepository, 'findOne').mockResolvedValue(mockRole as any);
+      jest
+        .spyOn(gamesRepository, 'findOne')
+        .mockResolvedValue(mockGame as unknown as Game);
+      jest
+        .spyOn(rolesRepository, 'findOne')
+        .mockResolvedValue(mockRole as unknown as Role);
       jest
         .spyOn(organizationsRepository, 'findOne')
-        .mockResolvedValue(mockOrganization as any);
-      jest.spyOn(usersRepository, 'findOne').mockResolvedValue(mockUser as any);
+        .mockResolvedValue(mockOrganization as unknown as Organization);
+      jest
+        .spyOn(usersRepository, 'findOne')
+        .mockResolvedValue(mockUser as unknown as User);
       jest
         .spyOn(userOrgRolesRepository, 'findOne')
-        .mockResolvedValue(mockUserOrgRole as any);
+        .mockResolvedValue(mockUserOrgRole as unknown as UserOrganizationRole);
 
       await expect(service.seedAll()).resolves.toBeUndefined();
 
diff --git a/backend/src/modules/audit-logs/audit-log.entity.ts b/backend/src/modules/audit-logs/audit-log.entity.ts
index 280b62f..ad0eaa4 100644
--- a/backend/src/modules/audit-logs/audit-log.entity.ts
+++ b/backend/src/modules/audit-logs/audit-log.entity.ts
@@ -56,13 +56,13 @@ export class AuditLog {
   entityId?: number;
 
   @Column('jsonb', { nullable: true })
-  metadata?: Record<string, any>;
+  metadata?: Record<string, unknown>;
 
   @Column('jsonb', { nullable: true })
-  oldValues?: Record<string, any>;
+  oldValues?: Record<string, unknown>;
 
   @Column('jsonb', { nullable: true })
-  newValues?: Record<string, any>;
+  newValues?: Record<string, unknown>;
 
   @Column({ nullable: true })
   ipAddress?: string;
diff --git a/backend/src/modules/audit-logs/audit-logs.service.spec.ts b/backend/src/modules/audit-logs/audit-logs.service.spec.ts
index f48e6d9..6493702 100644
--- a/backend/src/modules/audit-logs/audit-logs.service.spec.ts
+++ b/backend/src/modules/audit-logs/audit-logs.service.spec.ts
@@ -72,8 +72,8 @@ describe('AuditLogsService', () => {
         metadata: { test: 'data' },
       };
 
-      jest.spyOn(repository, 'create').mockReturnValue(mockAuditLog as any);
-      jest.spyOn(repository, 'save').mockResolvedValue(mockAuditLog as any);
+      jest.spyOn(repository, 'create').mockReturnValue(mockAuditLog);
+      jest.spyOn(repository, 'save').mockResolvedValue(mockAuditLog);
 
       const result = await service.log(dto);
 
diff --git a/backend/src/modules/audit-logs/audit-logs.service.ts b/backend/src/modules/audit-logs/audit-logs.service.ts
index 570420b..82e780a 100644
--- a/backend/src/modules/audit-logs/audit-logs.service.ts
+++ b/backend/src/modules/audit-logs/audit-logs.service.ts
@@ -9,9 +9,9 @@ export interface CreateAuditLogDto {
   action: AuditAction;
   entityType: AuditEntityType;
   entityId?: number;
-  metadata?: Record<string, any>;
-  oldValues?: Record<string, any>;
-  newValues?: Record<string, any>;
+  metadata?: Record<string, unknown>;
+  oldValues?: Record<string, unknown>;
+  newValues?: Record<string, unknown>;
   ipAddress?: string;
   userAgent?: string;
 }
diff --git a/backend/src/modules/auth/auth.controller.spec.ts b/backend/src/modules/auth/auth.controller.spec.ts
index 2121759..1178212 100644
--- a/backend/src/modules/auth/auth.controller.spec.ts
+++ b/backend/src/modules/auth/auth.controller.spec.ts
@@ -3,6 +3,7 @@ import { AuthController } from './auth.controller';
 import { AuthService } from './auth.service';
 import { BadRequestException } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
+import { AuthenticatedRequest } from './interfaces/authenticated-request.interface';
 
 describe('AuthController - Password Reset', () => {
   let controller: AuthController;
@@ -121,8 +122,8 @@ describe('AuthController - Password Reset', () => {
   describe('changePassword', () => {
     it('should call authService.changePassword with userId and passwords', async () => {
       const mockRequest = {
-        user: { userId: 1 },
-      };
+        user: { userId: 1, username: 'testuser' },
+      } as unknown as AuthenticatedRequest;
       const currentPassword = 'oldPassword123';
       const newPassword = 'newSecurePassword123';
       const expectedResponse = { message: 'Password changed successfully' };
@@ -144,8 +145,8 @@ describe('AuthController - Password Reset', () => {
 
     it('should handle incorrect current password error', async () => {
       const mockRequest = {
-        user: { userId: 1 },
-      };
+        user: { userId: 1, username: 'testuser' },
+      } as AuthenticatedRequest;
       const currentPassword = 'wrongPassword';
       const newPassword = 'newPassword123';
 
@@ -163,8 +164,8 @@ describe('AuthController - Password Reset', () => {
 
     it('should extract userId from authenticated request', async () => {
       const mockRequest = {
-        user: { userId: 42 },
-      };
+        user: { userId: 42, username: 'testuser' },
+      } as unknown as AuthenticatedRequest;
       const currentPassword = 'oldPassword123';
       const newPassword = 'newPassword123';
 
diff --git a/backend/src/modules/auth/auth.controller.ts b/backend/src/modules/auth/auth.controller.ts
index da7015c..cab523d 100644
--- a/backend/src/modules/auth/auth.controller.ts
+++ b/backend/src/modules/auth/auth.controller.ts
@@ -23,13 +23,15 @@ import { LocalAuthGuard } from './local-auth.guard';
 import { JwtAuthGuard } from './jwt-auth.guard';
 import { RefreshTokenAuthGuard } from './refresh-token-auth.guard';
 import { UserDto } from '../users/dto/user.dto';
-import { User } from '../users/user.entity';
 import { Request as ExpressRequest, Response } from 'express';
 import {
   ChangePasswordDto,
   ForgotPasswordDto,
   ResetPasswordDto,
 } from './dto/password-reset.dto';
+import { AuthenticatedRequest } from './interfaces/authenticated-request.interface';
+import { RefreshTokenRequest } from './interfaces/refresh-token-request.interface';
+import { ValidatedUser } from './interfaces/validated-user.interface';
 
 // Parse throttle config once at module load time.
 // Number() handles numeric strings and NaN from non-numeric input; the
@@ -97,11 +99,10 @@ export class AuthController {
   @HttpCode(HttpStatus.OK)
   @Post('login')
   async login(
-    @Request() req: ExpressRequest,
+    @Request() req: ExpressRequest & { user: ValidatedUser },
     @Res({ passthrough: true }) res: Response,
   ) {
-    const user = req.user as Omit<User, 'password'>;
-    const tokens = await this.authService.login(user);
+    const tokens = await this.authService.login(req.user);
     res.cookie(
       'access_token',
       tokens.accessToken,
@@ -112,7 +113,7 @@ export class AuthController {
       tokens.refreshToken,
       this.cookieOptions(7 * 24 * 60 * 60 * 1000),
     );
-    return { message: 'Login successful', username: user.username };
+    return { message: 'Login successful', username: req.user.username };
   }
 
   @ApiOperation({ summary: 'Register new user' })
@@ -130,8 +131,8 @@ export class AuthController {
   @ApiResponse({ status: 401, description: 'Unauthorized' })
   @UseGuards(JwtAuthGuard)
   @Get('me')
-  me(@Request() req: any) {
-    return { id: req.user.userId, username: req.user.username };
+  me(@Request() req: AuthenticatedRequest) {
+    return { userId: req.user.userId, username: req.user.username };
   }
 
   @ApiOperation({ summary: 'Refresh access token using refresh token cookie' })
@@ -141,7 +142,7 @@ export class AuthController {
   @HttpCode(HttpStatus.OK)
   @Post('refresh')
   async refresh(
-    @Request() req: any,
+    @Request() req: RefreshTokenRequest,
     @Res({ passthrough: true }) res: Response,
   ) {
     const tokens = await this.authService.refreshAccessToken(
@@ -166,7 +167,10 @@ export class AuthController {
   @UseGuards(RefreshTokenAuthGuard)
   @HttpCode(HttpStatus.OK)
   @Post('logout')
-  async logout(@Request() req: any, @Res({ passthrough: true }) res: Response) {
+  async logout(
+    @Request() req: RefreshTokenRequest,
+    @Res({ passthrough: true }) res: Response,
+  ) {
     await this.authService.revokeRefreshToken(req.user.refreshToken);
     const { maxAge: _maxAge, ...clearOpts } = this.cookieOptions(0);
     res.clearCookie('access_token', clearOpts);
@@ -209,7 +213,7 @@ export class AuthController {
   @HttpCode(HttpStatus.OK)
   @Post('change-password')
   async changePassword(
-    @Request() req: any,
+    @Request() req: AuthenticatedRequest,
     @Body() changePasswordDto: ChangePasswordDto,
   ) {
     const userId = req.user.userId;
diff --git a/backend/src/modules/auth/auth.service.spec.ts b/backend/src/modules/auth/auth.service.spec.ts
index b34ebc3..3695a00 100644
--- a/backend/src/modules/auth/auth.service.spec.ts
+++ b/backend/src/modules/auth/auth.service.spec.ts
@@ -135,17 +135,19 @@ describe('AuthService', () => {
     it('should generate token that expires in 1 hour', async () => {
       mockUsersService.findByEmail.mockResolvedValue(mockUser);
       const now = new Date();
-      let savedToken: any;
+      let savedToken: { expiresAt: Date } | undefined;
 
-      mockPasswordResetRepository.save.mockImplementation((token) => {
-        savedToken = token;
-        return Promise.resolve(token);
-      });
+      mockPasswordResetRepository.save.mockImplementation(
+        (token: { expiresAt: Date }) => {
+          savedToken = token;
+          return Promise.resolve(token);
+        },
+      );
 
       await service.requestPasswordReset(mockUser.email);
 
       expect(savedToken).toBeDefined();
-      const expiryTime = new Date(savedToken.expiresAt).getTime();
+      const expiryTime = new Date(savedToken!.expiresAt).getTime();
       const expectedExpiry = now.getTime() + 60 * 60 * 1000; // 1 hour
       expect(Math.abs(expiryTime - expectedExpiry)).toBeLessThan(1000); // Within 1 second
     });
@@ -364,25 +366,29 @@ describe('AuthService', () => {
       });
 
       it('should persist the SHA-256 hash, not the raw token', async () => {
-        let savedData: any;
-        mockRefreshTokenRepository.save.mockImplementation((data) => {
-          savedData = data;
-          return Promise.resolve(data);
-        });
+        let savedData: { token: string; expiresAt: Date } | undefined;
+        mockRefreshTokenRepository.save.mockImplementation(
+          (data: { token: string; expiresAt: Date }) => {
+            savedData = data;
+            return Promise.resolve(data);
+          },
+        );
 
         const raw = await service.generateRefreshToken(mockUser.id);
 
-        expect(savedData.token).toBe(sha256(raw));
-        expect(savedData.token).not.toBe(raw);
+        expect(savedData!.token).toBe(sha256(raw));
+        expect(savedData!.token).not.toBe(raw);
       });
 
       it('should set expiry 7 calendar days from now', async () => {
         const now = new Date();
-        let savedData: any;
-        mockRefreshTokenRepository.save.mockImplementation((data) => {
-          savedData = data;
-          return Promise.resolve(data);
-        });
+        let savedData: { token: string; expiresAt: Date } | undefined;
+        mockRefreshTokenRepository.save.mockImplementation(
+          (data: { token: string; expiresAt: Date }) => {
+            savedData = data;
+            return Promise.resolve(data);
+          },
+        );
 
         await service.generateRefreshToken(mockUser.id);
 
@@ -391,7 +397,7 @@ describe('AuthService', () => {
         const expected = new Date(now);
         expected.setDate(expected.getDate() + 7);
         expect(
-          Math.abs(savedData.expiresAt.getTime() - expected.getTime()),
+          Math.abs(savedData!.expiresAt.getTime() - expected.getTime()),
         ).toBeLessThan(1000);
       });
     });
diff --git a/backend/src/modules/auth/auth.service.ts b/backend/src/modules/auth/auth.service.ts
index edfaf37..904273f 100644
--- a/backend/src/modules/auth/auth.service.ts
+++ b/backend/src/modules/auth/auth.service.ts
@@ -17,6 +17,8 @@ import { RefreshToken } from './refresh-token.entity';
 import { PasswordReset } from './password-reset.entity';
 import { Logger } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
+import { ValidatedUser } from './interfaces/validated-user.interface';
+import { JwtPayload } from './interfaces/jwt-payload.interface';
 
 @Injectable()
 export class AuthService {
@@ -35,7 +37,10 @@ export class AuthService {
     private passwordResetRepository: Repository<PasswordReset>,
   ) {}
 
-  async validateUser(username: string, pass: string): Promise<any> {
+  async validateUser(
+    username: string,
+    pass: string,
+  ): Promise<ValidatedUser | null> {
     const user = await this.usersService.findOne(username);
     const trimmedPass = pass.trim();
 
@@ -60,9 +65,9 @@ export class AuthService {
   }
 
   async login(
-    user: Omit<User, 'password'>,
+    user: ValidatedUser,
   ): Promise<{ accessToken: string; refreshToken: string }> {
-    const payload = { username: user.username, sub: user.id };
+    const payload: JwtPayload = { username: user.username, sub: user.id };
     const accessToken = this.jwtService.sign(payload);
     const refreshToken = await this.generateRefreshToken(user.id);
 
diff --git a/backend/src/modules/auth/interfaces/authenticated-request.interface.ts b/backend/src/modules/auth/interfaces/authenticated-request.interface.ts
new file mode 100644
index 0000000..78b037f
--- /dev/null
+++ b/backend/src/modules/auth/interfaces/authenticated-request.interface.ts
@@ -0,0 +1,17 @@
+import { Request } from 'express';
+
+/**
+ * User object attached to request after JWT authentication
+ */
+export interface AuthenticatedUser {
+  userId: number;
+  username: string;
+}
+
+/**
+ * Express request with authenticated user
+ * Used after JwtAuthGuard validates the request
+ */
+export interface AuthenticatedRequest extends Request {
+  user: AuthenticatedUser;
+}
diff --git a/backend/src/modules/auth/interfaces/jwt-payload.interface.ts b/backend/src/modules/auth/interfaces/jwt-payload.interface.ts
new file mode 100644
index 0000000..f62892a
--- /dev/null
+++ b/backend/src/modules/auth/interfaces/jwt-payload.interface.ts
@@ -0,0 +1,13 @@
+/**
+ * JWT payload structure for access tokens
+ */
+export interface JwtPayload {
+  /** User ID (subject) */
+  sub: number;
+  /** Username */
+  username: string;
+  /** Issued at timestamp (optional, added by JWT) */
+  iat?: number;
+  /** Expiration timestamp (optional, added by JWT) */
+  exp?: number;
+}
diff --git a/backend/src/modules/auth/interfaces/refresh-token-request.interface.ts b/backend/src/modules/auth/interfaces/refresh-token-request.interface.ts
new file mode 100644
index 0000000..b70dc36
--- /dev/null
+++ b/backend/src/modules/auth/interfaces/refresh-token-request.interface.ts
@@ -0,0 +1,16 @@
+import { Request } from 'express';
+
+/**
+ * User object attached to request after refresh token authentication
+ */
+export interface RefreshTokenUser {
+  refreshToken: string;
+}
+
+/**
+ * Express request with refresh token
+ * Used after RefreshTokenAuthGuard validates the request
+ */
+export interface RefreshTokenRequest extends Request {
+  user: RefreshTokenUser;
+}
diff --git a/backend/src/modules/auth/interfaces/validated-user.interface.ts b/backend/src/modules/auth/interfaces/validated-user.interface.ts
new file mode 100644
index 0000000..f0296c5
--- /dev/null
+++ b/backend/src/modules/auth/interfaces/validated-user.interface.ts
@@ -0,0 +1,6 @@
+import { User } from '../../users/user.entity';
+
+/**
+ * User returned from validateUser (without password)
+ */
+export type ValidatedUser = Omit<User, 'password'>;
diff --git a/backend/src/modules/auth/jwt.strategy.ts b/backend/src/modules/auth/jwt.strategy.ts
index 97a4646..7712afc 100644
--- a/backend/src/modules/auth/jwt.strategy.ts
+++ b/backend/src/modules/auth/jwt.strategy.ts
@@ -3,6 +3,8 @@ import { PassportStrategy } from '@nestjs/passport';
 import { ExtractJwt, Strategy } from 'passport-jwt';
 import { ConfigService } from '@nestjs/config';
 import { Request } from 'express';
+import { JwtPayload } from './interfaces/jwt-payload.interface';
+import { AuthenticatedUser } from './interfaces/authenticated-request.interface';
 
 @Injectable()
 export class JwtStrategy extends PassportStrategy(Strategy) {
@@ -19,7 +21,7 @@ export class JwtStrategy extends PassportStrategy(Strategy) {
     });
   }
 
-  async validate(payload: { sub: number; username: string }) {
+  async validate(payload: JwtPayload): Promise<AuthenticatedUser> {
     return { userId: payload.sub, username: payload.username };
   }
 }
diff --git a/backend/src/modules/org-inventory/org-inventory.controller.spec.ts b/backend/src/modules/org-inventory/org-inventory.controller.spec.ts
index b85d579..005e868 100644
--- a/backend/src/modules/org-inventory/org-inventory.controller.spec.ts
+++ b/backend/src/modules/org-inventory/org-inventory.controller.spec.ts
@@ -1,6 +1,7 @@
 import { BadRequestException } from '@nestjs/common';
 import { OrgInventoryController } from './org-inventory.controller';
 import { OrgInventoryService } from './org-inventory.service';
+import { AuthenticatedRequest } from '../auth/interfaces/authenticated-request.interface';
 
 describe('OrgInventoryController', () => {
   let controller: OrgInventoryController;
@@ -22,16 +23,22 @@ describe('OrgInventoryController', () => {
   });
 
   it('accepts camelCase query aliases for org inventory filters', async () => {
-    await controller.list({ user: { userId: 7 } }, 42, {
-      gameId: '1',
-      categoryId: '5',
-      uexItemId: '9',
-      locationId: '12',
-      minQuantity: '0.25',
-      maxQuantity: '10.5',
-      limit: '25',
-      offset: '50',
-    });
+    await controller.list(
+      {
+        user: { userId: 7, username: 'testuser' },
+      } as unknown as AuthenticatedRequest,
+      42,
+      {
+        gameId: '1',
+        categoryId: '5',
+        uexItemId: '9',
+        locationId: '12',
+        minQuantity: '0.25',
+        maxQuantity: '10.5',
+        limit: '25',
+        offset: '50',
+      },
+    );
 
     expect(orgInventoryService.search).toHaveBeenCalledWith(7, {
       orgId: 42,
@@ -52,26 +59,44 @@ describe('OrgInventoryController', () => {
 
   it('throws a bad request for invalid numeric pagination params', async () => {
     await expect(
-      controller.list({ user: { userId: 7 } }, 42, {
-        gameId: '1',
-        limit: 'abc',
-      }),
+      controller.list(
+        {
+          user: { userId: 7, username: 'testuser' },
+        } as unknown as AuthenticatedRequest,
+        42,
+        {
+          gameId: '1',
+          limit: 'abc',
+        },
+      ),
     ).rejects.toThrow(new BadRequestException('limit must be a number'));
   });
 
   it('throws a bad request for non-integer or out-of-range pagination params', async () => {
     await expect(
-      controller.list({ user: { userId: 7 } }, 42, {
-        gameId: '1',
-        limit: '10.5',
-      }),
+      controller.list(
+        {
+          user: { userId: 7, username: 'testuser' },
+        } as unknown as AuthenticatedRequest,
+        42,
+        {
+          gameId: '1',
+          limit: '10.5',
+        },
+      ),
     ).rejects.toThrow(new BadRequestException('limit must be an integer'));
 
     await expect(
-      controller.list({ user: { userId: 7 } }, 42, {
-        gameId: '1',
-        offset: '-1',
-      }),
+      controller.list(
+        {
+          user: { userId: 7, username: 'testuser' },
+        } as unknown as AuthenticatedRequest,
+        42,
+        {
+          gameId: '1',
+          offset: '-1',
+        },
+      ),
     ).rejects.toThrow(
       new BadRequestException('offset must be greater than or equal to 0'),
     );
@@ -79,16 +104,28 @@ describe('OrgInventoryController', () => {
 
   it('throws a bad request for non-integer id-like filters', async () => {
     await expect(
-      controller.list({ user: { userId: 7 } }, 42, {
-        gameId: '1.5',
-      }),
+      controller.list(
+        {
+          user: { userId: 7, username: 'testuser' },
+        } as unknown as AuthenticatedRequest,
+        42,
+        {
+          gameId: '1.5',
+        },
+      ),
     ).rejects.toThrow(new BadRequestException('game_id must be an integer'));
 
     await expect(
-      controller.list({ user: { userId: 7 } }, 42, {
-        gameId: '1',
-        locationId: '2.5',
-      }),
+      controller.list(
+        {
+          user: { userId: 7, username: 'testuser' },
+        } as unknown as AuthenticatedRequest,
+        42,
+        {
+          gameId: '1',
+          locationId: '2.5',
+        },
+      ),
     ).rejects.toThrow(
       new BadRequestException('location_id must be an integer'),
     );
@@ -96,10 +133,16 @@ describe('OrgInventoryController', () => {
 
   it('throws a bad request for negative quantity filters', async () => {
     await expect(
-      controller.list({ user: { userId: 7 } }, 42, {
-        gameId: '1',
-        minQuantity: '-0.25',
-      }),
+      controller.list(
+        {
+          user: { userId: 7, username: 'testuser' },
+        } as unknown as AuthenticatedRequest,
+        42,
+        {
+          gameId: '1',
+          minQuantity: '-0.25',
+        },
+      ),
     ).rejects.toThrow(
       new BadRequestException(
         'min_quantity must be greater than or equal to 0',
@@ -107,10 +150,16 @@ describe('OrgInventoryController', () => {
     );
 
     await expect(
-      controller.list({ user: { userId: 7 } }, 42, {
-        gameId: '1',
-        maxQuantity: '-1',
-      }),
+      controller.list(
+        {
+          user: { userId: 7, username: 'testuser' },
+        } as unknown as AuthenticatedRequest,
+        42,
+        {
+          gameId: '1',
+          maxQuantity: '-1',
+        },
+      ),
     ).rejects.toThrow(
       new BadRequestException(
         'max_quantity must be greater than or equal to 0',
diff --git a/backend/src/modules/org-inventory/org-inventory.controller.ts b/backend/src/modules/org-inventory/org-inventory.controller.ts
index 0f2eb68..4c3a0a8 100644
--- a/backend/src/modules/org-inventory/org-inventory.controller.ts
+++ b/backend/src/modules/org-inventory/org-inventory.controller.ts
@@ -31,6 +31,8 @@ import {
   ApiResponse,
   ApiParam,
 } from '@nestjs/swagger';
+import { AuthenticatedRequest } from '../auth/interfaces/authenticated-request.interface';
+import { QueryParams, asString } from '../../common/types/query-params.type';
 
 @ApiTags('Organization Inventory')
 @ApiBearerAuth()
@@ -40,7 +42,7 @@ export class OrgInventoryController {
   constructor(private readonly orgInventoryService: OrgInventoryService) {}
 
   private readOptionalNumber(
-    query: Record<string, any>,
+    query: QueryParams,
     keys: string[],
     fieldName: string,
     options?: {
@@ -87,9 +89,9 @@ export class OrgInventoryController {
     type: [OrgInventoryItemDto],
   })
   async list(
-    @Request() req: any,
+    @Request() req: AuthenticatedRequest,
     @Param('orgId', ParseIntPipe) orgId: number,
-    @Query() query: Record<string, any>,
+    @Query() query: QueryParams,
   ): Promise<{
     items: OrgInventoryItemDto[];
     total: number;
@@ -137,7 +139,7 @@ export class OrgInventoryController {
           min: 1,
         },
       ),
-      search: query.search,
+      search: asString(query.search),
       limit: this.readOptionalNumber(query, ['limit'], 'limit', {
         integer: true,
         min: 1,
@@ -146,13 +148,19 @@ export class OrgInventoryController {
         integer: true,
         min: 0,
       }),
-      sort: query.sort,
-      order: query.order,
+      sort: asString(query.sort) as
+        | 'name'
+        | 'quantity'
+        | 'location'
+        | 'date_added'
+        | 'date_modified'
+        | undefined,
+      order: asString(query.order) as 'asc' | 'desc' | undefined,
       activeOnly:
         query.active_only !== undefined
-          ? query.active_only === 'true' || query.active_only === true
+          ? query.active_only === 'true'
           : query.activeOnly !== undefined
-            ? query.activeOnly === 'true' || query.activeOnly === true
+            ? query.activeOnly === 'true'
             : undefined,
       minQuantity: this.readOptionalNumber(
         query,
@@ -196,7 +204,7 @@ export class OrgInventoryController {
   @ApiResponse({ status: 403, description: 'Permission denied' })
   @ApiResponse({ status: 409, description: 'Inventory item already exists' })
   async create(
-    @Request() req: any,
+    @Request() req: AuthenticatedRequest,
     @Param('orgId', ParseIntPipe) orgId: number,
     @Body() createDto: CreateOrgInventoryItemDto,
   ): Promise<OrgInventoryItemDto> {
@@ -219,7 +227,7 @@ export class OrgInventoryController {
     type: OrgInventorySummaryDto,
   })
   async getSummary(
-    @Request() req: any,
+    @Request() req: AuthenticatedRequest,
     @Param('orgId', ParseIntPipe) orgId: number,
     @Query('gameId', ParseIntPipe) gameId: number,
   ): Promise<OrgInventorySummaryDto> {
@@ -241,7 +249,7 @@ export class OrgInventoryController {
   })
   @ApiResponse({ status: 404, description: 'Item not found' })
   async findById(
-    @Request() req: any,
+    @Request() req: AuthenticatedRequest,
     @Param('orgId', ParseIntPipe) orgId: number,
     @Param('id', ParseUUIDPipe) id: string,
   ): Promise<OrgInventoryItemDto> {
@@ -264,7 +272,7 @@ export class OrgInventoryController {
   @ApiResponse({ status: 404, description: 'Item not found' })
   @ApiResponse({ status: 403, description: 'Permission denied' })
   async update(
-    @Request() req: any,
+    @Request() req: AuthenticatedRequest,
     @Param('orgId', ParseIntPipe) orgId: number,
     @Param('id', ParseUUIDPipe) id: string,
     @Body() updateDto: UpdateOrgInventoryItemDto,
@@ -290,7 +298,7 @@ export class OrgInventoryController {
   @ApiResponse({ status: 404, description: 'Item not found' })
   @ApiResponse({ status: 403, description: 'Permission denied' })
   async delete(
-    @Request() req: any,
+    @Request() req: AuthenticatedRequest,
     @Param('orgId', ParseIntPipe) orgId: number,
     @Param('id', ParseUUIDPipe) id: string,
   ): Promise<void> {
diff --git a/backend/src/modules/uex-sync/clients/uex-categories.client.ts b/backend/src/modules/uex-sync/clients/uex-categories.client.ts
index 5bbadfb..4bf4c2e 100644
--- a/backend/src/modules/uex-sync/clients/uex-categories.client.ts
+++ b/backend/src/modules/uex-sync/clients/uex-categories.client.ts
@@ -80,19 +80,20 @@ export class UEXCategoriesClient {
       this.logger.log(`Fetched ${categories.length} categories from UEX API`);
 
       return categories;
-    } catch (error: any) {
+    } catch (error: unknown) {
       if (error instanceof RateLimitException) {
         throw error;
       }
 
-      if (error.response?.status >= 500) {
+      const errorResponse = error as { response?: { status?: number } };
+      if (error && (errorResponse.response?.status ?? 0) >= 500) {
         throw new UEXServerException(
-          `UEX server error: ${error.message || 'Unknown error'}`,
+          `UEX server error: ${(error instanceof Error ? error.message : 'Unknown error') || 'Unknown error'}`,
         );
       }
 
       throw new UEXClientException(
-        `Failed to fetch categories: ${error.message || 'Unknown error'}`,
+        `Failed to fetch categories: ${(error instanceof Error ? error.message : 'Unknown error') || 'Unknown error'}`,
       );
     }
   }
diff --git a/backend/src/modules/uex-sync/clients/uex-companies.client.ts b/backend/src/modules/uex-sync/clients/uex-companies.client.ts
index 256ff47..419389a 100644
--- a/backend/src/modules/uex-sync/clients/uex-companies.client.ts
+++ b/backend/src/modules/uex-sync/clients/uex-companies.client.ts
@@ -81,19 +81,20 @@ export class UEXCompaniesClient {
       this.logger.log(`Fetched ${companies.length} companies from UEX API`);
 
       return companies;
-    } catch (error: any) {
+    } catch (error: unknown) {
       if (error instanceof RateLimitException) {
         throw error;
       }
 
-      if (error.response?.status >= 500) {
+      const errorResponse = error as { response?: { status?: number } };
+      if (error && (errorResponse.response?.status ?? 0) >= 500) {
         throw new UEXServerException(
-          `UEX server error: ${error.message || 'Unknown error'}`,
+          `UEX server error: ${(error instanceof Error ? error.message : 'Unknown error') || 'Unknown error'}`,
         );
       }
 
       throw new UEXClientException(
-        `Failed to fetch companies: ${error.message || 'Unknown error'}`,
+        `Failed to fetch companies: ${(error instanceof Error ? error.message : 'Unknown error') || 'Unknown error'}`,
       );
     }
   }
diff --git a/backend/src/modules/uex-sync/clients/uex-items.client.ts b/backend/src/modules/uex-sync/clients/uex-items.client.ts
index 43f4ee7..8569b9c 100644
--- a/backend/src/modules/uex-sync/clients/uex-items.client.ts
+++ b/backend/src/modules/uex-sync/clients/uex-items.client.ts
@@ -89,19 +89,20 @@ export class UEXItemsClient {
       );
 
       return items;
-    } catch (error: any) {
+    } catch (error: unknown) {
       if (error instanceof RateLimitException) {
         throw error;
       }
 
-      if (error.response?.status >= 500) {
+      const errorResponse = error as { response?: { status?: number } };
+      if (error && (errorResponse.response?.status ?? 0) >= 500) {
         throw new UEXServerException(
-          `UEX server error: ${error.message || 'Unknown error'}`,
+          `UEX server error: ${(error instanceof Error ? error.message : 'Unknown error') || 'Unknown error'}`,
         );
       }
 
       throw new UEXClientException(
-        `Failed to fetch items for category ${categoryId}: ${error.message || 'Unknown error'}`,
+        `Failed to fetch items for category ${categoryId}: ${(error instanceof Error ? error.message : 'Unknown error') || 'Unknown error'}`,
       );
     }
   }
@@ -144,19 +145,20 @@ export class UEXItemsClient {
       this.logger.log(`Fetched ${items.length} items from UEX API`);
 
       return items;
-    } catch (error: any) {
+    } catch (error: unknown) {
       if (error instanceof RateLimitException) {
         throw error;
       }
 
-      if (error.response?.status >= 500) {
+      const errorResponse = error as { response?: { status?: number } };
+      if (error && (errorResponse.response?.status ?? 0) >= 500) {
         throw new UEXServerException(
-          `UEX server error: ${error.message || 'Unknown error'}`,
+          `UEX server error: ${(error instanceof Error ? error.message : 'Unknown error') || 'Unknown error'}`,
         );
       }
 
       throw new UEXClientException(
-        `Failed to fetch items: ${error.message || 'Unknown error'}`,
+        `Failed to fetch items: ${(error instanceof Error ? error.message : 'Unknown error') || 'Unknown error'}`,
       );
     }
   }
diff --git a/backend/src/modules/uex-sync/clients/uex-locations.client.ts b/backend/src/modules/uex-sync/clients/uex-locations.client.ts
index c97b627..e713c7c 100644
--- a/backend/src/modules/uex-sync/clients/uex-locations.client.ts
+++ b/backend/src/modules/uex-sync/clients/uex-locations.client.ts
@@ -197,19 +197,20 @@ export class UEXLocationsClient {
       this.logger.log(`Fetched ${locations.length} ${endpoint} from UEX API`);
 
       return locations;
-    } catch (error: any) {
+    } catch (error: unknown) {
       if (error instanceof RateLimitException) {
         throw error;
       }
 
-      if (error.response?.status >= 500) {
+      const errorResponse = error as { response?: { status?: number } };
+      if (error && (errorResponse.response?.status ?? 0) >= 500) {
         throw new UEXServerException(
-          `UEX server error: ${error.message || 'Unknown error'}`,
+          `UEX server error: ${(error instanceof Error ? error.message : 'Unknown error') || 'Unknown error'}`,
         );
       }
 
       throw new UEXClientException(
-        `Failed to fetch ${endpoint}: ${error.message || 'Unknown error'}`,
+        `Failed to fetch ${endpoint}: ${(error instanceof Error ? error.message : 'Unknown error') || 'Unknown error'}`,
       );
     }
   }
diff --git a/backend/src/modules/uex-sync/schedulers/uex-sync.scheduler.ts b/backend/src/modules/uex-sync/schedulers/uex-sync.scheduler.ts
index bc1c435..22ea629 100644
--- a/backend/src/modules/uex-sync/schedulers/uex-sync.scheduler.ts
+++ b/backend/src/modules/uex-sync/schedulers/uex-sync.scheduler.ts
@@ -44,10 +44,14 @@ export class UEXSyncScheduler {
           `created: ${result.created}, updated: ${result.updated}, ` +
           `deleted: ${result.deleted}, duration: ${result.durationMs}ms`,
       );
-    } catch (error: any) {
+    } catch (error: unknown) {
+      const errorMessage =
+        error instanceof Error ? error.message : String(error);
+      const errorStack = error instanceof Error ? error.stack : undefined;
+
       this.logger.error(
-        `Scheduled categories sync failed: ${error.message}`,
-        error.stack,
+        `Scheduled categories sync failed: ${errorMessage}`,
+        errorStack,
       );
       // Error already recorded in sync state by service
       // Add alerting here if needed
@@ -82,10 +86,14 @@ export class UEXSyncScheduler {
           `created: ${result.created}, updated: ${result.updated}, ` +
           `deleted: ${result.deleted}, duration: ${result.durationMs}ms`,
       );
-    } catch (error: any) {
+    } catch (error: unknown) {
+      const errorMessage =
+        error instanceof Error ? error.message : String(error);
+      const errorStack = error instanceof Error ? error.stack : undefined;
+
       this.logger.error(
-        `Scheduled items sync failed: ${error.message}`,
-        error.stack,
+        `Scheduled items sync failed: ${errorMessage}`,
+        errorStack,
       );
       // Error already recorded in sync state by service
       // Add alerting here if needed
@@ -120,10 +128,14 @@ export class UEXSyncScheduler {
           `total created: ${result.totalCreated}, updated: ${result.totalUpdated}, ` +
           `deleted: ${result.totalDeleted}, duration: ${result.totalDurationMs}ms`,
       );
-    } catch (error: any) {
+    } catch (error: unknown) {
+      const errorMessage =
+        error instanceof Error ? error.message : String(error);
+      const errorStack = error instanceof Error ? error.stack : undefined;
+
       this.logger.error(
-        `Scheduled locations sync failed: ${error.message}`,
-        error.stack,
+        `Scheduled locations sync failed: ${errorMessage}`,
+        errorStack,
       );
       // Error already recorded in sync state by service
       // Add alerting here if needed
diff --git a/backend/src/modules/uex-sync/services/categories-sync.service.spec.ts b/backend/src/modules/uex-sync/services/categories-sync.service.spec.ts
index 535c01a..ae1c058 100644
--- a/backend/src/modules/uex-sync/services/categories-sync.service.spec.ts
+++ b/backend/src/modules/uex-sync/services/categories-sync.service.spec.ts
@@ -13,10 +13,15 @@ import {
 
 describe('CategoriesSyncService', () => {
   let service: CategoriesSyncService;
-  let mockCategoryRepository: any;
-  let mockUexClient: any;
-  let mockSyncService: any;
-  let mockSystemUserService: any;
+  let mockCategoryRepository: {
+    findOne: jest.Mock;
+    save: jest.Mock;
+    update: jest.Mock;
+    manager: { transaction: jest.Mock };
+  };
+  let mockUexClient: Record<string, jest.Mock>;
+  let mockSyncService: Record<string, jest.Mock>;
+  let mockSystemUserService: Record<string, jest.Mock>;
 
   beforeEach(async () => {
     mockCategoryRepository = {
@@ -66,7 +71,7 @@ describe('CategoriesSyncService', () => {
         {
           provide: ConfigService,
           useValue: {
-            get: jest.fn((key: string, defaultValue: any) => defaultValue),
+            get: jest.fn((key: string, defaultValue: unknown) => defaultValue),
           },
         },
       ],
@@ -105,7 +110,9 @@ describe('CategoriesSyncService', () => {
       mockUexClient.fetchCategories.mockResolvedValue(mockCategories);
 
       mockCategoryRepository.manager.transaction.mockImplementation(
-        async (callback: any) => {
+        async (
+          callback: (manager: Record<string, jest.Mock>) => Promise<unknown>,
+        ) => {
           const mockManager = {
             findOne: jest.fn().mockResolvedValue(null),
             save: jest.fn().mockResolvedValue({ id: 1 }),
@@ -157,7 +164,9 @@ describe('CategoriesSyncService', () => {
       mockUexClient.fetchCategories.mockResolvedValue(mockCategories);
 
       mockCategoryRepository.manager.transaction.mockImplementation(
-        async (callback: any) => {
+        async (
+          callback: (manager: Record<string, jest.Mock>) => Promise<unknown>,
+        ) => {
           const mockManager = {
             findOne: jest
               .fn()
@@ -218,7 +227,9 @@ describe('CategoriesSyncService', () => {
         ]);
 
       mockCategoryRepository.manager.transaction.mockImplementation(
-        async (callback: any) => {
+        async (
+          callback: (manager: Record<string, jest.Mock>) => Promise<unknown>,
+        ) => {
           const mockManager = {
             findOne: jest.fn().mockResolvedValue(null),
             save: jest.fn().mockResolvedValue({ id: 1 }),
@@ -258,7 +269,9 @@ describe('CategoriesSyncService', () => {
       mockUexClient.fetchCategories.mockResolvedValue(mockCategories);
 
       mockCategoryRepository.manager.transaction.mockImplementation(
-        async (callback: any) => {
+        async (
+          callback: (manager: Record<string, jest.Mock>) => Promise<unknown>,
+        ) => {
           const mockManager = {
             findOne: jest.fn().mockResolvedValue(null),
             save: jest.fn().mockResolvedValue({ id: 1 }),
@@ -299,7 +312,9 @@ describe('CategoriesSyncService', () => {
       mockUexClient.fetchCategories.mockResolvedValue(mockCategories);
 
       mockCategoryRepository.manager.transaction.mockImplementation(
-        async (callback: any) => {
+        async (
+          callback: (manager: Record<string, jest.Mock>) => Promise<unknown>,
+        ) => {
           const mockManager = {
             findOne: jest.fn().mockResolvedValue(null),
             save: jest.fn().mockResolvedValue({ id: 1 }),
diff --git a/backend/src/modules/uex-sync/services/categories-sync.service.ts b/backend/src/modules/uex-sync/services/categories-sync.service.ts
index 5eab9f5..39d584c 100644
--- a/backend/src/modules/uex-sync/services/categories-sync.service.ts
+++ b/backend/src/modules/uex-sync/services/categories-sync.service.ts
@@ -55,7 +55,7 @@ export class CategoriesSyncService {
       // Determine sync mode (delta vs full)
       const syncDecision = await this.syncService.shouldUseDeltaSync(endpoint);
       const useDelta = !forceFull && syncDecision.useDelta;
-      const filters: any = { type: 'item' }; // MVP: only item categories
+      const filters: Record<string, Date | string | number> = { type: 'item' }; // MVP: only item categories
 
       if (useDelta && syncDecision.lastSyncAt) {
         filters.date_modified = syncDecision.lastSyncAt;
@@ -93,23 +93,27 @@ export class CategoriesSyncService {
       );
 
       return { ...result, durationMs, syncMode: useDelta ? 'delta' : 'full' };
-    } catch (error: any) {
+    } catch (error: unknown) {
       const durationMs = Date.now() - startTime;
-      await this.syncService.recordSyncFailure(endpoint, error, durationMs);
+      const syncError =
+        error instanceof Error ? error : new Error(String(error));
+      await this.syncService.recordSyncFailure(endpoint, syncError, durationMs);
       throw error;
     } finally {
       await this.syncService.releaseSyncLock(endpoint);
     }
   }
 
-  private async fetchWithRetry(filters: any): Promise<UEXCategoryResponse[]> {
+  private async fetchWithRetry(
+    filters: Record<string, Date | string | number>,
+  ): Promise<UEXCategoryResponse[]> {
     let lastError: Error | undefined;
 
     for (let attempt = 0; attempt < this.maxRetries; attempt++) {
       try {
         return await this.uexClient.fetchCategories(filters);
-      } catch (error: any) {
-        lastError = error;
+      } catch (error: unknown) {
+        lastError = error instanceof Error ? error : new Error(String(error));
 
         // Don't retry rate limits
         if (error instanceof RateLimitException) {
diff --git a/backend/src/modules/uex-sync/services/companies-sync.service.ts b/backend/src/modules/uex-sync/services/companies-sync.service.ts
index e5d5469..0a947e7 100644
--- a/backend/src/modules/uex-sync/services/companies-sync.service.ts
+++ b/backend/src/modules/uex-sync/services/companies-sync.service.ts
@@ -78,9 +78,11 @@ export class CompaniesSyncService {
         durationMs,
         syncMode: 'full',
       };
-    } catch (error: any) {
+    } catch (error: unknown) {
       const durationMs = Date.now() - startTime;
-      await this.syncService.recordSyncFailure(endpoint, error, durationMs);
+      const syncError =
+        error instanceof Error ? error : new Error(String(error));
+      await this.syncService.recordSyncFailure(endpoint, syncError, durationMs);
       throw error;
     } finally {
       await this.syncService.releaseSyncLock(endpoint);
diff --git a/backend/src/modules/uex-sync/services/items-sync.service.spec.ts b/backend/src/modules/uex-sync/services/items-sync.service.spec.ts
index ecebcfc..40384bd 100644
--- a/backend/src/modules/uex-sync/services/items-sync.service.spec.ts
+++ b/backend/src/modules/uex-sync/services/items-sync.service.spec.ts
@@ -15,12 +15,17 @@ import {
 
 describe('ItemsSyncService', () => {
   let service: ItemsSyncService;
-  let mockItemRepository: any;
-  let mockCategoryRepository: any;
-  let mockCompanyRepository: any;
-  let mockUexClient: any;
-  let mockSyncService: any;
-  let mockSystemUserService: any;
+  let mockItemRepository: {
+    findOne: jest.Mock;
+    save: jest.Mock;
+    update: jest.Mock;
+    manager: { transaction: jest.Mock };
+  };
+  let mockCategoryRepository: Record<string, jest.Mock>;
+  let mockCompanyRepository: Record<string, jest.Mock>;
+  let mockUexClient: Record<string, jest.Mock>;
+  let mockSyncService: Record<string, jest.Mock>;
+  let mockSystemUserService: Record<string, jest.Mock>;
 
   beforeEach(async () => {
     mockItemRepository = {
@@ -88,7 +93,7 @@ describe('ItemsSyncService', () => {
         {
           provide: ConfigService,
           useValue: {
-            get: jest.fn((key: string, defaultValue: any) => defaultValue),
+            get: jest.fn((key: string, defaultValue: unknown) => defaultValue),
           },
         },
       ],
@@ -141,7 +146,9 @@ describe('ItemsSyncService', () => {
       mockUexClient.fetchItemsByCategory.mockResolvedValue(mockItems);
 
       mockItemRepository.manager.transaction.mockImplementation(
-        async (callback: any) => {
+        async (
+          callback: (manager: Record<string, jest.Mock>) => Promise<unknown>,
+        ) => {
           const mockManager = {
             findOne: jest.fn().mockResolvedValue(null),
             save: jest.fn().mockResolvedValue({ id: 1 }),
@@ -182,7 +189,9 @@ describe('ItemsSyncService', () => {
       mockUexClient.fetchItemsByCategory.mockResolvedValue(mockItems);
 
       mockItemRepository.manager.transaction.mockImplementation(
-        async (callback: any) => {
+        async (
+          callback: (manager: Record<string, jest.Mock>) => Promise<unknown>,
+        ) => {
           const mockManager = {
             findOne: jest.fn().mockResolvedValue({ id: 1, uexId: 100 }),
             save: jest.fn(),
@@ -266,7 +275,9 @@ describe('ItemsSyncService', () => {
         .mockResolvedValueOnce(mockItems);
 
       mockItemRepository.manager.transaction.mockImplementation(
-        async (callback: any) => {
+        async (
+          callback: (manager: Record<string, jest.Mock>) => Promise<unknown>,
+        ) => {
           const mockManager = {
             findOne: jest.fn().mockResolvedValue(null),
             save: jest.fn().mockResolvedValue({ id: 1 }),
@@ -303,7 +314,9 @@ describe('ItemsSyncService', () => {
       let transactionCallCount = 0;
 
       mockItemRepository.manager.transaction.mockImplementation(
-        async (callback: any) => {
+        async (
+          callback: (manager: Record<string, jest.Mock>) => Promise<unknown>,
+        ) => {
           transactionCallCount++;
           const mockManager = {
             findOne: jest.fn().mockResolvedValue(null),
@@ -347,7 +360,9 @@ describe('ItemsSyncService', () => {
       mockUexClient.fetchItemsByCategory.mockResolvedValue(mockItems);
 
       mockItemRepository.manager.transaction.mockImplementation(
-        async (callback: any) => {
+        async (
+          callback: (manager: Record<string, jest.Mock>) => Promise<unknown>,
+        ) => {
           const mockManager = {
             findOne: jest.fn().mockResolvedValue(null),
             save: jest.fn().mockResolvedValue({ id: 1 }),
@@ -392,7 +407,9 @@ describe('ItemsSyncService', () => {
         .mockResolvedValueOnce(mockItems); // Category 3
 
       mockItemRepository.manager.transaction.mockImplementation(
-        async (callback: any) => {
+        async (
+          callback: (manager: Record<string, jest.Mock>) => Promise<unknown>,
+        ) => {
           const mockManager = {
             findOne: jest.fn().mockResolvedValue(null),
             save: jest.fn().mockResolvedValue({ id: 1 }),
@@ -434,16 +451,22 @@ describe('ItemsSyncService', () => {
       mockCategoryRepository.find.mockResolvedValue(mockCategories);
       mockUexClient.fetchItemsByCategory.mockResolvedValue(mockItems);
 
-      const savedItems: any[] = [];
+      const savedItems: Record<string, unknown>[] = [];
 
       mockItemRepository.manager.transaction.mockImplementation(
-        async (callback: any) => {
+        async (
+          callback: (manager: Record<string, jest.Mock>) => Promise<unknown>,
+        ) => {
           const mockManager = {
             findOne: jest.fn().mockResolvedValue(null),
-            save: jest.fn().mockImplementation((entity: any, data: any) => {
-              savedItems.push(data);
-              return { id: 1 };
-            }),
+            save: jest
+              .fn()
+              .mockImplementation(
+                (_entity: unknown, data: Record<string, unknown>) => {
+                  savedItems.push(data);
+                  return { id: 1 };
+                },
+              ),
             update: jest.fn(),
           };
           return await callback(mockManager);
@@ -482,16 +505,22 @@ describe('ItemsSyncService', () => {
       mockCategoryRepository.find.mockResolvedValue(mockCategories);
       mockUexClient.fetchItemsByCategory.mockResolvedValue(mockItems);
 
-      const savedItems: any[] = [];
+      const savedItems: Record<string, unknown>[] = [];
 
       mockItemRepository.manager.transaction.mockImplementation(
-        async (callback: any) => {
+        async (
+          callback: (manager: Record<string, jest.Mock>) => Promise<unknown>,
+        ) => {
           const mockManager = {
             findOne: jest.fn().mockResolvedValue(null),
-            save: jest.fn().mockImplementation((entity: any, data: any) => {
-              savedItems.push(data);
-              return { id: 1 };
-            }),
+            save: jest
+              .fn()
+              .mockImplementation(
+                (_entity: unknown, data: Record<string, unknown>) => {
+                  savedItems.push(data);
+                  return { id: 1 };
+                },
+              ),
             update: jest.fn(),
           };
           return await callback(mockManager);
diff --git a/backend/src/modules/uex-sync/services/items-sync.service.ts b/backend/src/modules/uex-sync/services/items-sync.service.ts
index 921deae..6d48b31 100644
--- a/backend/src/modules/uex-sync/services/items-sync.service.ts
+++ b/backend/src/modules/uex-sync/services/items-sync.service.ts
@@ -156,9 +156,11 @@ export class ItemsSyncService {
         durationMs,
         syncMode: useDelta ? 'delta' : 'full',
       };
-    } catch (error: any) {
+    } catch (error: unknown) {
       const durationMs = Date.now() - startTime;
-      await this.syncService.recordSyncFailure(endpoint, error, durationMs);
+      const syncError =
+        error instanceof Error ? error : new Error(String(error));
+      await this.syncService.recordSyncFailure(endpoint, syncError, durationMs);
       throw error;
     } finally {
       await this.syncService.releaseSyncLock(endpoint);
@@ -224,7 +226,7 @@ export class ItemsSyncService {
       `Syncing items for category: ${category.name} (${category.uexId})`,
     );
 
-    const filters: any = {};
+    const filters: Record<string, Date | string | number> = {};
     if (lastSyncAt) {
       filters.date_modified = lastSyncAt;
     }
@@ -266,15 +268,15 @@ export class ItemsSyncService {
 
   private async fetchWithRetry(
     categoryId: number,
-    filters: any,
+    filters: Record<string, Date | string | number>,
   ): Promise<UEXItemResponse[]> {
     let lastError: Error | undefined;
 
     for (let attempt = 0; attempt < this.maxRetries; attempt++) {
       try {
         return await this.uexClient.fetchItemsByCategory(categoryId, filters);
-      } catch (error: any) {
-        lastError = error;
+      } catch (error: unknown) {
+        lastError = error instanceof Error ? error : new Error(String(error));
 
         // Don't retry rate limits
         if (error instanceof RateLimitException) {
diff --git a/backend/src/modules/uex-sync/services/locations-sync.service.spec.ts b/backend/src/modules/uex-sync/services/locations-sync.service.spec.ts
index 173feba..7a1fd46 100644
--- a/backend/src/modules/uex-sync/services/locations-sync.service.spec.ts
+++ b/backend/src/modules/uex-sync/services/locations-sync.service.spec.ts
@@ -15,16 +15,16 @@ import { UEXLocationsClient } from '../clients/uex-locations.client';
 
 describe('LocationsSyncService', () => {
   let service: LocationsSyncService;
-  let mockStarSystemRepository: any;
-  let mockPlanetRepository: any;
-  let mockMoonRepository: any;
-  let mockCityRepository: any;
-  let mockSpaceStationRepository: any;
-  let mockOutpostRepository: any;
-  let mockPoiRepository: any;
-  let mockUexClient: any;
-  let mockSyncService: any;
-  let mockSystemUserService: any;
+  let mockStarSystemRepository: Record<string, jest.Mock>;
+  let mockPlanetRepository: Record<string, jest.Mock>;
+  let mockMoonRepository: Record<string, jest.Mock>;
+  let mockCityRepository: Record<string, jest.Mock>;
+  let mockSpaceStationRepository: Record<string, jest.Mock>;
+  let mockOutpostRepository: Record<string, jest.Mock>;
+  let mockPoiRepository: Record<string, jest.Mock>;
+  let mockUexClient: Record<string, jest.Mock>;
+  let mockSyncService: Record<string, jest.Mock>;
+  let mockSystemUserService: Record<string, jest.Mock>;
 
   beforeEach(async () => {
     const createMockRepository = () => ({
@@ -109,7 +109,7 @@ describe('LocationsSyncService', () => {
         {
           provide: ConfigService,
           useValue: {
-            get: jest.fn((key: string, defaultValue: any) => defaultValue),
+            get: jest.fn((key: string, defaultValue: unknown) => defaultValue),
           },
         },
       ],
diff --git a/backend/src/modules/uex-sync/services/locations-sync.service.ts b/backend/src/modules/uex-sync/services/locations-sync.service.ts
index 43bd8a4..21f8c0f 100644
--- a/backend/src/modules/uex-sync/services/locations-sync.service.ts
+++ b/backend/src/modules/uex-sync/services/locations-sync.service.ts
@@ -129,8 +129,10 @@ export class LocationsSyncService {
         if (i < this.syncOrder.length - 1) {
           await this.sleep(this.pauseBetweenEndpointsMs);
         }
-      } catch (error: any) {
-        this.logger.error(`Failed to sync ${endpoint}: ${error.message}`);
+      } catch (error: unknown) {
+        const errorMessage =
+          error instanceof Error ? error.message : String(error);
+        this.logger.error(`Failed to sync ${endpoint}: ${errorMessage}`);
         throw error;
       }
     }
@@ -164,7 +166,7 @@ export class LocationsSyncService {
 
       const syncDecision = await this.syncService.shouldUseDeltaSync(endpoint);
       const useDelta = !forceFull && syncDecision.useDelta;
-      const filters: any = {};
+      const filters: Record<string, Date | string | number> = {};
 
       if (useDelta && syncDecision.lastSyncAt) {
         filters.date_modified = syncDecision.lastSyncAt;
@@ -199,16 +201,21 @@ export class LocationsSyncService {
       });
 
       return { ...result, durationMs };
-    } catch (error: any) {
+    } catch (error: unknown) {
       const durationMs = Date.now() - startTime;
-      await this.syncService.recordSyncFailure(endpoint, error, durationMs);
+      const syncError =
+        error instanceof Error ? error : new Error(String(error));
+      await this.syncService.recordSyncFailure(endpoint, syncError, durationMs);
       throw error;
     } finally {
       await this.syncService.releaseSyncLock(endpoint);
     }
   }
 
-  private async fetchWithRetry(endpoint: string, filters: any): Promise<any[]> {
+  private async fetchWithRetry(
+    endpoint: string,
+    filters: Record<string, Date | string | number>,
+  ): Promise<unknown[]> {
     let lastError: Error | undefined;
 
     for (let attempt = 0; attempt < this.maxRetries; attempt++) {
@@ -231,8 +238,8 @@ export class LocationsSyncService {
           default:
             throw new Error(`Unknown endpoint: ${endpoint}`);
         }
-      } catch (error: any) {
-        lastError = error;
+      } catch (error: unknown) {
+        lastError = error instanceof Error ? error : new Error(String(error));
 
         // Don't retry rate limits
         if (error instanceof RateLimitException) {
@@ -263,24 +270,30 @@ export class LocationsSyncService {
 
   private async processLocations(
     endpoint: string,
-    locations: any[],
+    locations: unknown[],
     syncMode: 'delta' | 'full',
   ): Promise<Omit<SyncResult, 'durationMs'>> {
     switch (endpoint) {
       case 'star_systems':
-        return this.syncStarSystems(locations, syncMode);
+        return this.syncStarSystems(
+          locations as UEXStarSystemResponse[],
+          syncMode,
+        );
       case 'planets':
-        return this.syncPlanets(locations, syncMode);
+        return this.syncPlanets(locations as UEXPlanetResponse[], syncMode);
       case 'moons':
-        return this.syncMoons(locations, syncMode);
+        return this.syncMoons(locations as UEXMoonResponse[], syncMode);
       case 'cities':
-        return this.syncCities(locations, syncMode);
+        return this.syncCities(locations as UEXCityResponse[], syncMode);
       case 'space_stations':
-        return this.syncSpaceStations(locations, syncMode);
+        return this.syncSpaceStations(
+          locations as UEXSpaceStationResponse[],
+          syncMode,
+        );
       case 'outposts':
-        return this.syncOutposts(locations, syncMode);
+        return this.syncOutposts(locations as UEXOutpostResponse[], syncMode);
       case 'poi':
-        return this.syncPOI(locations, syncMode);
+        return this.syncPOI(locations as UEXPOIResponse[], syncMode);
       default:
         throw new Error(`Unknown endpoint: ${endpoint}`);
     }
diff --git a/backend/src/modules/uex-sync/uex-sync.controller.ts b/backend/src/modules/uex-sync/uex-sync.controller.ts
index 60836e9..3a742ec 100644
--- a/backend/src/modules/uex-sync/uex-sync.controller.ts
+++ b/backend/src/modules/uex-sync/uex-sync.controller.ts
@@ -196,7 +196,9 @@ export class UexSyncController {
           deleted,
           durationMs,
         });
-      } catch (error: any) {
+      } catch (error: unknown) {
+        const errorMessage =
+          error instanceof Error ? error.message : 'Sync failed';
         results.push({
           endpoint,
           status: SyncStatus.FAILED,
@@ -205,7 +207,7 @@ export class UexSyncController {
           updated: 0,
           deleted: 0,
           durationMs: Date.now() - start,
-          errorMessage: error?.message || 'Sync failed',
+          errorMessage,
         });
       }
     }
diff --git a/backend/src/modules/uex-sync/uex-sync.service.spec.ts b/backend/src/modules/uex-sync/uex-sync.service.spec.ts
index 435c48b..c286dc4 100644
--- a/backend/src/modules/uex-sync/uex-sync.service.spec.ts
+++ b/backend/src/modules/uex-sync/uex-sync.service.spec.ts
@@ -7,8 +7,8 @@ import { UexSyncConfig } from './uex-sync-config.entity';
 
 describe('UexSyncService', () => {
   let service: UexSyncService;
-  let mockSyncStateRepository: any;
-  let mockSyncConfigRepository: any;
+  let mockSyncStateRepository: Record<string, jest.Mock>;
+  let mockSyncConfigRepository: Record<string, jest.Mock>;
 
   beforeEach(async () => {
     mockSyncStateRepository = {
diff --git a/backend/src/modules/uex-sync/uex-sync.service.ts b/backend/src/modules/uex-sync/uex-sync.service.ts
index 8adaf77..2c16393 100644
--- a/backend/src/modules/uex-sync/uex-sync.service.ts
+++ b/backend/src/modules/uex-sync/uex-sync.service.ts
@@ -1,6 +1,6 @@
 import { Injectable, Logger, ConflictException } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
-import { Repository, MoreThan } from 'typeorm';
+import { Repository, MoreThan, IsNull } from 'typeorm';
 import { UexSyncState, SyncStatus } from './uex-sync-state.entity';
 import { UexSyncConfig } from './uex-sync-config.entity';
 
@@ -257,7 +257,7 @@ export class UexSyncService {
           lastSuccessfulSyncAt: MoreThan(thresholdDate),
         },
         {
-          lastSuccessfulSyncAt: null as any,
+          lastSuccessfulSyncAt: IsNull(),
         },
       ],
       order: { lastSuccessfulSyncAt: 'ASC' },
diff --git a/backend/src/modules/uex/repositories/base-uex.repository.spec.ts b/backend/src/modules/uex/repositories/base-uex.repository.spec.ts
index 138257d..245ed1d 100644
--- a/backend/src/modules/uex/repositories/base-uex.repository.spec.ts
+++ b/backend/src/modules/uex/repositories/base-uex.repository.spec.ts
@@ -1,7 +1,9 @@
+import { FindOptionsWhere, UpdateResult } from 'typeorm';
 import { BaseUexRepository } from './base-uex.repository';
+import { BaseUexEntity } from '../entities/base-uex.entity';
 
 describe('BaseUexRepository', () => {
-  let repository: any;
+  let repository: BaseUexRepository<BaseUexEntity>;
 
   // Mock data
   const mockCategory = {
@@ -38,7 +40,10 @@ describe('BaseUexRepository', () => {
     it('should find all non-deleted records', async () => {
       const findSpy = jest
         .spyOn(repository, 'find')
-        .mockResolvedValue([mockCategory, mockInactiveCategory] as any);
+        .mockResolvedValue([
+          mockCategory,
+          mockInactiveCategory,
+        ] as unknown as BaseUexEntity[]);
 
       const result = await repository.findAllActive();
 
@@ -54,7 +59,7 @@ describe('BaseUexRepository', () => {
       const findSpy = jest.spyOn(repository, 'find').mockResolvedValue([]);
 
       await repository.findAllActive({
-        where: { type: 'item' } as any,
+        where: { type: 'item' } as unknown as FindOptionsWhere<BaseUexEntity>,
       });
 
       expect(findSpy).toHaveBeenCalledWith(
@@ -69,7 +74,7 @@ describe('BaseUexRepository', () => {
     it('should find all active and non-deleted records', async () => {
       const findSpy = jest
         .spyOn(repository, 'find')
-        .mockResolvedValue([mockCategory] as any);
+        .mockResolvedValue([mockCategory] as unknown as BaseUexEntity[]);
 
       const result = await repository.findActive();
 
@@ -86,10 +91,10 @@ describe('BaseUexRepository', () => {
     it('should find one non-deleted record', async () => {
       const findOneSpy = jest
         .spyOn(repository, 'findOne')
-        .mockResolvedValue(mockCategory as any);
+        .mockResolvedValue(mockCategory as unknown as BaseUexEntity);
 
       const result = await repository.findOneActive({
-        where: { uexId: 100 } as any,
+        where: { uexId: 100 } as unknown as FindOptionsWhere<BaseUexEntity>,
       });
 
       expect(findOneSpy).toHaveBeenCalledWith(
@@ -105,7 +110,7 @@ describe('BaseUexRepository', () => {
       jest.spyOn(repository, 'findOne').mockResolvedValue(null);
 
       const result = await repository.findOneActive({
-        where: { uexId: 999 } as any,
+        where: { uexId: 999 } as unknown as FindOptionsWhere<BaseUexEntity>,
       });
 
       expect(result).toBeNull();
@@ -116,10 +121,10 @@ describe('BaseUexRepository', () => {
     it('should find one active and non-deleted record', async () => {
       const findOneSpy = jest
         .spyOn(repository, 'findOne')
-        .mockResolvedValue(mockCategory as any);
+        .mockResolvedValue(mockCategory as unknown as BaseUexEntity);
 
       const result = await repository.findOneActiveOnly({
-        where: { uexId: 100 } as any,
+        where: { uexId: 100 } as unknown as FindOptionsWhere<BaseUexEntity>,
       });
 
       expect(findOneSpy).toHaveBeenCalledWith(
@@ -135,7 +140,7 @@ describe('BaseUexRepository', () => {
     it('should find a record by uexId', async () => {
       const findOneSpy = jest
         .spyOn(repository, 'findOne')
-        .mockResolvedValue(mockCategory as any);
+        .mockResolvedValue(mockCategory as unknown as BaseUexEntity);
 
       const result = await repository.findByUexId(100);
 
@@ -149,7 +154,7 @@ describe('BaseUexRepository', () => {
     it('should soft delete a record by id', async () => {
       const updateSpy = jest
         .spyOn(repository, 'update')
-        .mockResolvedValue({} as any);
+        .mockResolvedValue({ affected: 1 } as unknown as UpdateResult);
 
       await repository.markAsDeleted(1, 999);
 
@@ -164,7 +169,7 @@ describe('BaseUexRepository', () => {
     it('should soft delete a record by uexId', async () => {
       const updateSpy = jest
         .spyOn(repository, 'update')
-        .mockResolvedValue({} as any);
+        .mockResolvedValue({ affected: 1 } as unknown as UpdateResult);
 
       await repository.markAsDeletedByUexId(100, 999);
 
@@ -182,7 +187,7 @@ describe('BaseUexRepository', () => {
     it('should mark a record as inactive', async () => {
       const updateSpy = jest
         .spyOn(repository, 'update')
-        .mockResolvedValue({} as any);
+        .mockResolvedValue({ affected: 1 } as unknown as UpdateResult);
 
       await repository.deactivate(1, 999);
 
@@ -197,7 +202,7 @@ describe('BaseUexRepository', () => {
     it('should mark a record as active', async () => {
       const updateSpy = jest
         .spyOn(repository, 'update')
-        .mockResolvedValue({} as any);
+        .mockResolvedValue({ affected: 1 } as unknown as UpdateResult);
 
       await repository.activate(1, 999);
 
diff --git a/backend/src/modules/uex/repositories/base-uex.repository.ts b/backend/src/modules/uex/repositories/base-uex.repository.ts
index 98ab772..b9e86a2 100644
--- a/backend/src/modules/uex/repositories/base-uex.repository.ts
+++ b/backend/src/modules/uex/repositories/base-uex.repository.ts
@@ -1,6 +1,14 @@
-import { FindManyOptions, FindOneOptions, Repository } from 'typeorm';
+import {
+  FindManyOptions,
+  FindOneOptions,
+  FindOptionsWhere,
+  Repository,
+} from 'typeorm';
+import { QueryDeepPartialEntity } from 'typeorm/query-builder/QueryPartialEntity';
 import { BaseUexEntity } from '../entities/base-uex.entity';
 
+type BaseUexUpdate = QueryDeepPartialEntity<BaseUexEntity>;
+
 /**
  * Base repository class for UEX entities
  * Automatically filters out soft-deleted records in all queries
@@ -15,7 +23,7 @@ export class BaseUexRepository<T extends BaseUexEntity> extends Repository<T> {
       where: {
         ...(options?.where || {}),
         deleted: false,
-      } as any,
+      } as FindOptionsWhere<T>,
     });
   }
 
@@ -29,7 +37,7 @@ export class BaseUexRepository<T extends BaseUexEntity> extends Repository<T> {
         ...(options?.where || {}),
         deleted: false,
         active: true,
-      } as any,
+      } as FindOptionsWhere<T>,
     });
   }
 
@@ -42,7 +50,7 @@ export class BaseUexRepository<T extends BaseUexEntity> extends Repository<T> {
       where: {
         ...(options.where || {}),
         deleted: false,
-      } as any,
+      } as FindOptionsWhere<T>,
     });
   }
 
@@ -56,7 +64,7 @@ export class BaseUexRepository<T extends BaseUexEntity> extends Repository<T> {
         ...(options.where || {}),
         deleted: false,
         active: true,
-      } as any,
+      } as FindOptionsWhere<T>,
     });
   }
 
@@ -65,7 +73,7 @@ export class BaseUexRepository<T extends BaseUexEntity> extends Repository<T> {
    */
   async findByUexId(uexId: number): Promise<T | null> {
     return this.findOneActive({
-      where: { uexId } as any,
+      where: { uexId } as FindOptionsWhere<T>,
     });
   }
 
@@ -73,22 +81,18 @@ export class BaseUexRepository<T extends BaseUexEntity> extends Repository<T> {
    * Mark record as soft deleted
    */
   async markAsDeleted(id: number, modifiedBy: number): Promise<void> {
-    await this.update(id, {
-      deleted: true,
-      modifiedById: modifiedBy,
-    } as any);
+    const update: BaseUexUpdate = { deleted: true, modifiedById: modifiedBy };
+    await this.update(id, update as QueryDeepPartialEntity<T>);
   }
 
   /**
    * Mark record as soft deleted by UEX ID
    */
   async markAsDeletedByUexId(uexId: number, modifiedBy: number): Promise<void> {
+    const update: BaseUexUpdate = { deleted: true, modifiedById: modifiedBy };
     await this.update(
-      { uexId } as any,
-      {
-        deleted: true,
-        modifiedById: modifiedBy,
-      } as any,
+      { uexId } as FindOptionsWhere<T>,
+      update as QueryDeepPartialEntity<T>,
     );
   }
 
@@ -96,19 +100,15 @@ export class BaseUexRepository<T extends BaseUexEntity> extends Repository<T> {
    * Mark record as inactive
    */
   async deactivate(id: number, modifiedBy: number): Promise<void> {
-    await this.update(id, {
-      active: false,
-      modifiedById: modifiedBy,
-    } as any);
+    const update: BaseUexUpdate = { active: false, modifiedById: modifiedBy };
+    await this.update(id, update as QueryDeepPartialEntity<T>);
   }
 
   /**
    * Mark record as active
    */
   async activate(id: number, modifiedBy: number): Promise<void> {
-    await this.update(id, {
-      active: true,
-      modifiedById: modifiedBy,
-    } as any);
+    const update: BaseUexUpdate = { active: true, modifiedById: modifiedBy };
+    await this.update(id, update as QueryDeepPartialEntity<T>);
   }
 }
diff --git a/backend/src/modules/uex/uex.service.spec.ts b/backend/src/modules/uex/uex.service.spec.ts
index 3347c7d..09d78a8 100644
--- a/backend/src/modules/uex/uex.service.spec.ts
+++ b/backend/src/modules/uex/uex.service.spec.ts
@@ -27,7 +27,7 @@ describe('UexService', () => {
   } as unknown as UexItem;
 
   const createQueryBuilder = () => {
-    const qb: any = {
+    const qb: Record<string, jest.Mock> = {
       leftJoinAndSelect: jest.fn().mockReturnThis(),
       where: jest.fn().mockReturnThis(),
       andWhere: jest.fn().mockReturnThis(),
@@ -123,7 +123,7 @@ describe('UexService', () => {
   });
 
   it('should return active star systems by default', async () => {
-    const mockQueryBuilder: any = {
+    const mockQueryBuilder: Record<string, jest.Mock> = {
       where: jest.fn().mockReturnThis(),
       andWhere: jest.fn().mockReturnThis(),
       orderBy: jest.fn().mockReturnThis(),
@@ -138,14 +138,15 @@ describe('UexService', () => {
       ]),
     };
 
-    (mockStarSystemRepository as any).createQueryBuilder = jest
-      .fn()
-      .mockReturnValue(mockQueryBuilder);
+    (
+      mockStarSystemRepository as unknown as Record<string, jest.Mock>
+    ).createQueryBuilder = jest.fn().mockReturnValue(mockQueryBuilder);
 
     const systems = await service.getStarSystems({});
 
     expect(
-      (mockStarSystemRepository as any).createQueryBuilder,
+      (mockStarSystemRepository as unknown as Record<string, jest.Mock>)
+        .createQueryBuilder,
     ).toHaveBeenCalledWith('system');
     expect(mockQueryBuilder.where).toHaveBeenCalledWith(
       'system.deleted = FALSE',
@@ -164,7 +165,7 @@ describe('UexService', () => {
   });
 
   it('should allow including inactive systems when filters disable flags', async () => {
-    const mockQueryBuilder: any = {
+    const mockQueryBuilder: Record<string, jest.Mock> = {
       where: jest.fn().mockReturnThis(),
       andWhere: jest.fn().mockReturnThis(),
       orderBy: jest.fn().mockReturnThis(),
@@ -179,9 +180,9 @@ describe('UexService', () => {
       ]),
     };
 
-    (mockStarSystemRepository as any).createQueryBuilder = jest
-      .fn()
-      .mockReturnValue(mockQueryBuilder);
+    (
+      mockStarSystemRepository as unknown as Record<string, jest.Mock>
+    ).createQueryBuilder = jest.fn().mockReturnValue(mockQueryBuilder);
 
     const systems = await service.getStarSystems({
       activeOnly: false,
diff --git a/backend/src/modules/user-inventory/entities/inventory-audit-log.entity.ts b/backend/src/modules/user-inventory/entities/inventory-audit-log.entity.ts
index 0126445..cd07400 100644
--- a/backend/src/modules/user-inventory/entities/inventory-audit-log.entity.ts
+++ b/backend/src/modules/user-inventory/entities/inventory-audit-log.entity.ts
@@ -53,7 +53,7 @@ export class InventoryAuditLog {
   reason?: string;
 
   @Column({ type: 'jsonb', nullable: true })
-  metadata?: Record<string, any>;
+  metadata?: Record<string, unknown>;
 
   @CreateDateColumn({ name: 'date_created', type: 'timestamptz' })
   dateCreated!: Date;
diff --git a/backend/src/modules/user-inventory/user-inventory.controller.ts b/backend/src/modules/user-inventory/user-inventory.controller.ts
index ebce157..37c6962 100644
--- a/backend/src/modules/user-inventory/user-inventory.controller.ts
+++ b/backend/src/modules/user-inventory/user-inventory.controller.ts
@@ -27,6 +27,8 @@ import {
   UpdateUserInventoryItemDto,
   UserInventorySearchDto,
 } from './dto/user-inventory-item.dto';
+import { AuthenticatedRequest } from '../auth/interfaces/authenticated-request.interface';
+import { QueryParams, asString } from '../../common/types/query-params.type';
 
 @Controller('api/inventory')
 @UseGuards(JwtAuthGuard)
@@ -36,45 +38,111 @@ export class UserInventoryController {
     private readonly userInventoryService: UserInventoryService,
   ) {}
 
+  private readOptionalNumber(
+    query: QueryParams,
+    keys: string[],
+    fieldName: string,
+    options?: { integer?: boolean; min?: number },
+  ): number | undefined {
+    const rawValue = keys
+      .map((key) => query[key])
+      .find((value) => value !== undefined);
+
+    if (rawValue === undefined || rawValue === '') {
+      return undefined;
+    }
+
+    const parsed = Number(rawValue);
+    if (Number.isNaN(parsed)) {
+      throw new BadRequestException(`${fieldName} must be a number`);
+    }
+    if (options?.integer && !Number.isInteger(parsed)) {
+      throw new BadRequestException(`${fieldName} must be an integer`);
+    }
+    if (options?.min !== undefined && parsed < options.min) {
+      throw new BadRequestException(
+        `${fieldName} must be greater than or equal to ${options.min}`,
+      );
+    }
+    return parsed;
+  }
+
   @Get()
-  async list(@Query() query: Record<string, any>, @Request() req: any) {
+  async list(
+    @Query() query: QueryParams,
+    @Request() req: AuthenticatedRequest,
+  ) {
     const userId = req.user.userId;
-    const parsedMinQuantity = Number(
-      query.min_quantity ?? query.minQuantity ?? Number.NaN,
-    );
-    const parsedMaxQuantity = Number(
-      query.max_quantity ?? query.maxQuantity ?? Number.NaN,
+
+    const gameId = this.readOptionalNumber(
+      query,
+      ['game_id', 'gameId'],
+      'game_id',
+      { integer: true },
     );
+    if (!gameId) {
+      throw new BadRequestException('game_id is required');
+    }
 
     const searchDto: UserInventorySearchDto = {
-      gameId: Number(query.game_id ?? query.gameId),
-      categoryId: query.category_id ? Number(query.category_id) : undefined,
-      uexItemId: query.uex_item_id ? Number(query.uex_item_id) : undefined,
-      locationId: query.location_id ? Number(query.location_id) : undefined,
-      sharedOrgId: query.shared_org_id
-        ? Number(query.shared_org_id)
-        : undefined,
-      search: query.search,
-      limit: query.limit ? Number(query.limit) : undefined,
-      offset: query.offset ? Number(query.offset) : undefined,
-      sort: query.sort,
-      order: query.order,
+      gameId,
+      categoryId: this.readOptionalNumber(
+        query,
+        ['category_id', 'categoryId'],
+        'category_id',
+        { integer: true },
+      ),
+      uexItemId: this.readOptionalNumber(
+        query,
+        ['uex_item_id', 'uexItemId'],
+        'uex_item_id',
+        { integer: true },
+      ),
+      locationId: this.readOptionalNumber(
+        query,
+        ['location_id', 'locationId'],
+        'location_id',
+        { integer: true },
+      ),
+      sharedOrgId: this.readOptionalNumber(
+        query,
+        ['shared_org_id', 'sharedOrgId'],
+        'shared_org_id',
+        { integer: true },
+      ),
+      search: asString(query.search),
+      limit: this.readOptionalNumber(query, ['limit'], 'limit', {
+        integer: true,
+        min: 1,
+      }),
+      offset: this.readOptionalNumber(query, ['offset'], 'offset', {
+        integer: true,
+        min: 0,
+      }),
+      sort: asString(query.sort) as
+        | 'name'
+        | 'quantity'
+        | 'location'
+        | 'date_added'
+        | 'date_modified'
+        | undefined,
+      order: asString(query.order) as 'asc' | 'desc' | undefined,
       sharedOnly:
         query.shared_only !== undefined
-          ? query.shared_only === 'true' || query.shared_only === true
+          ? query.shared_only === 'true'
           : undefined,
-      minQuantity: Number.isNaN(parsedMinQuantity)
-        ? undefined
-        : parsedMinQuantity,
-      maxQuantity: Number.isNaN(parsedMaxQuantity)
-        ? undefined
-        : parsedMaxQuantity,
+      minQuantity: this.readOptionalNumber(
+        query,
+        ['min_quantity', 'minQuantity'],
+        'min_quantity',
+      ),
+      maxQuantity: this.readOptionalNumber(
+        query,
+        ['max_quantity', 'maxQuantity'],
+        'max_quantity',
+      ),
     };
 
-    if (!searchDto.gameId) {
-      throw new BadRequestException('game_id is required');
-    }
-
     return this.userInventoryService.findAll(userId, searchDto);
   }
 
@@ -82,7 +150,7 @@ export class UserInventoryController {
   @HttpCode(HttpStatus.CREATED)
   async create(
     @Body() createDto: CreateUserInventoryItemDto,
-    @Request() req: any,
+    @Request() req: AuthenticatedRequest,
   ) {
     const userId = req.user.userId;
     return this.userInventoryService.create(userId, createDto);
@@ -92,7 +160,7 @@ export class UserInventoryController {
   async update(
     @Param('id', ParseUUIDPipe) id: string,
     @Body() updateDto: UpdateUserInventoryItemDto,
-    @Request() req: any,
+    @Request() req: AuthenticatedRequest,
   ) {
     const userId = req.user.userId;
     return this.userInventoryService.update(id, userId, updateDto);
@@ -100,7 +168,10 @@ export class UserInventoryController {
 
   @Delete(':id')
   @HttpCode(HttpStatus.NO_CONTENT)
-  async delete(@Param('id', ParseUUIDPipe) id: string, @Request() req: any) {
+  async delete(
+    @Param('id', ParseUUIDPipe) id: string,
+    @Request() req: AuthenticatedRequest,
+  ) {
     const userId = req.user.userId;
     await this.userInventoryService.delete(id, userId);
   }
@@ -109,7 +180,7 @@ export class UserInventoryController {
   async shareItem(
     @Param('itemId', ParseUUIDPipe) itemId: string,
     @Body() shareDto: ShareItemDto,
-    @Request() req: any,
+    @Request() req: AuthenticatedRequest,
   ): Promise<{ message: string }> {
     const userId = req.user.userId;
     await this.inventorySharingService.shareItemWithOrg(
@@ -123,7 +194,7 @@ export class UserInventoryController {
   @Delete(':itemId/share')
   async unshareItem(
     @Param('itemId', ParseUUIDPipe) itemId: string,
-    @Request() req: any,
+    @Request() req: AuthenticatedRequest,
   ): Promise<{ message: string }> {
     const userId = req.user.userId;
     await this.inventorySharingService.unshareItemFromOrg(userId, itemId);
@@ -135,7 +206,7 @@ export class UserInventoryController {
   @RequirePermission(OrgPermission.CAN_VIEW_MEMBER_SHARED_ITEMS)
   async getSharedItems(
     @Query('orgId', ParseIntPipe) orgId: number,
-    @Request() req: any,
+    @Request() req: AuthenticatedRequest,
   ) {
     const userId = req.user.userId;
     return this.inventorySharingService.findUserSharedItems(userId, orgId);
@@ -145,7 +216,7 @@ export class UserInventoryController {
   @UseGuards(PermissionsGuard)
   @RequirePermission(OrgPermission.CAN_ADMIN_ORG_INVENTORY)
   async getAuditLog(
-    @Request() req: any,
+    @Request() req: AuthenticatedRequest,
     @Query('userId') userId?: number,
     @Query('orgId') orgId?: number,
     @Query('limit') limit?: number,
diff --git a/backend/src/modules/user-inventory/user-inventory.service.spec.ts b/backend/src/modules/user-inventory/user-inventory.service.spec.ts
index d42490c..8642c5d 100644
--- a/backend/src/modules/user-inventory/user-inventory.service.spec.ts
+++ b/backend/src/modules/user-inventory/user-inventory.service.spec.ts
@@ -40,16 +40,18 @@ describe('UserInventoryService', () => {
     dateModified: new Date(),
     addedBy: 1,
     modifiedBy: 1,
-    user: undefined as any,
-    game: undefined as any,
-    item: { name: 'Test Item' } as any,
-    location: { displayName: 'Test Location' } as any,
+    user: undefined as unknown as UserInventoryItem['user'],
+    game: undefined as unknown as UserInventoryItem['game'],
+    item: { name: 'Test Item' } as unknown as UserInventoryItem['item'],
+    location: {
+      displayName: 'Test Location',
+    } as unknown as UserInventoryItem['location'],
     sharedOrg: undefined,
-    addedByUser: undefined as any,
-    modifiedByUser: undefined as any,
+    addedByUser: undefined as unknown as UserInventoryItem['addedByUser'],
+    modifiedByUser: undefined as unknown as UserInventoryItem['modifiedByUser'],
   };
 
-  const mockQueryBuilder: any = {
+  const mockQueryBuilder: Record<string, jest.Mock> = {
     createQueryBuilder: jest.fn().mockReturnThis(),
     leftJoinAndSelect: jest.fn().mockReturnThis(),
     where: jest.fn().mockReturnThis(),
@@ -74,9 +76,7 @@ describe('UserInventoryService', () => {
     transactionRepository = {
       create: jest.fn(),
       save: jest.fn(),
-      createQueryBuilder: jest
-        .fn()
-        .mockReturnValue(transactionQueryBuilder as any),
+      createQueryBuilder: jest.fn().mockReturnValue(transactionQueryBuilder),
     };
 
     const module: TestingModule = await Test.createTestingModule({
diff --git a/backend/src/modules/users/users.controller.ts b/backend/src/modules/users/users.controller.ts
index d45918c..16ba5de 100644
--- a/backend/src/modules/users/users.controller.ts
+++ b/backend/src/modules/users/users.controller.ts
@@ -12,11 +12,11 @@ import {
   UseGuards,
   HttpCode,
 } from '@nestjs/common';
-import { Request } from 'express';
 import { AuthGuard } from '@nestjs/passport';
 import { UsersService } from './users.service';
 import { UserDto } from './dto/user.dto';
 import { UpdateProfileDto } from './dto/update-profile.dto';
+import { AuthenticatedRequest } from '../auth/interfaces/authenticated-request.interface';
 
 @Controller('users')
 export class UsersController {
@@ -24,18 +24,20 @@ export class UsersController {
 
   @UseGuards(AuthGuard('jwt'))
   @Get('profile')
-  getProfile(@Req() req: Request) {
-    return req.user;
+  getProfile(@Req() req: AuthenticatedRequest) {
+    return { userId: req.user.userId, username: req.user.username };
   }
 
   @UseGuards(AuthGuard('jwt'))
   @Patch('profile')
   async updateProfile(
-    @Req() req: Request,
+    @Req() req: AuthenticatedRequest,
     @Body() updateProfileDto: UpdateProfileDto,
   ) {
-    const userId = (req.user as any).userId;
-    return await this.usersService.updateProfile(userId, updateProfileDto);
+    const userId = req.user.userId;
+    const { password: _password, ...safeUser } =
+      await this.usersService.updateProfile(userId, updateProfileDto);
+    return safeUser;
   }
 
   @UseGuards(AuthGuard('jwt'))
diff --git a/docs/matrix-academy-comparison.md b/docs/matrix-academy-comparison.md
index f8af379..da1ff64 100644
--- a/docs/matrix-academy-comparison.md
+++ b/docs/matrix-academy-comparison.md
@@ -10,6 +10,7 @@
 Both projects are well-architected NestJS SaaS applications with similar tech stacks (NestJS, TypeORM, PostgreSQL, React, Material-UI). However, Matrix Academy has implemented several production-ready features and best practices that Station could benefit from adopting.
 
 **Priority Recommendations:**
+
 1. ✅ **HIGH**: Implement Redis caching layer
 2. ✅ **HIGH**: Add comprehensive user profile fields (firstName, lastName, phoneNumber, bio)
 3. ✅ **HIGH**: Build protected Dashboard and admin UI pages
@@ -25,18 +26,20 @@ Both projects are well-architected NestJS SaaS applications with similar tech st
 
 ### 1. Caching Infrastructure ⭐ HIGH PRIORITY
 
-| Feature | Matrix Academy | Station | Recommendation |
-|---------|---------------|---------|----------------|
-| **Redis Integration** | ✅ Implemented with caching patterns and automatic invalidation | ⚠️ Config files exist but not utilized | **IMPLEMENT** |
-| **Cache Strategy** | Documented invalidation patterns for data consistency | N/A | **IMPLEMENT** |
+| Feature               | Matrix Academy                                                  | Station                                | Recommendation |
+| --------------------- | --------------------------------------------------------------- | -------------------------------------- | -------------- |
+| **Redis Integration** | ✅ Implemented with caching patterns and automatic invalidation | ⚠️ Config files exist but not utilized | **IMPLEMENT**  |
+| **Cache Strategy**    | Documented invalidation patterns for data consistency           | N/A                                    | **IMPLEMENT**  |
 
 **Why Station Needs This:**
+
 - Gaming guild data (organizations, members, roles) is frequently read but infrequently updated
 - Permission aggregation queries could benefit significantly from caching
 - User session data and organization member lists are perfect cache candidates
 - Redis would improve API response times by 10-100x for cached queries
 
 **Implementation Plan:**
+
 ```typescript
 // Example: Cache organization members
 @Injectable()
@@ -48,7 +51,7 @@ export class OrganizationsService {
 
     const data = await this.orgRepository.findOne({
       where: { id },
-      relations: ['userOrganizationRoles', 'userOrganizationRoles.user']
+      relations: ['userOrganizationRoles', 'userOrganizationRoles.user'],
     });
 
     await this.redis.set(cacheKey, JSON.stringify(data), 'EX', 300); // 5min TTL
@@ -64,6 +67,7 @@ export class OrganizationsService {
 ```
 
 **Recommended Cache Targets:**
+
 - Organization member lists (TTL: 5-10 minutes)
 - User permissions aggregation (TTL: 15 minutes)
 - Role definitions (TTL: 1 hour)
@@ -73,15 +77,16 @@ export class OrganizationsService {
 
 ### 2. Enhanced User Profile Fields ⭐ HIGH PRIORITY
 
-| Feature | Matrix Academy | Station | Recommendation |
-|---------|---------------|---------|----------------|
-| **First Name** | ✅ Optional field | ❌ Not implemented | **ADD** |
-| **Last Name** | ✅ Optional field | ❌ Not implemented | **ADD** |
-| **Phone Number** | ✅ Optional field | ❌ Not implemented | **ADD** |
-| **Bio** | ✅ Optional text field | ❌ Not implemented | **ADD** |
-| **Profile PATCH Endpoint** | ✅ `/users/profile` | ✅ `/users/profile` (GET only) | **ENHANCE** |
+| Feature                    | Matrix Academy         | Station                        | Recommendation |
+| -------------------------- | ---------------------- | ------------------------------ | -------------- |
+| **First Name**             | ✅ Optional field      | ❌ Not implemented             | **ADD**        |
+| **Last Name**              | ✅ Optional field      | ❌ Not implemented             | **ADD**        |
+| **Phone Number**           | ✅ Optional field      | ❌ Not implemented             | **ADD**        |
+| **Bio**                    | ✅ Optional text field | ❌ Not implemented             | **ADD**        |
+| **Profile PATCH Endpoint** | ✅ `/users/profile`    | ✅ `/users/profile` (GET only) | **ENHANCE**    |
 
 **Why Station Needs This:**
+
 - Gaming guilds need member profiles with display names beyond username
 - Contact information (phone) useful for guild event coordination
 - Bio field perfect for "main character/class" or "preferred game modes"
@@ -90,33 +95,46 @@ export class OrganizationsService {
 **Implementation Plan:**
 
 **Step 1: Database Migration**
+
 ```typescript
 // migration: add-user-profile-fields.ts
 export class AddUserProfileFields1700000000000 implements MigrationInterface {
   public async up(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.addColumn('users', new TableColumn({
-      name: 'firstName',
-      type: 'varchar',
-      length: '100',
-      isNullable: true
-    }));
-    await queryRunner.addColumn('users', new TableColumn({
-      name: 'lastName',
-      type: 'varchar',
-      length: '100',
-      isNullable: true
-    }));
-    await queryRunner.addColumn('users', new TableColumn({
-      name: 'phoneNumber',
-      type: 'varchar',
-      length: '20',
-      isNullable: true
-    }));
-    await queryRunner.addColumn('users', new TableColumn({
-      name: 'bio',
-      type: 'text',
-      isNullable: true
-    }));
+    await queryRunner.addColumn(
+      'users',
+      new TableColumn({
+        name: 'firstName',
+        type: 'varchar',
+        length: '100',
+        isNullable: true,
+      }),
+    );
+    await queryRunner.addColumn(
+      'users',
+      new TableColumn({
+        name: 'lastName',
+        type: 'varchar',
+        length: '100',
+        isNullable: true,
+      }),
+    );
+    await queryRunner.addColumn(
+      'users',
+      new TableColumn({
+        name: 'phoneNumber',
+        type: 'varchar',
+        length: '20',
+        isNullable: true,
+      }),
+    );
+    await queryRunner.addColumn(
+      'users',
+      new TableColumn({
+        name: 'bio',
+        type: 'text',
+        isNullable: true,
+      }),
+    );
   }
 
   public async down(queryRunner: QueryRunner): Promise<void> {
@@ -129,6 +147,7 @@ export class AddUserProfileFields1700000000000 implements MigrationInterface {
 ```
 
 **Step 2: Update User Entity**
+
 ```typescript
 @Entity('users')
 export class User {
@@ -149,6 +168,7 @@ export class User {
 ```
 
 **Step 3: Update DTOs**
+
 ```typescript
 export class UpdateProfileDto {
   @IsOptional()
@@ -174,6 +194,7 @@ export class UpdateProfileDto {
 ```
 
 **Step 4: Add Profile Update Endpoint**
+
 ```typescript
 @Patch('profile')
 @UseGuards(AuthGuard('jwt'))
@@ -186,13 +207,14 @@ async updateProfile(@Request() req, @Body() dto: UpdateProfileDto) {
 
 ### 3. Frontend Dashboard & Protected Pages ⭐ HIGH PRIORITY
 
-| Feature | Matrix Academy | Station | Recommendation |
-|---------|---------------|---------|----------------|
-| **Protected Dashboard** | ✅ Implemented with auth redirect | ❌ Not implemented | **BUILD** |
-| **Profile Page** | ✅ With update form | ❌ Not implemented | **BUILD** |
-| **Responsive Design** | ✅ Mobile/tablet/desktop | ⚠️ Basic responsive | **ENHANCE** |
+| Feature                 | Matrix Academy                    | Station             | Recommendation |
+| ----------------------- | --------------------------------- | ------------------- | -------------- |
+| **Protected Dashboard** | ✅ Implemented with auth redirect | ❌ Not implemented  | **BUILD**      |
+| **Profile Page**        | ✅ With update form               | ❌ Not implemented  | **BUILD**      |
+| **Responsive Design**   | ✅ Mobile/tablet/desktop          | ⚠️ Basic responsive | **ENHANCE**    |
 
 **Why Station Needs This:**
+
 - Users need a post-login experience beyond API access
 - Guild members need to view their organizations, roles, and permissions
 - Admins need UI for managing organizations and members
@@ -223,6 +245,7 @@ async updateProfile(@Request() req, @Body() dto: UpdateProfileDto) {
    - Requires admin permission check
 
 **React Router Structure:**
+
 ```typescript
 const router = createBrowserRouter([
   { path: '/', element: <Home /> },
@@ -244,12 +267,13 @@ const router = createBrowserRouter([
 
 ### 4. Standardized Error Response Patterns ⭐ MEDIUM PRIORITY
 
-| Feature | Matrix Academy | Station | Recommendation |
-|---------|---------------|---------|----------------|
-| **Error Response Format** | ✅ Standardized across all endpoints | ⚠️ Default NestJS format | **STANDARDIZE** |
-| **Response Transformation** | ✅ Consistent transformation patterns | ⚠️ Basic | **IMPLEMENT** |
+| Feature                     | Matrix Academy                        | Station                  | Recommendation  |
+| --------------------------- | ------------------------------------- | ------------------------ | --------------- |
+| **Error Response Format**   | ✅ Standardized across all endpoints  | ⚠️ Default NestJS format | **STANDARDIZE** |
+| **Response Transformation** | ✅ Consistent transformation patterns | ⚠️ Basic                 | **IMPLEMENT**   |
 
 **Why Station Needs This:**
+
 - Consistent error handling improves frontend development
 - Better debugging and monitoring
 - Professional API appearance
@@ -258,6 +282,7 @@ const router = createBrowserRouter([
 **Implementation Plan:**
 
 **Global Exception Filter:**
+
 ```typescript
 // filters/http-exception.filter.ts
 @Catch(HttpException)
@@ -269,18 +294,21 @@ export class HttpExceptionFilter implements ExceptionFilter {
     const status = exception.getStatus();
     const exceptionResponse = exception.getResponse();
 
+    const body =
+      typeof exceptionResponse === 'object' && exceptionResponse !== null
+        ? (exceptionResponse as Record<string, unknown>)
+        : {};
     const errorResponse = {
       success: false,
       statusCode: status,
       timestamp: new Date().toISOString(),
       path: request.url,
       method: request.method,
-      message: typeof exceptionResponse === 'string'
-        ? exceptionResponse
-        : (exceptionResponse as any).message,
-      errors: typeof exceptionResponse === 'object' && (exceptionResponse as any).errors
-        ? (exceptionResponse as any).errors
-        : undefined
+      message:
+        typeof exceptionResponse === 'string'
+          ? exceptionResponse
+          : (body['message'] as string | undefined),
+      errors: body['errors'],
     };
 
     response.status(status).json(errorResponse);
@@ -289,24 +317,26 @@ export class HttpExceptionFilter implements ExceptionFilter {
 ```
 
 **Success Response Interceptor:**
+
 ```typescript
 // interceptors/transform.interceptor.ts
 @Injectable()
 export class TransformInterceptor implements NestInterceptor {
-  intercept(context: ExecutionContext, next: CallHandler): Observable<any> {
+  intercept(context: ExecutionContext, next: CallHandler): Observable<unknown> {
     return next.handle().pipe(
-      map(data => ({
+      map((data) => ({
         success: true,
         statusCode: context.switchToHttp().getResponse().statusCode,
         timestamp: new Date().toISOString(),
-        data
-      }))
+        data,
+      })),
     );
   }
 }
 ```
 
 **Apply Globally:**
+
 ```typescript
 // main.ts
 async function bootstrap() {
@@ -318,6 +348,7 @@ async function bootstrap() {
 ```
 
 **Example Responses:**
+
 ```json
 // Success Response
 {
@@ -361,13 +392,14 @@ async function bootstrap() {
 
 ### 5. Enhanced Landing Page ⭐ MEDIUM PRIORITY
 
-| Feature | Matrix Academy | Station | Recommendation |
-|---------|---------------|---------|----------------|
-| **Hero Section** | ✅ Prominent hero with CTA | ⚠️ Basic header | **ENHANCE** |
-| **Feature Highlights** | ✅ Feature showcase section | ❌ Not implemented | **ADD** |
-| **Theming** | ✅ Matrix-themed (green/black) | ⚠️ Basic MUI theme | **ENHANCE** |
+| Feature                | Matrix Academy                 | Station            | Recommendation |
+| ---------------------- | ------------------------------ | ------------------ | -------------- |
+| **Hero Section**       | ✅ Prominent hero with CTA     | ⚠️ Basic header    | **ENHANCE**    |
+| **Feature Highlights** | ✅ Feature showcase section    | ❌ Not implemented | **ADD**        |
+| **Theming**            | ✅ Matrix-themed (green/black) | ⚠️ Basic MUI theme | **ENHANCE**    |
 
 **Why Station Needs This:**
+
 - First impression matters for attracting gaming guilds
 - Clear value proposition encourages registration
 - Professional appearance builds trust
@@ -455,12 +487,13 @@ export function Home() {
 
 ### 6. Accessibility Compliance ⭐ MEDIUM PRIORITY
 
-| Feature | Matrix Academy | Station | Recommendation |
-|---------|---------------|---------|----------------|
-| **WCAG 2.1 AA** | ✅ Compliance target | ⚠️ Not documented | **IMPLEMENT** |
-| **Accessibility Audits** | ✅ Part of testing | ❌ Not implemented | **ADD** |
+| Feature                  | Matrix Academy       | Station            | Recommendation |
+| ------------------------ | -------------------- | ------------------ | -------------- |
+| **WCAG 2.1 AA**          | ✅ Compliance target | ⚠️ Not documented  | **IMPLEMENT**  |
+| **Accessibility Audits** | ✅ Part of testing   | ❌ Not implemented | **ADD**        |
 
 **Why Station Needs This:**
+
 - Legal compliance in many jurisdictions
 - Better user experience for all users
 - SEO benefits
@@ -484,6 +517,7 @@ export function Home() {
    - Semantic HTML structure
 
 4. **Form Accessibility**
+
    ```typescript
    <TextField
      id="username"
@@ -505,6 +539,7 @@ export function Home() {
    - Add Lighthouse CI to GitHub Actions
 
 **Add to package.json:**
+
 ```json
 {
   "devDependencies": {
@@ -518,18 +553,20 @@ export function Home() {
 
 ### 7. Technical Documentation Structure ⭐ LOW PRIORITY
 
-| Feature | Matrix Academy | Station | Recommendation |
-|---------|---------------|---------|----------------|
-| **docs/ Directory** | ✅ Technical documentation | ❌ Not implemented | **CREATE** |
-| **API Documentation** | ✅ Swagger at /api/docs | ✅ Swagger at /api/docs | ✅ Already have |
+| Feature               | Matrix Academy             | Station                 | Recommendation  |
+| --------------------- | -------------------------- | ----------------------- | --------------- |
+| **docs/ Directory**   | ✅ Technical documentation | ❌ Not implemented      | **CREATE**      |
+| **API Documentation** | ✅ Swagger at /api/docs    | ✅ Swagger at /api/docs | ✅ Already have |
 
 **Why Station Needs This:**
+
 - Onboarding new developers
 - Documenting architectural decisions
 - Usage guides for API consumers
 - Contributing guidelines
 
 **Recommended Documentation Structure:**
+
 ```
 docs/
 ├── README.md                    # Documentation index
@@ -556,12 +593,13 @@ docs/
 
 ### 8. Test Coverage Tracking ⭐ LOW PRIORITY
 
-| Feature | Matrix Academy | Station | Recommendation |
-|---------|---------------|---------|----------------|
-| **CodeCov Integration** | ✅ Tracks coverage metrics | ❌ Not implemented | **ADD** |
-| **Coverage Badges** | ✅ In README | ❌ Not implemented | **ADD** |
+| Feature                 | Matrix Academy             | Station            | Recommendation |
+| ----------------------- | -------------------------- | ------------------ | -------------- |
+| **CodeCov Integration** | ✅ Tracks coverage metrics | ❌ Not implemented | **ADD**        |
+| **Coverage Badges**     | ✅ In README               | ❌ Not implemented | **ADD**        |
 
 **Why Station Needs This:**
+
 - Visibility into test coverage trends
 - PR feedback on coverage changes
 - Quality metrics tracking
@@ -569,6 +607,7 @@ docs/
 **Implementation:**
 
 1. **Add CodeCov to GitHub Actions:**
+
 ```yaml
 # .github/workflows/backend-ci.yml
 - name: Run tests with coverage
@@ -583,11 +622,13 @@ docs/
 ```
 
 2. **Add Coverage Badge to README:**
+
 ```markdown
 [![codecov](https://codecov.io/gh/GitAddRemote/station/branch/main/graph/badge.svg)](https://codecov.io/gh/GitAddRemote/station)
 ```
 
 3. **Configure Jest for Coverage:**
+
 ```json
 // backend/jest.config.js
 {
@@ -650,23 +691,27 @@ These features are not in either project but would be valuable for a production
 ## Implementation Priority Matrix
 
 ### Immediate (Sprint 1-2)
+
 1. ✅ Redis caching implementation
 2. ✅ Enhanced user profile fields (firstName, lastName, phone, bio)
 3. ✅ Protected Dashboard page
 
 ### Short-term (Sprint 3-4)
+
 4. ✅ Profile management page
 5. ✅ Organization detail pages
 6. ✅ Standardized error responses
 7. ✅ Enhanced landing page
 
 ### Medium-term (Sprint 5-8)
+
 8. ✅ Accessibility compliance (WCAG 2.1 AA)
 9. ✅ Technical documentation structure
 10. ✅ CodeCov integration
 11. ✅ Organization settings pages
 
 ### Long-term (Future)
+
 12. Email notification system
 13. Audit logging
 14. Organization invitation system
@@ -679,16 +724,19 @@ These features are not in either project but would be valuable for a production
 Matrix Academy demonstrates several production-ready patterns that Station should adopt:
 
 **Critical Additions:**
+
 - **Redis caching** will dramatically improve performance for frequently-accessed data
 - **Enhanced user profiles** provide essential member information for gaming guilds
 - **Protected dashboard/admin pages** complete the user experience loop
 
 **Quality Improvements:**
+
 - **Standardized API responses** improve developer experience
 - **Accessibility compliance** ensures inclusivity and legal compliance
 - **Enhanced landing page** improves user acquisition
 
 **Nice-to-Haves:**
+
 - **Technical documentation** aids onboarding
 - **Test coverage tracking** maintains quality standards
 
@@ -697,6 +745,7 @@ Station has excellent architectural foundations (multi-org support, flexible RBA
 ---
 
 **Next Steps:**
+
 1. Review this comparison with the team
 2. Prioritize features based on business goals
 3. Create implementation tickets for chosen features
diff --git a/frontend/.eslintrc.cjs b/frontend/.eslintrc.cjs
index 6466bbc..70a2bfd 100644
--- a/frontend/.eslintrc.cjs
+++ b/frontend/.eslintrc.cjs
@@ -14,5 +14,6 @@ module.exports = {
       'warn',
       { allowConstantExport: true },
     ],
+    '@typescript-eslint/no-explicit-any': 'error',
   },
 }
diff --git a/frontend/src/components/inventory/InventoryFiltersPanel.tsx b/frontend/src/components/inventory/InventoryFiltersPanel.tsx
index 8c80650..a9e2b33 100644
--- a/frontend/src/components/inventory/InventoryFiltersPanel.tsx
+++ b/frontend/src/components/inventory/InventoryFiltersPanel.tsx
@@ -102,7 +102,9 @@ export const InventoryFiltersPanel = ({
             value={filters.search}
             autoFocus={autoFocusSearch}
             disabled={disabled}
-            onChange={(e) => setFilters((prev) => ({ ...prev, search: e.target.value }))}
+            onChange={(e) =>
+              setFilters((prev) => ({ ...prev, search: e.target.value }))
+            }
           />
         </Grid>
         <Grid item xs={6} md={2}>
@@ -116,7 +118,8 @@ export const InventoryFiltersPanel = ({
               onChange={(e) =>
                 setFilters((prev) => ({
                   ...prev,
-                  categoryId: e.target.value === '' ? '' : Number(e.target.value),
+                  categoryId:
+                    e.target.value === '' ? '' : Number(e.target.value),
                 }))
               }
             >
@@ -142,7 +145,8 @@ export const InventoryFiltersPanel = ({
               onChange={(e) =>
                 setFilters((prev) => ({
                   ...prev,
-                  locationId: e.target.value === '' ? '' : Number(e.target.value),
+                  locationId:
+                    e.target.value === '' ? '' : Number(e.target.value),
                 }))
               }
             >
@@ -184,7 +188,9 @@ export const InventoryFiltersPanel = ({
             <Select
               labelId="org-selector-label"
               label="View"
-              value={viewMode === 'personal' ? 'personal' : selectedOrgId ?? ''}
+              value={
+                viewMode === 'personal' ? 'personal' : (selectedOrgId ?? '')
+              }
               disabled={disabled}
               onChange={(e) => {
                 const value = e.target.value;
@@ -216,29 +222,40 @@ export const InventoryFiltersPanel = ({
         </Grid>
       </Grid>
 
-      <Typography variant="body2" sx={{ display: 'flex', alignItems: 'center', gap: 1, mt: 3, mb: 1, color: '#9aa0a6' }}>
+      <Typography
+        variant="body2"
+        sx={{
+          display: 'flex',
+          alignItems: 'center',
+          gap: 1,
+          mt: 3,
+          mb: 1,
+          color: '#9aa0a6',
+        }}
+      >
         <ViewAgendaIcon fontSize="small" />
-        Showing {itemCount.toLocaleString()} of {totalCount.toLocaleString()} items
+        Showing {itemCount.toLocaleString()} of {totalCount.toLocaleString()}{' '}
+        items
       </Typography>
 
       <Grid container spacing={2} alignItems="center">
         <Grid item>
-            <FormControlLabel
-              control={
-                <Switch
-                  checked={filters.sharedOnly}
-                  onChange={(e) =>
-                    setFilters((prev) => ({
-                      ...prev,
-                      sharedOnly: e.target.checked,
-                    }))
-                  }
-                  size="small"
-                  disabled={disabled || viewMode === 'org'}
-                />
-              }
-              label="Shared only"
-            />
+          <FormControlLabel
+            control={
+              <Switch
+                checked={filters.sharedOnly}
+                onChange={(e) =>
+                  setFilters((prev) => ({
+                    ...prev,
+                    sharedOnly: e.target.checked,
+                  }))
+                }
+                size="small"
+                disabled={disabled || viewMode === 'org'}
+              />
+            }
+            label="Shared only"
+          />
         </Grid>
         <Grid item>
           <Button
@@ -246,7 +263,9 @@ export const InventoryFiltersPanel = ({
             variant="outlined"
             color="inherit"
             disabled={disabled}
-            onClick={() => setSortDir((dir) => (dir === 'asc' ? 'desc' : 'asc'))}
+            onClick={() =>
+              setSortDir((dir) => (dir === 'asc' ? 'desc' : 'asc'))
+            }
           >
             Sort: {sortBy} ({sortDir})
           </Button>
@@ -259,7 +278,11 @@ export const InventoryFiltersPanel = ({
               label="Sort By"
               value={sortBy}
               disabled={disabled}
-              onChange={(e) => setSortBy(e.target.value as 'name' | 'quantity' | 'location' | 'date')}
+              onChange={(e) =>
+                setSortBy(
+                  e.target.value as 'name' | 'quantity' | 'location' | 'date',
+                )
+              }
             >
               <MenuItem value="date">Last updated</MenuItem>
               <MenuItem value="name">Name</MenuItem>
@@ -276,7 +299,11 @@ export const InventoryFiltersPanel = ({
               label="Group By"
               value={groupBy}
               disabled={disabled}
-              onChange={(e) => setGroupBy(e.target.value as 'none' | 'category' | 'location' | 'share')}
+              onChange={(e) =>
+                setGroupBy(
+                  e.target.value as 'none' | 'category' | 'location' | 'share',
+                )
+              }
               startAdornment={<GroupWorkIcon sx={{ mr: 1 }} />}
             >
               <MenuItem value="none">No grouping</MenuItem>
@@ -313,7 +340,9 @@ export const InventoryFiltersPanel = ({
               label="View mode"
               value={density}
               disabled={disabled}
-              onChange={(e) => setDensity(e.target.value as 'standard' | 'compact')}
+              onChange={(e) =>
+                setDensity(e.target.value as 'standard' | 'compact')
+              }
             >
               <MenuItem value="standard">Standard</MenuItem>
               <MenuItem value="compact">Editor Mode</MenuItem>
@@ -322,7 +351,11 @@ export const InventoryFiltersPanel = ({
         </Grid>
         {showAddButton && (
           <Grid item>
-            <Button variant="contained" onClick={onOpenAddDialog} disabled={disabled}>
+            <Button
+              variant="contained"
+              onClick={onOpenAddDialog}
+              disabled={disabled}
+            >
               {addButtonLabel}
             </Button>
           </Grid>
diff --git a/frontend/src/components/inventory/InventoryInlineRow.tsx b/frontend/src/components/inventory/InventoryInlineRow.tsx
index 277db6e..d304972 100644
--- a/frontend/src/components/inventory/InventoryInlineRow.tsx
+++ b/frontend/src/components/inventory/InventoryInlineRow.tsx
@@ -13,7 +13,10 @@ import {
 import CheckIcon from '@mui/icons-material/Check';
 import MoreVertIcon from '@mui/icons-material/MoreVert';
 import EditIcon from '@mui/icons-material/Edit';
-import type { InventoryItem, OrgInventoryItem } from '../../services/inventory.service';
+import type {
+  InventoryItem,
+  OrgInventoryItem,
+} from '../../services/inventory.service';
 import type { FocusController } from '../../utils/focusController';
 import { useMemoizedLocations } from '../../hooks/useMemoizedLocations';
 
@@ -64,9 +67,16 @@ interface InventoryInlineRowProps {
     selectedName?: string,
   ) => void;
   onQuantityBlur: (rowKey: string) => void;
-  onActivateField: (rowKey: string, field: 'location' | 'quantity', initialInput?: string) => void;
+  onActivateField: (
+    rowKey: string,
+    field: 'location' | 'quantity',
+    initialInput?: string,
+  ) => void;
   onSave: (item: InventoryRecord) => void;
-  onOpenActions?: (event: MouseEvent<HTMLElement>, item: InventoryRecord) => void;
+  onOpenActions?: (
+    event: MouseEvent<HTMLElement>,
+    item: InventoryRecord,
+  ) => void;
   setLocationRef: (ref: HTMLInputElement | null, key: string) => void;
   setQuantityRef: (ref: HTMLInputElement | null, key: string) => void;
   setSaveRef: (ref: HTMLButtonElement | null, key: string) => void;
@@ -115,10 +125,9 @@ const InventoryInlineRow = ({
   }, [draftLocationId, locationNameById, item.locationName]);
 
   const draftQuantityNumber = Number(inlineDraft.quantity);
-  const displayQuantity =
-    Number.isFinite(draftQuantityNumber)
-      ? draftQuantityNumber
-      : Number(item.quantity);
+  const displayQuantity = Number.isFinite(draftQuantityNumber)
+    ? draftQuantityNumber
+    : Number(item.quantity);
 
   return (
     <Box
@@ -126,13 +135,18 @@ const InventoryInlineRow = ({
         display: 'grid',
         gridTemplateColumns: {
           xs: '1fr',
-          md: density === 'compact' ? '2fr 1fr 1fr 1fr auto' : '2fr 1fr 1fr 1fr auto',
+          md:
+            density === 'compact'
+              ? '2fr 1fr 1fr 1fr auto'
+              : '2fr 1fr 1fr 1fr auto',
         },
         gap: density === 'compact' ? 0.75 : 2,
         alignItems: 'center',
         px: density === 'compact' ? 1 : 2,
         py: density === 'compact' ? 0.45 : 1.5,
-        backgroundColor: isRowActive ? 'rgba(74, 158, 255, 0.08)' : 'transparent',
+        backgroundColor: isRowActive
+          ? 'rgba(74, 158, 255, 0.08)'
+          : 'transparent',
         '&:hover': {
           backgroundColor: isRowActive
             ? 'rgba(74, 158, 255, 0.12)'
@@ -199,7 +213,12 @@ const InventoryInlineRow = ({
                 onChange={(_, value) => {
                   onDraftChange(item.id, { locationId: value ? value.id : '' });
                   onLocationInputChange(rowKey, value?.name ?? '');
-                  onLocationBlur(rowKey, item.id, draftLocationId, value?.name ?? '');
+                  onLocationBlur(
+                    rowKey,
+                    item.id,
+                    draftLocationId,
+                    value?.name ?? '',
+                  );
                   onErrorChange(item.id, null);
                 }}
                 onInputChange={(_, value) => {
@@ -209,7 +228,12 @@ const InventoryInlineRow = ({
                   onLocationFocus(item.id);
                 }}
                 onBlur={() => {
-                  onLocationBlur(rowKey, item.id, draftLocationId, selectedLocation?.name ?? '');
+                  onLocationBlur(
+                    rowKey,
+                    item.id,
+                    draftLocationId,
+                    selectedLocation?.name ?? '',
+                  );
                 }}
                 renderOption={(props, option) => (
                   <li {...props} key={option.id}>
@@ -231,7 +255,12 @@ const InventoryInlineRow = ({
                         if (bestMatch) {
                           onDraftChange(item.id, { locationId: bestMatch.id });
                           onLocationInputChange(rowKey, bestMatch.name);
-                          onLocationBlur(rowKey, item.id, draftLocationId, bestMatch.name);
+                          onLocationBlur(
+                            rowKey,
+                            item.id,
+                            draftLocationId,
+                            bestMatch.name,
+                          );
                           onErrorChange(item.id, null);
                           focusController.focus(rowKey, 'quantity');
                         } else {
@@ -239,7 +268,10 @@ const InventoryInlineRow = ({
                         }
                       } else if (event.key === 'Escape') {
                         event.preventDefault();
-                        onLocationInputChange(rowKey, selectedLocation?.name ?? '');
+                        onLocationInputChange(
+                          rowKey,
+                          selectedLocation?.name ?? '',
+                        );
                         onLocationBlur(
                           rowKey,
                           item.id,
@@ -300,7 +332,9 @@ const InventoryInlineRow = ({
                 aria-label={`Edit location for ${item.itemName ?? `Item ${item.uexItemId}`}`}
               >
                 <Typography variant="body2" sx={{ fontWeight: 500 }}>
-                  {selectedLocation?.name || item.locationName || 'Select location'}
+                  {selectedLocation?.name ||
+                    item.locationName ||
+                    'Select location'}
                 </Typography>
                 <EditIcon
                   className="inline-edit-icon"
@@ -318,7 +352,10 @@ const InventoryInlineRow = ({
             <Typography variant="body2" color="text.secondary">
               Quantity
             </Typography>
-            <Typography variant="body2" sx={{ fontWeight: 700, letterSpacing: 0.1 }}>
+            <Typography
+              variant="body2"
+              sx={{ fontWeight: 700, letterSpacing: 0.1 }}
+            >
               {Number(item.quantity).toLocaleString()}
             </Typography>
           </>
@@ -345,7 +382,10 @@ const InventoryInlineRow = ({
                       quantity: Math.min(numeric, EDITOR_MODE_QUANTITY_MAX),
                     });
                   }
-                  if (!Number.isFinite(numeric) || numeric < MIN_INVENTORY_QUANTITY) {
+                  if (
+                    !Number.isFinite(numeric) ||
+                    numeric < MIN_INVENTORY_QUANTITY
+                  ) {
                     onErrorChange(item.id, 'Quantity must be at least 0.01');
                   } else {
                     onErrorChange(item.id, null);
@@ -365,7 +405,9 @@ const InventoryInlineRow = ({
                     focusController.focus(rowKey, 'save');
                   } else if (event.key === 'Escape') {
                     event.preventDefault();
-                    onDraftChange(item.id, { quantity: Number(item.quantity) || 0 });
+                    onDraftChange(item.id, {
+                      quantity: Number(item.quantity) || 0,
+                    });
                     onErrorChange(item.id, null);
                     onQuantityBlur(rowKey);
                   }
@@ -375,10 +417,11 @@ const InventoryInlineRow = ({
                   '& input': {
                     MozAppearance: 'textfield',
                   },
-                  '& input::-webkit-outer-spin-button, & input::-webkit-inner-spin-button': {
-                    WebkitAppearance: 'none',
-                    margin: 0,
-                  },
+                  '& input::-webkit-outer-spin-button, & input::-webkit-inner-spin-button':
+                    {
+                      WebkitAppearance: 'none',
+                      margin: 0,
+                    },
                 }}
               />
             ) : (
@@ -413,7 +456,10 @@ const InventoryInlineRow = ({
                 }}
                 aria-label={`Edit quantity for ${item.itemName ?? `Item ${item.uexItemId}`}`}
               >
-                <Typography variant="body2" sx={{ fontWeight: 700, letterSpacing: 0.1 }}>
+                <Typography
+                  variant="body2"
+                  sx={{ fontWeight: 700, letterSpacing: 0.1 }}
+                >
                   {displayQuantity.toLocaleString()}
                 </Typography>
                 <EditIcon
@@ -433,13 +479,16 @@ const InventoryInlineRow = ({
           </Typography>
         )}
         <Typography variant="body2">
-          {new Date(item.dateModified || item.dateAdded || '').toLocaleDateString()}
+          {new Date(
+            item.dateModified || item.dateAdded || '',
+          ).toLocaleDateString()}
         </Typography>
-        {Number.isFinite(draftQuantityNumber) && draftQuantityNumber >= EDITOR_MODE_QUANTITY_MAX && (
-          <Typography variant="caption" sx={{ color: 'warning.main' }}>
-            Large quantity entered - verify value.
-          </Typography>
-        )}
+        {Number.isFinite(draftQuantityNumber) &&
+          draftQuantityNumber >= EDITOR_MODE_QUANTITY_MAX && (
+            <Typography variant="caption" sx={{ color: 'warning.main' }}>
+              Large quantity entered - verify value.
+            </Typography>
+          )}
       </Stack>
       <Stack
         direction="row"
@@ -507,7 +556,10 @@ const InventoryInlineRow = ({
   );
 };
 
-const areEqual = (prev: InventoryInlineRowProps, next: InventoryInlineRowProps) =>
+const areEqual = (
+  prev: InventoryInlineRowProps,
+  next: InventoryInlineRowProps,
+) =>
   prev.item === next.item &&
   prev.density === next.density &&
   prev.allLocations === next.allLocations &&
diff --git a/frontend/src/components/inventory/InventoryNewRow.tsx b/frontend/src/components/inventory/InventoryNewRow.tsx
index 98e9f7c..80bd5b1 100644
--- a/frontend/src/components/inventory/InventoryNewRow.tsx
+++ b/frontend/src/components/inventory/InventoryNewRow.tsx
@@ -27,7 +27,11 @@ interface InventoryNewRowProps {
   locationEditing: boolean;
   selectedLocation: LocationOption | null;
   filteredLocations: LocationOption[];
-  draft: { itemId: number | ''; locationId: number | ''; quantity: number | '' };
+  draft: {
+    itemId: number | '';
+    locationId: number | '';
+    quantity: number | '';
+  };
   errors: {
     item?: string | null;
     location?: string | null;
@@ -166,7 +170,9 @@ export const InventoryNewRow = ({
           filterOptions={(options) => options}
           value={locationEditing ? null : selectedLocation}
           inputValue={
-            locationEditing ? locationInput : selectedLocation?.name ?? locationInput
+            locationEditing
+              ? locationInput
+              : (selectedLocation?.name ?? locationInput)
           }
           getOptionLabel={(option) => option?.name ?? ''}
           isOptionEqualToValue={(option, value) => option.id === value.id}
@@ -268,7 +274,11 @@ export const InventoryNewRow = ({
           />
         )}
         <Tooltip
-          title={orgBlocked ? 'Select an organization to save items in org view.' : ''}
+          title={
+            orgBlocked
+              ? 'Select an organization to save items in org view.'
+              : ''
+          }
           disableHoverListener={!orgBlocked}
         >
           <span>
diff --git a/frontend/src/components/inventory/InventoryPortlet.tsx b/frontend/src/components/inventory/InventoryPortlet.tsx
index 4b9b786..3d32858 100644
--- a/frontend/src/components/inventory/InventoryPortlet.tsx
+++ b/frontend/src/components/inventory/InventoryPortlet.tsx
@@ -92,9 +92,8 @@ const InventoryPortlet = ({ gameId = 1, onExpand }: InventoryPortletProps) => {
         categoryId: typeof categoryId === 'number' ? categoryId : undefined,
       };
 
-      const { items: fetchedItems, total } = await inventoryService.getInventory(
-        params,
-      );
+      const { items: fetchedItems, total } =
+        await inventoryService.getInventory(params);
 
       setItems(fetchedItems);
       setTotalCount(total ?? fetchedItems.length);
@@ -118,7 +117,9 @@ const InventoryPortlet = ({ gameId = 1, onExpand }: InventoryPortletProps) => {
     setPage(newPage);
   };
 
-  const handleChangeRowsPerPage = (event: React.ChangeEvent<HTMLInputElement>) => {
+  const handleChangeRowsPerPage = (
+    event: React.ChangeEvent<HTMLInputElement>,
+  ) => {
     setRowsPerPage(parseInt(event.target.value, 10));
     setPage(0);
   };
@@ -263,7 +264,11 @@ const InventoryPortlet = ({ gameId = 1, onExpand }: InventoryPortletProps) => {
                             variant="outlined"
                           />
                         ) : (
-                          <Chip label="Private" size="small" variant="outlined" />
+                          <Chip
+                            label="Private"
+                            size="small"
+                            variant="outlined"
+                          />
                         )}
                       </TableCell>
                     </TableRow>
diff --git a/frontend/src/components/location/SystemLocationSelector.tsx b/frontend/src/components/location/SystemLocationSelector.tsx
index 7bb8897..08b65e1 100644
--- a/frontend/src/components/location/SystemLocationSelector.tsx
+++ b/frontend/src/components/location/SystemLocationSelector.tsx
@@ -138,7 +138,9 @@ const SystemLocationSelector = ({
     const matching = locations
       .filter((location) => location.locationType !== 'star_system')
       .filter((location) => {
-        const hierarchy = location.hierarchyPath as Record<string, string> | undefined;
+        const hierarchy = location.hierarchyPath as
+          | Record<string, string>
+          | undefined;
         const system = hierarchy?.system?.toLowerCase() || '';
         if (systemName && system !== systemName) {
           return false;
@@ -189,9 +191,7 @@ const SystemLocationSelector = ({
         <Autocomplete
           fullWidth
           options={filteredSystems}
-          value={
-            systems.find((system) => system.id === value.systemId) || null
-          }
+          value={systems.find((system) => system.id === value.systemId) || null}
           getOptionLabel={(option) => option.name}
           onChange={(_, option) => {
             const systemId = option ? option.id : '';
diff --git a/frontend/src/index.tsx b/frontend/src/index.tsx
index cfc8dca..d841e3f 100644
--- a/frontend/src/index.tsx
+++ b/frontend/src/index.tsx
@@ -9,8 +9,8 @@ if (container) {
   root.render(
     <React.StrictMode>
       <App />
-    </React.StrictMode>
+    </React.StrictMode>,
   );
 } else {
-  console.error("Root container not found");
+  console.error('Root container not found');
 }
diff --git a/frontend/src/pages/Dashboard.tsx b/frontend/src/pages/Dashboard.tsx
index 8136235..4e5bace 100644
--- a/frontend/src/pages/Dashboard.tsx
+++ b/frontend/src/pages/Dashboard.tsx
@@ -260,7 +260,10 @@ const Dashboard = () => {
         </Grid>
 
         <Box sx={{ mt: 6 }}>
-          <Typography variant="h5" sx={{ mb: 3, fontWeight: 600, color: '#e8eaed' }}>
+          <Typography
+            variant="h5"
+            sx={{ mb: 3, fontWeight: 600, color: '#e8eaed' }}
+          >
             Quick Actions
           </Typography>
           <Grid container spacing={2}>
@@ -268,7 +271,9 @@ const Dashboard = () => {
               <Button
                 variant="contained"
                 startIcon={<GroupsIcon />}
-                onClick={() => alert('Create Organization feature coming soon!')}
+                onClick={() =>
+                  alert('Create Organization feature coming soon!')
+                }
               >
                 Create Organization
               </Button>
diff --git a/frontend/src/pages/Home.tsx b/frontend/src/pages/Home.tsx
index 0983289..2fecac5 100644
--- a/frontend/src/pages/Home.tsx
+++ b/frontend/src/pages/Home.tsx
@@ -63,7 +63,8 @@ const Home = () => {
           minHeight: '80vh',
           display: 'flex',
           alignItems: 'center',
-          background: 'linear-gradient(135deg, #1e2328 0%, #2a2f35 50%, #1e2328 100%)',
+          background:
+            'linear-gradient(135deg, #1e2328 0%, #2a2f35 50%, #1e2328 100%)',
           position: 'relative',
           overflow: 'hidden',
           '&::before': {
@@ -74,7 +75,8 @@ const Home = () => {
             transform: 'translate(-50%, -50%)',
             width: '600px',
             height: '600px',
-            background: 'radial-gradient(circle, rgba(74, 158, 255, 0.15) 0%, transparent 70%)',
+            background:
+              'radial-gradient(circle, rgba(74, 158, 255, 0.15) 0%, transparent 70%)',
             filter: 'blur(80px)',
             animation: 'pulse 4s ease-in-out infinite',
           },
@@ -98,7 +100,8 @@ const Home = () => {
                 fontSize: { xs: '2.5rem', md: '4rem' },
                 fontWeight: 800,
                 mb: 3,
-                background: 'linear-gradient(135deg, #7ABDFF 0%, #4A9EFF 50%, #2563EB 100%)',
+                background:
+                  'linear-gradient(135deg, #7ABDFF 0%, #4A9EFF 50%, #2563EB 100%)',
                 WebkitBackgroundClip: 'text',
                 WebkitTextFillColor: 'transparent',
                 textShadow: '0 0 40px rgba(74, 158, 255, 0.3)',
@@ -214,8 +217,8 @@ const Home = () => {
                   Multi-Organization Support
                 </Typography>
                 <Typography sx={{ color: '#9aa0a6', lineHeight: 1.7 }}>
-                  Manage multiple guilds from one account with separate roles and
-                  permissions for each organization.
+                  Manage multiple guilds from one account with separate roles
+                  and permissions for each organization.
                 </Typography>
               </CardContent>
             </Card>
@@ -247,8 +250,8 @@ const Home = () => {
                   Advanced Permissions
                 </Typography>
                 <Typography sx={{ color: '#9aa0a6', lineHeight: 1.7 }}>
-                  Fine-grained role-based access control with flexible permission
-                  sets for every organization and member.
+                  Fine-grained role-based access control with flexible
+                  permission sets for every organization and member.
                 </Typography>
               </CardContent>
             </Card>
@@ -340,7 +343,9 @@ const Home = () => {
                     mb: 3,
                   }}
                 >
-                  <AdminPanelSettingsIcon sx={{ fontSize: 40, color: '#4A9EFF' }} />
+                  <AdminPanelSettingsIcon
+                    sx={{ fontSize: 40, color: '#4A9EFF' }}
+                  />
                 </Box>
                 <Typography variant="h5" sx={{ mb: 2, fontWeight: 600 }}>
                   Member Profiles
@@ -379,8 +384,8 @@ const Home = () => {
                   Secure & Reliable
                 </Typography>
                 <Typography sx={{ color: '#9aa0a6', lineHeight: 1.7 }}>
-                  JWT authentication with refresh tokens, bcrypt password hashing,
-                  and comprehensive security measures.
+                  JWT authentication with refresh tokens, bcrypt password
+                  hashing, and comprehensive security measures.
                 </Typography>
               </CardContent>
             </Card>
@@ -416,7 +421,8 @@ const Home = () => {
                 color: 'rgba(255, 255, 255, 0.9)',
               }}
             >
-              Join thousands of gaming organizations using Station to manage their teams
+              Join thousands of gaming organizations using Station to manage
+              their teams
             </Typography>
             <Button
               component={Link}
diff --git a/frontend/src/pages/Inventory.editor-mode.test.tsx b/frontend/src/pages/Inventory.editor-mode.test.tsx
index e50c23f..c4b9a64 100644
--- a/frontend/src/pages/Inventory.editor-mode.test.tsx
+++ b/frontend/src/pages/Inventory.editor-mode.test.tsx
@@ -18,7 +18,8 @@ const mockGetUserPermissions = jest.fn();
 jest.mock('../services/inventory.service', () => ({
   inventoryService: {
     getCategories: jest.fn().mockResolvedValue([]),
-    getUserOrganizations: (...args: unknown[]) => mockGetUserOrganizations(...args),
+    getUserOrganizations: (...args: unknown[]) =>
+      mockGetUserOrganizations(...args),
     getInventory: (...args: unknown[]) => mockGetInventory(...args),
     getOrgInventory: (...args: unknown[]) => mockGetOrgInventory(...args),
     updateItem: (...args: unknown[]) => mockUpdateItem(...args),
@@ -75,7 +76,9 @@ jest.mock('../hooks/useMemoizedLocations', () => {
   const original = jest.requireActual('../hooks/useMemoizedLocations');
   return {
     ...original,
-    useMemoizedLocations: jest.fn((...args: unknown[]) => original.useMemoizedLocations(...args)),
+    useMemoizedLocations: jest.fn((...args: unknown[]) =>
+      original.useMemoizedLocations(...args),
+    ),
   };
 });
 const mockItem = {
@@ -98,8 +101,18 @@ const mockItem = {
 describe('Inventory editor mode inline controls', () => {
   beforeEach(() => {
     jest.resetAllMocks();
-    mockGetInventory.mockResolvedValue({ items: [mockItem], total: 1, limit: 25, offset: 0 });
-    mockGetOrgInventory.mockResolvedValue({ items: [mockItem], total: 1, limit: 25, offset: 0 });
+    mockGetInventory.mockResolvedValue({
+      items: [mockItem],
+      total: 1,
+      limit: 25,
+      offset: 0,
+    });
+    mockGetOrgInventory.mockResolvedValue({
+      items: [mockItem],
+      total: 1,
+      limit: 25,
+      offset: 0,
+    });
     mockGetUserOrganizations.mockResolvedValue([]);
     mockUpdateItem.mockResolvedValue({});
     mockUpdateOrgItem.mockResolvedValue({});
@@ -118,7 +131,9 @@ describe('Inventory editor mode inline controls', () => {
       offset: 0,
     });
     mockGetUserPermissions.mockResolvedValue(['can_edit_org_inventory']);
-    const mockedLocationCache = locationCache as jest.Mocked<typeof locationCache>;
+    const mockedLocationCache = locationCache as jest.Mocked<
+      typeof locationCache
+    >;
     const mockLocations: LocationRecord[] = [
       {
         id: '200',
@@ -164,7 +179,9 @@ describe('Inventory editor mode inline controls', () => {
       </MemoryRouter>,
     );
 
-    await waitFor(() => expect(screen.getByText('Test Item')).toBeInTheDocument());
+    await waitFor(() =>
+      expect(screen.getByText('Test Item')).toBeInTheDocument(),
+    );
 
     const viewModeSelect = screen.getByLabelText('View mode');
     fireEvent.mouseDown(viewModeSelect);
@@ -191,7 +208,9 @@ describe('Inventory editor mode inline controls', () => {
       </MemoryRouter>,
     );
 
-    await waitFor(() => expect(screen.getByText('Test Item')).toBeInTheDocument());
+    await waitFor(() =>
+      expect(screen.getByText('Test Item')).toBeInTheDocument(),
+    );
 
     const viewModeSelect = screen.getByLabelText('View mode');
     fireEvent.mouseDown(viewModeSelect);
@@ -242,7 +261,9 @@ describe('Inventory editor mode inline controls', () => {
       </MemoryRouter>,
     );
 
-    await waitFor(() => expect(screen.getByText('Test Item')).toBeInTheDocument());
+    await waitFor(() =>
+      expect(screen.getByText('Test Item')).toBeInTheDocument(),
+    );
 
     const viewSelect = screen.getByLabelText('View');
     fireEvent.mouseDown(viewSelect);
@@ -285,7 +306,9 @@ describe('Inventory editor mode inline controls', () => {
       </MemoryRouter>,
     );
 
-    await waitFor(() => expect(screen.getByText('Test Item')).toBeInTheDocument());
+    await waitFor(() =>
+      expect(screen.getByText('Test Item')).toBeInTheDocument(),
+    );
 
     const viewSelect = screen.getByLabelText('View');
     fireEvent.mouseDown(viewSelect);
@@ -301,7 +324,9 @@ describe('Inventory editor mode inline controls', () => {
     fireEvent.mouseDown(viewSelect);
     const listbox = await screen.findByRole('presentation');
     const options = Array.from(listbox.querySelectorAll('[role="option"]'));
-    const maybeOrgOption = options.find((opt) => opt.textContent && opt.textContent !== 'My Inventory');
+    const maybeOrgOption = options.find(
+      (opt) => opt.textContent && opt.textContent !== 'My Inventory',
+    );
     if (maybeOrgOption) {
       fireEvent.click(maybeOrgOption);
     }
@@ -326,7 +351,9 @@ describe('Inventory editor mode inline controls', () => {
       </MemoryRouter>,
     );
 
-    await waitFor(() => expect(screen.getByText('Test Item')).toBeInTheDocument());
+    await waitFor(() =>
+      expect(screen.getByText('Test Item')).toBeInTheDocument(),
+    );
 
     const viewModeSelect = screen.getByLabelText('View mode');
     fireEvent.mouseDown(viewModeSelect);
@@ -336,7 +363,9 @@ describe('Inventory editor mode inline controls', () => {
     const saveButton = await screen.findByTestId('new-row-save');
     fireEvent.click(saveButton);
 
-    await waitFor(() => expect(screen.getByText('Select an item')).toBeInTheDocument());
+    await waitFor(() =>
+      expect(screen.getByText('Select an item')).toBeInTheDocument(),
+    );
     const itemInput = await screen.findByTestId('new-row-item-input');
     await waitFor(() => expect(document.activeElement).toBe(itemInput));
   });
@@ -348,7 +377,9 @@ describe('Inventory editor mode inline controls', () => {
       </MemoryRouter>,
     );
 
-    await waitFor(() => expect(screen.getByText('Test Item')).toBeInTheDocument());
+    await waitFor(() =>
+      expect(screen.getByText('Test Item')).toBeInTheDocument(),
+    );
     const viewModeSelect = screen.getByLabelText('View mode');
     fireEvent.mouseDown(viewModeSelect);
     const editorOption = await screen.findByText('Editor Mode');
@@ -368,7 +399,9 @@ describe('Inventory editor mode inline controls', () => {
     fireEvent.click(saveButton);
 
     expect(mockCreateItem).not.toHaveBeenCalled();
-    expect(screen.getByText('Quantity must be at least 0.01')).toBeInTheDocument();
+    expect(
+      screen.getByText('Quantity must be at least 0.01'),
+    ).toBeInTheDocument();
   });
 
   it('keeps the row dirty and shows retry on API failure', async () => {
@@ -380,13 +413,17 @@ describe('Inventory editor mode inline controls', () => {
       </MemoryRouter>,
     );
 
-    await waitFor(() => expect(screen.getByText('Test Item')).toBeInTheDocument());
+    await waitFor(() =>
+      expect(screen.getByText('Test Item')).toBeInTheDocument(),
+    );
     const viewModeSelect = screen.getByLabelText('View mode');
     fireEvent.mouseDown(viewModeSelect);
     const editorOption = await screen.findByText('Editor Mode');
     fireEvent.click(editorOption);
 
-    fireEvent.change(await screen.findByTestId('new-row-item-input'), { target: { value: 'New' } });
+    fireEvent.change(await screen.findByTestId('new-row-item-input'), {
+      target: { value: 'New' },
+    });
     fireEvent.click(await screen.findByText('New Catalog Item'));
 
     const locationInput = await screen.findByTestId('new-row-location-input');
@@ -399,9 +436,13 @@ describe('Inventory editor mode inline controls', () => {
     fireEvent.click(screen.getByTestId('new-row-save'));
 
     await waitFor(() =>
-      expect(screen.getByText('Unable to add item. Please try again.')).toBeInTheDocument(),
+      expect(
+        screen.getByText('Unable to add item. Please try again.'),
+      ).toBeInTheDocument(),
     );
-    expect((screen.getByTestId('new-row-quantity') as HTMLInputElement).value).toBe('7');
+    expect(
+      (screen.getByTestId('new-row-quantity') as HTMLInputElement).value,
+    ).toBe('7');
     const retryButton = screen.getByTestId('new-row-retry');
     fireEvent.click(retryButton);
     await waitFor(() => expect(mockCreateItem).toHaveBeenCalledTimes(2));
@@ -414,7 +455,9 @@ describe('Inventory editor mode inline controls', () => {
       </MemoryRouter>,
     );
 
-    await waitFor(() => expect(screen.getByText('Test Item')).toBeInTheDocument());
+    await waitFor(() =>
+      expect(screen.getByText('Test Item')).toBeInTheDocument(),
+    );
     const viewModeSelect = screen.getByLabelText('View mode');
     fireEvent.mouseDown(viewModeSelect);
     const editorOption = await screen.findByText('Editor Mode');
@@ -450,7 +493,9 @@ describe('Inventory editor mode inline controls', () => {
       </MemoryRouter>,
     );
 
-    await waitFor(() => expect(screen.getByText('Test Item')).toBeInTheDocument());
+    await waitFor(() =>
+      expect(screen.getByText('Test Item')).toBeInTheDocument(),
+    );
 
     const viewSelect = screen.getByLabelText('View');
     fireEvent.mouseDown(viewSelect);
@@ -458,10 +503,14 @@ describe('Inventory editor mode inline controls', () => {
 
     await waitFor(() =>
       expect(
-        screen.getByText('You do not have permission to add items to this organization.'),
+        screen.getByText(
+          'You do not have permission to add items to this organization.',
+        ),
       ).toBeInTheDocument(),
     );
-    expect(screen.queryByRole('button', { name: 'Add org item' })).not.toBeInTheDocument();
+    expect(
+      screen.queryByRole('button', { name: 'Add org item' }),
+    ).not.toBeInTheDocument();
   });
 
   it('handles org add conflicts by loading the existing item and merging quantities', async () => {
@@ -477,7 +526,12 @@ describe('Inventory editor mode inline controls', () => {
     ]);
     mockGetUserPermissions.mockResolvedValue(['can_edit_org_inventory']);
     mockGetOrgInventory
-      .mockResolvedValueOnce({ items: [mockItem], total: 1, limit: 25, offset: 0 })
+      .mockResolvedValueOnce({
+        items: [mockItem],
+        total: 1,
+        limit: 25,
+        offset: 0,
+      })
       .mockResolvedValueOnce({
         items: [
           {
@@ -508,13 +562,17 @@ describe('Inventory editor mode inline controls', () => {
       </MemoryRouter>,
     );
 
-    await waitFor(() => expect(screen.getByText('Test Item')).toBeInTheDocument());
+    await waitFor(() =>
+      expect(screen.getByText('Test Item')).toBeInTheDocument(),
+    );
 
     const viewSelect = screen.getByLabelText('View');
     fireEvent.mouseDown(viewSelect);
     fireEvent.click(await screen.findByText('Test Org'));
 
-    const addButton = await screen.findByRole('button', { name: 'Add org item' });
+    const addButton = await screen.findByRole('button', {
+      name: 'Add org item',
+    });
     fireEvent.click(addButton);
 
     fireEvent.click(await screen.findByText('New Catalog Item'));
@@ -539,7 +597,9 @@ describe('Inventory editor mode inline controls', () => {
       </MemoryRouter>,
     );
 
-    await waitFor(() => expect(screen.getByText('Test Item')).toBeInTheDocument());
+    await waitFor(() =>
+      expect(screen.getByText('Test Item')).toBeInTheDocument(),
+    );
 
     const viewModeSelect = screen.getByLabelText('View mode');
     fireEvent.mouseDown(viewModeSelect);
@@ -550,7 +610,9 @@ describe('Inventory editor mode inline controls', () => {
     fireEvent.click(saveButton);
 
     await waitFor(() =>
-      expect(screen.getByText('Unable to save. Please try again.')).toBeInTheDocument(),
+      expect(
+        screen.getByText('Unable to save. Please try again.'),
+      ).toBeInTheDocument(),
     );
     await waitFor(() => expect(document.activeElement).toBe(saveButton));
   });
@@ -562,7 +624,9 @@ describe('Inventory editor mode inline controls', () => {
       </MemoryRouter>,
     );
 
-    await waitFor(() => expect(screen.getByText('Test Item')).toBeInTheDocument());
+    await waitFor(() =>
+      expect(screen.getByText('Test Item')).toBeInTheDocument(),
+    );
 
     const viewModeSelect = screen.getByLabelText('View mode');
     fireEvent.mouseDown(viewModeSelect);
@@ -585,7 +649,9 @@ describe('Inventory editor mode inline controls', () => {
     await waitFor(() => expect(mockCreateItem).toHaveBeenCalled());
     const refreshedItemInput = await screen.findByTestId('new-row-item-input');
     expect((refreshedItemInput as HTMLInputElement).value).toBe('');
-    await waitFor(() => expect(document.activeElement).toBe(refreshedItemInput));
+    await waitFor(() =>
+      expect(document.activeElement).toBe(refreshedItemInput),
+    );
   });
 
   it('moves focus to save when pressing Enter on quantity', async () => {
@@ -595,7 +661,9 @@ describe('Inventory editor mode inline controls', () => {
       </MemoryRouter>,
     );
 
-    await waitFor(() => expect(screen.getByText('Test Item')).toBeInTheDocument());
+    await waitFor(() =>
+      expect(screen.getByText('Test Item')).toBeInTheDocument(),
+    );
     const viewModeSelect = screen.getByLabelText('View mode');
     fireEvent.mouseDown(viewModeSelect);
     const editorOption = await screen.findByText('Editor Mode');
@@ -616,7 +684,9 @@ describe('Inventory editor mode inline controls', () => {
       </MemoryRouter>,
     );
 
-    await waitFor(() => expect(screen.getByText('Test Item')).toBeInTheDocument());
+    await waitFor(() =>
+      expect(screen.getByText('Test Item')).toBeInTheDocument(),
+    );
     const viewModeSelect = screen.getByLabelText('View mode');
     fireEvent.mouseDown(viewModeSelect);
     const editorOption = await screen.findByText('Editor Mode');
@@ -628,7 +698,9 @@ describe('Inventory editor mode inline controls', () => {
 
     await user.type(locationInput, 'Al');
 
-    await waitFor(() => expect(screen.queryByText('Beta Port')).not.toBeInTheDocument());
+    await waitFor(() =>
+      expect(screen.queryByText('Beta Port')).not.toBeInTheDocument(),
+    );
   });
 
   it('selects a location via keyboard navigation in the new row combobox', async () => {
@@ -639,7 +711,9 @@ describe('Inventory editor mode inline controls', () => {
       </MemoryRouter>,
     );
 
-    await waitFor(() => expect(screen.getByText('Test Item')).toBeInTheDocument());
+    await waitFor(() =>
+      expect(screen.getByText('Test Item')).toBeInTheDocument(),
+    );
     const viewModeSelect = screen.getByLabelText('View mode');
     fireEvent.mouseDown(viewModeSelect);
     const editorOption = await screen.findByText('Editor Mode');
@@ -660,7 +734,9 @@ describe('Inventory editor mode inline controls', () => {
       </MemoryRouter>,
     );
 
-    await waitFor(() => expect(screen.getByText('Test Item')).toBeInTheDocument());
+    await waitFor(() =>
+      expect(screen.getByText('Test Item')).toBeInTheDocument(),
+    );
     const viewModeSelect = screen.getByLabelText('View mode');
     fireEvent.mouseDown(viewModeSelect);
     const editorOption = await screen.findByText('Editor Mode');
@@ -674,16 +750,22 @@ describe('Inventory editor mode inline controls', () => {
     await user.click(locationInput);
     await user.type(locationInput, 'Nowhere');
 
-    await waitFor(() => expect(screen.queryByText('Beta Port')).not.toBeInTheDocument());
+    await waitFor(() =>
+      expect(screen.queryByText('Beta Port')).not.toBeInTheDocument(),
+    );
     await user.keyboard('{Enter}');
 
-    await waitFor(() => expect(screen.getByText('No matches found')).toBeInTheDocument());
+    await waitFor(() =>
+      expect(screen.getByText('No matches found')).toBeInTheDocument(),
+    );
 
     const quantityInput = await screen.findByTestId('new-row-quantity');
     await user.type(quantityInput, '4');
     await user.click(screen.getByTestId('new-row-save'));
 
-    await waitFor(() => expect(screen.getByText('Select a valid location')).toBeInTheDocument());
+    await waitFor(() =>
+      expect(screen.getByText('Select a valid location')).toBeInTheDocument(),
+    );
     expect(mockCreateItem).not.toHaveBeenCalled();
   });
 
@@ -694,7 +776,9 @@ describe('Inventory editor mode inline controls', () => {
       </MemoryRouter>,
     );
 
-    await waitFor(() => expect(screen.getByText('Test Item')).toBeInTheDocument());
+    await waitFor(() =>
+      expect(screen.getByText('Test Item')).toBeInTheDocument(),
+    );
     const viewModeSelect = screen.getByLabelText('View mode');
     fireEvent.mouseDown(viewModeSelect);
     const editorOption = await screen.findByText('Editor Mode');
@@ -702,7 +786,9 @@ describe('Inventory editor mode inline controls', () => {
 
     const quantityInput = await screen.findByTestId('new-row-quantity');
     fireEvent.change(quantityInput, { target: { value: '100000' } });
-    expect(screen.getByText('Large quantity entered - verify value.')).toBeInTheDocument();
+    expect(
+      screen.getByText('Large quantity entered - verify value.'),
+    ).toBeInTheDocument();
 
     fireEvent.change(quantityInput, { target: { value: '1000000' } });
     expect(quantityInput).toHaveValue('100000');
@@ -730,7 +816,9 @@ describe('Inventory editor mode inline controls', () => {
       </MemoryRouter>,
     );
 
-    await waitFor(() => expect(screen.getByText('Test Item')).toBeInTheDocument());
+    await waitFor(() =>
+      expect(screen.getByText('Test Item')).toBeInTheDocument(),
+    );
     const viewModeSelect = screen.getByLabelText('View mode');
     fireEvent.mouseDown(viewModeSelect);
     const editorOption = await screen.findByText('Editor Mode');
@@ -748,7 +836,9 @@ describe('Inventory editor mode inline controls', () => {
     await waitFor(() => expect(document.activeElement).toBe(saveButton));
 
     await user.keyboard('{Enter}');
-    const nextLocationInput = await screen.findByTestId('inline-location-item-2');
+    const nextLocationInput = await screen.findByTestId(
+      'inline-location-item-2',
+    );
     await waitFor(() => expect(document.activeElement).toBe(nextLocationInput));
   });
 
@@ -761,22 +851,24 @@ describe('Inventory editor mode inline controls', () => {
       locationId: 201,
       locationName: 'Alpha Base',
     };
-    mockGetInventory.mockImplementation((params?: { offset?: number; limit?: number }) => {
-      if (params?.offset === 25) {
+    mockGetInventory.mockImplementation(
+      (params?: { offset?: number; limit?: number }) => {
+        if (params?.offset === 25) {
+          return Promise.resolve({
+            items: [pageTwoItem],
+            total: 26,
+            limit: 25,
+            offset: 25,
+          });
+        }
         return Promise.resolve({
-          items: [pageTwoItem],
+          items: [mockItem],
           total: 26,
           limit: 25,
-          offset: 25,
+          offset: 0,
         });
-      }
-      return Promise.resolve({
-        items: [mockItem],
-        total: 26,
-        limit: 25,
-        offset: 0,
-      });
-    });
+      },
+    );
 
     render(
       <MemoryRouter initialEntries={['/inventory']}>
@@ -784,7 +876,9 @@ describe('Inventory editor mode inline controls', () => {
       </MemoryRouter>,
     );
 
-    await waitFor(() => expect(screen.getByText('Test Item')).toBeInTheDocument());
+    await waitFor(() =>
+      expect(screen.getByText('Test Item')).toBeInTheDocument(),
+    );
     const viewModeSelect = screen.getByLabelText('View mode');
     fireEvent.mouseDown(viewModeSelect);
     const editorOption = await screen.findByText('Editor Mode');
@@ -793,7 +887,9 @@ describe('Inventory editor mode inline controls', () => {
     const saveButton = await screen.findByTestId('inline-save-item-1');
     await user.click(saveButton);
 
-    const nextLocationInput = await screen.findByTestId('inline-location-item-2');
+    const nextLocationInput = await screen.findByTestId(
+      'inline-location-item-2',
+    );
     await waitFor(() => expect(document.activeElement).toBe(nextLocationInput));
   });
 
@@ -805,7 +901,9 @@ describe('Inventory editor mode inline controls', () => {
       </MemoryRouter>,
     );
 
-    await waitFor(() => expect(screen.getByText('Test Item')).toBeInTheDocument());
+    await waitFor(() =>
+      expect(screen.getByText('Test Item')).toBeInTheDocument(),
+    );
     const viewModeSelect = screen.getByLabelText('View mode');
     fireEvent.mouseDown(viewModeSelect);
     const editorOption = await screen.findByText('Editor Mode');
@@ -818,17 +916,25 @@ describe('Inventory editor mode inline controls', () => {
     itemInput.focus();
 
     await user.tab();
-    expect(document.activeElement).toBe(await screen.findByTestId('new-row-location-input'));
+    expect(document.activeElement).toBe(
+      await screen.findByTestId('new-row-location-input'),
+    );
 
     await user.tab();
-    expect(document.activeElement).toBe(await screen.findByTestId('new-row-quantity'));
+    expect(document.activeElement).toBe(
+      await screen.findByTestId('new-row-quantity'),
+    );
 
     await user.tab();
-    expect(document.activeElement).toBe(await screen.findByTestId('new-row-save'));
+    expect(document.activeElement).toBe(
+      await screen.findByTestId('new-row-save'),
+    );
   });
 
   it('memoizes location filtering for inline rows', () => {
-    const { useMemoizedLocations: mockedHook } = jest.requireMock('../hooks/useMemoizedLocations');
+    const { useMemoizedLocations: mockedHook } = jest.requireMock(
+      '../hooks/useMemoizedLocations',
+    );
     render(
       <MemoryRouter initialEntries={['/inventory']}>
         <InventoryPage />
diff --git a/frontend/src/pages/Inventory.tsx b/frontend/src/pages/Inventory.tsx
index 26cb996..ee1be75 100644
--- a/frontend/src/pages/Inventory.tsx
+++ b/frontend/src/pages/Inventory.tsx
@@ -1,4 +1,12 @@
-import { Suspense, lazy, useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import {
+  Suspense,
+  lazy,
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from 'react';
 import type { KeyboardEvent } from 'react';
 import { useNavigate } from 'react-router-dom';
 import {
@@ -46,7 +54,12 @@ import ShareIcon from '@mui/icons-material/Share';
 import UnpublishedIcon from '@mui/icons-material/Unpublished';
 import ViewAgendaIcon from '@mui/icons-material/ViewAgenda';
 import BusinessIcon from '@mui/icons-material/Business';
-import { inventoryService, InventoryCategory, InventoryItem, OrgInventoryItem } from '../services/inventory.service';
+import {
+  inventoryService,
+  InventoryCategory,
+  InventoryItem,
+  OrgInventoryItem,
+} from '../services/inventory.service';
 import { uexService, CatalogItem } from '../services/uex.service';
 import { locationCache } from '../services/locationCache';
 import type { SystemLocationValue } from '../components/location/SystemLocationSelector';
@@ -55,7 +68,10 @@ import { useFocusController } from '../hooks/useFocusController';
 import InventoryInlineRow from '../components/inventory/InventoryInlineRow';
 import InventoryNewRow from '../components/inventory/InventoryNewRow';
 import InventoryFiltersPanel from '../components/inventory/InventoryFiltersPanel';
-import { OrgPermission, permissionsService } from '../services/permissions.service';
+import {
+  OrgPermission,
+  permissionsService,
+} from '../services/permissions.service';
 
 type InventoryRecord = InventoryItem | OrgInventoryItem;
 type ActionMode = 'edit' | 'split' | 'share' | 'delete' | null;
@@ -98,7 +114,9 @@ const readStoredDensity = (): 'standard' | 'compact' => {
 
 const valueText = (value: number) => `${value.toLocaleString()} qty`;
 
-const LazySystemLocationSelector = lazy(() => import('../components/location/SystemLocationSelector'));
+const LazySystemLocationSelector = lazy(
+  () => import('../components/location/SystemLocationSelector'),
+);
 
 const InventoryPage = () => {
   const navigate = useNavigate();
@@ -106,10 +124,18 @@ const InventoryPage = () => {
   const firstCatalogItemRef = useRef<HTMLDivElement | null>(null);
   const catalogItemRefs = useRef<Array<HTMLDivElement | null>>([]);
   const systemSelectRef = useRef<HTMLInputElement | null>(null);
-  const [user, setUser] = useState<{ userId: number; username: string } | null>(null);
-  const [orgOptions, setOrgOptions] = useState<{ id: number; name: string }[]>([]);
-  const [selectedOrgId, setSelectedOrgId] = useState<number | null>(() => readStoredOrgId());
-  const [viewMode, setViewMode] = useState<'personal' | 'org'>(() => readStoredViewMode());
+  const [user, setUser] = useState<{ userId: number; username: string } | null>(
+    null,
+  );
+  const [orgOptions, setOrgOptions] = useState<{ id: number; name: string }[]>(
+    [],
+  );
+  const [selectedOrgId, setSelectedOrgId] = useState<number | null>(() =>
+    readStoredOrgId(),
+  );
+  const [viewMode, setViewMode] = useState<'personal' | 'org'>(() =>
+    readStoredViewMode(),
+  );
   const [categories, setCategories] = useState<InventoryCategory[]>([]);
   const [items, setItems] = useState<InventoryRecord[]>([]);
   const [totalCount, setTotalCount] = useState(0);
@@ -131,17 +157,21 @@ const InventoryPage = () => {
   const [catalogRowsPerPage, setCatalogRowsPerPage] = useState(25);
   const [catalogLoading, setCatalogLoading] = useState(false);
   const [catalogError, setCatalogError] = useState<string | null>(null);
-  const [selectedCatalogItem, setSelectedCatalogItem] = useState<CatalogItem | null>(null);
-  const [destinationSelection, setDestinationSelection] = useState<SystemLocationValue>({
-    systemId: '',
-    locationId: '',
-  });
+  const [selectedCatalogItem, setSelectedCatalogItem] =
+    useState<CatalogItem | null>(null);
+  const [destinationSelection, setDestinationSelection] =
+    useState<SystemLocationValue>({
+      systemId: '',
+      locationId: '',
+    });
   const [newItemQuantity, setNewItemQuantity] = useState<number>(1);
   const [newItemNotes, setNewItemNotes] = useState('');
   const [addSubmitting, setAddSubmitting] = useState(false);
   const [orgPermissions, setOrgPermissions] = useState<OrgPermission[]>([]);
   const [orgPermissionsLoading, setOrgPermissionsLoading] = useState(false);
-  const [orgPermissionsError, setOrgPermissionsError] = useState<string | null>(null);
+  const [orgPermissionsError, setOrgPermissionsError] = useState<string | null>(
+    null,
+  );
 
   const [filters, setFilters] = useState({
     search: '',
@@ -150,29 +180,42 @@ const InventoryPage = () => {
     sharedOnly: false,
     valueRange: [0, 100000] as [number, number],
   });
-  const [sortBy, setSortBy] = useState<'name' | 'quantity' | 'location' | 'date'>('date');
+  const [sortBy, setSortBy] = useState<
+    'name' | 'quantity' | 'location' | 'date'
+  >('date');
   const [sortDir, setSortDir] = useState<'asc' | 'desc'>('desc');
-  const [groupBy, setGroupBy] = useState<'none' | 'category' | 'location' | 'share'>('none');
+  const [groupBy, setGroupBy] = useState<
+    'none' | 'category' | 'location' | 'share'
+  >('none');
   const [page, setPage] = useState(0);
   const [rowsPerPage, setRowsPerPage] = useState(25);
-  const [density, setDensity] = useState<'standard' | 'compact'>(() => readStoredDensity());
+  const [density, setDensity] = useState<'standard' | 'compact'>(() =>
+    readStoredDensity(),
+  );
   const [inlineDrafts, setInlineDrafts] = useState<Record<string, InlineDraft>>(
     {},
   );
   const [inlineSaving, setInlineSaving] = useState<Set<string>>(new Set());
   const [inlineSaved, setInlineSaved] = useState<Set<string>>(new Set());
-  const [inlineError, setInlineError] = useState<Record<string, string | null>>({});
-  const [allLocations, setAllLocations] = useState<{ id: number; name: string }[]>([]);
+  const [inlineError, setInlineError] = useState<Record<string, string | null>>(
+    {},
+  );
+  const [allLocations, setAllLocations] = useState<
+    { id: number; name: string }[]
+  >([]);
   const locationNameById = useMemo(
     () => new Map(allLocations.map((loc) => [loc.id, loc.name])),
     [allLocations],
   );
-  const [inlineLocationInputs, setInlineLocationInputs] = useState<Record<string, string>>({});
+  const [inlineLocationInputs, setInlineLocationInputs] = useState<
+    Record<string, string>
+  >({});
   const [inlineActiveField, setInlineActiveField] = useState<{
     rowKey: string;
     field: 'location' | 'quantity';
   } | null>(null);
-  const [pendingFocusAfterPageChange, setPendingFocusAfterPageChange] = useState(false);
+  const [pendingFocusAfterPageChange, setPendingFocusAfterPageChange] =
+    useState(false);
   const [newRowDraft, setNewRowDraft] = useState<{
     itemId: number | '';
     locationId: number | '';
@@ -182,7 +225,8 @@ const InventoryPage = () => {
     locationId: '',
     quantity: '',
   });
-  const [newRowSelectedItem, setNewRowSelectedItem] = useState<CatalogItem | null>(null);
+  const [newRowSelectedItem, setNewRowSelectedItem] =
+    useState<CatalogItem | null>(null);
   const [newRowItemInput, setNewRowItemInput] = useState('');
   const [newRowItemOptions, setNewRowItemOptions] = useState<CatalogItem[]>([]);
   const [newRowItemLoading, setNewRowItemLoading] = useState(false);
@@ -254,13 +298,22 @@ const InventoryPage = () => {
     }
     return null;
   }, [page, rowsPerPage, totalCount]);
-  const focusController = useFocusController<string, 'location' | 'quantity' | 'save'>({
+  const focusController = useFocusController<
+    string,
+    'location' | 'quantity' | 'save'
+  >({
     fieldOrder: useMemo(() => ['location', 'quantity', 'save'] as const, []),
     getRowOrder,
     onBoundary: handleFocusBoundary,
   });
-  const newRowFocusController = useFocusController<'new-row', 'item' | 'location' | 'quantity' | 'save'>({
-    fieldOrder: useMemo(() => ['item', 'location', 'quantity', 'save'] as const, []),
+  const newRowFocusController = useFocusController<
+    'new-row',
+    'item' | 'location' | 'quantity' | 'save'
+  >({
+    fieldOrder: useMemo(
+      () => ['item', 'location', 'quantity', 'save'] as const,
+      [],
+    ),
     getRowOrder: getNewRowOrder,
   });
   const locationRefs = useRef<Record<string, HTMLInputElement | null>>({});
@@ -273,11 +326,7 @@ const InventoryPage = () => {
   const newRowItemCache = useRef<Map<string, CatalogItem[]>>(new Map());
 
   const activateInlineField = useCallback(
-    (
-      rowKey: string,
-      field: 'location' | 'quantity',
-      initialInput?: string,
-    ) => {
+    (rowKey: string, field: 'location' | 'quantity', initialInput?: string) => {
       setInlineActiveField({ rowKey, field });
       if (field === 'location') {
         setInlineLocationInputs((prev) => ({
@@ -290,23 +339,26 @@ const InventoryPage = () => {
     [],
   );
   const handleInlineDraftChange = useCallback(
-    (itemId: string, changes: Partial<{ locationId: number | ''; quantity: number | '' }>) => {
+    (
+      itemId: string,
+      changes: Partial<{ locationId: number | ''; quantity: number | '' }>,
+    ) => {
       setInlineDrafts((prev) => {
         const nextLocation =
           changes.locationId === undefined
-            ? prev[itemId]?.locationId ?? ''
+            ? (prev[itemId]?.locationId ?? '')
             : changes.locationId === ''
-            ? ''
-            : Number.isNaN(Number(changes.locationId))
-            ? ''
-            : (Number(changes.locationId) as number);
+              ? ''
+              : Number.isNaN(Number(changes.locationId))
+                ? ''
+                : (Number(changes.locationId) as number);
         return {
           ...prev,
           [itemId]: {
             locationId: nextLocation,
             quantity:
               changes.quantity === undefined
-                ? prev[itemId]?.quantity ?? 0
+                ? (prev[itemId]?.quantity ?? 0)
                 : (changes.quantity as number | ''),
           },
         };
@@ -315,18 +367,24 @@ const InventoryPage = () => {
     },
     [],
   );
-  const handleInlineErrorChange = useCallback((itemId: string, message: string | null) => {
-    setInlineError((prev) => ({
-      ...prev,
-      [itemId]: message,
-    }));
-  }, []);
-  const handleInlineLocationInputChange = useCallback((rowKey: string, value: string) => {
-    setInlineLocationInputs((prev) => ({
-      ...prev,
-      [rowKey]: value,
-    }));
-  }, []);
+  const handleInlineErrorChange = useCallback(
+    (itemId: string, message: string | null) => {
+      setInlineError((prev) => ({
+        ...prev,
+        [itemId]: message,
+      }));
+    },
+    [],
+  );
+  const handleInlineLocationInputChange = useCallback(
+    (rowKey: string, value: string) => {
+      setInlineLocationInputs((prev) => ({
+        ...prev,
+        [rowKey]: value,
+      }));
+    },
+    [],
+  );
   const handleInlineLocationFocus = useCallback((itemId: string) => {
     setInlineError((prev) => ({ ...prev, [itemId]: null }));
   }, []);
@@ -362,15 +420,24 @@ const InventoryPage = () => {
       return null;
     });
   }, []);
-  const handleLocationRef = useCallback((ref: HTMLInputElement | null, key: string) => {
-    locationRefs.current[key] = ref;
-  }, []);
-  const handleQuantityRef = useCallback((ref: HTMLInputElement | null, key: string) => {
-    quantityRefs.current[key] = ref;
-  }, []);
-  const handleSaveRef = useCallback((ref: HTMLButtonElement | null, key: string) => {
-    saveRefs.current[key] = ref;
-  }, []);
+  const handleLocationRef = useCallback(
+    (ref: HTMLInputElement | null, key: string) => {
+      locationRefs.current[key] = ref;
+    },
+    [],
+  );
+  const handleQuantityRef = useCallback(
+    (ref: HTMLInputElement | null, key: string) => {
+      quantityRefs.current[key] = ref;
+    },
+    [],
+  );
+  const handleSaveRef = useCallback(
+    (ref: HTMLButtonElement | null, key: string) => {
+      saveRefs.current[key] = ref;
+    },
+    [],
+  );
 
   const handleLogout = () => {
     localStorage.removeItem('access_token');
@@ -403,7 +470,9 @@ const InventoryPage = () => {
     (viewMode === 'org' && Boolean(selectedOrgId) && canManageOrgInventory);
   const addButtonLabel = viewMode === 'org' ? 'Add org item' : 'Add item';
   const selectedOrgName = useMemo(
-    () => orgOptions.find((org) => org.id === selectedOrgId)?.name ?? 'Organization',
+    () =>
+      orgOptions.find((org) => org.id === selectedOrgId)?.name ??
+      'Organization',
     [orgOptions, selectedOrgId],
   );
 
@@ -439,21 +508,18 @@ const InventoryPage = () => {
     }
   }, []);
 
-  const fetchOrganizations = useCallback(
-    async (userId: number) => {
-      try {
-        const orgs = await inventoryService.getUserOrganizations(userId);
-        const mapped = orgs.map((entry) => ({
-          id: entry.organization?.id ?? entry.organizationId,
-          name: entry.organization?.name ?? `Org #${entry.organizationId}`,
-        }));
-        setOrgOptions(mapped);
-      } catch (err) {
-        console.error('Error loading organizations', err);
-      }
-    },
-    [],
-  );
+  const fetchOrganizations = useCallback(async (userId: number) => {
+    try {
+      const orgs = await inventoryService.getUserOrganizations(userId);
+      const mapped = orgs.map((entry) => ({
+        id: entry.organization?.id ?? entry.organizationId,
+        name: entry.organization?.name ?? `Org #${entry.organizationId}`,
+      }));
+      setOrgOptions(mapped);
+    } catch (err) {
+      console.error('Error loading organizations', err);
+    }
+  }, []);
 
   const fetchCatalog = useCallback(async () => {
     try {
@@ -486,7 +552,12 @@ const InventoryPage = () => {
     } finally {
       setCatalogLoading(false);
     }
-  }, [debouncedCatalogSearch, catalogCategoryId, catalogRowsPerPage, catalogPage]);
+  }, [
+    debouncedCatalogSearch,
+    catalogCategoryId,
+    catalogRowsPerPage,
+    catalogPage,
+  ]);
 
   const fetchInventory = useCallback(async () => {
     if (!user) {
@@ -509,8 +580,8 @@ const InventoryPage = () => {
         sortBy === 'date'
           ? 'date_modified'
           : sortBy === 'location'
-          ? 'location'
-          : sortBy;
+            ? 'location'
+            : sortBy;
       const limit = rowsPerPage;
       const offset = page * rowsPerPage;
 
@@ -530,7 +601,10 @@ const InventoryPage = () => {
         setItems(data.items);
         setTotalCount(data.total);
         if (page > 0) {
-          const lastPage = Math.max(0, Math.floor((data.total - 1) / rowsPerPage));
+          const lastPage = Math.max(
+            0,
+            Math.floor((data.total - 1) / rowsPerPage),
+          );
           if (page > lastPage) {
             setPage(lastPage);
           }
@@ -553,7 +627,10 @@ const InventoryPage = () => {
         setItems(data.items);
         setTotalCount(data.total);
         if (page > 0) {
-          const lastPage = Math.max(0, Math.floor((data.total - 1) / rowsPerPage));
+          const lastPage = Math.max(
+            0,
+            Math.floor((data.total - 1) / rowsPerPage),
+          );
           if (page > lastPage) {
             setPage(lastPage);
           }
@@ -588,7 +665,9 @@ const InventoryPage = () => {
 
   const openAddDialog = () => {
     if (viewMode === 'org' && !canManageOrgInventory) {
-      setCatalogError('You do not have permission to add items to this organization.');
+      setCatalogError(
+        'You do not have permission to add items to this organization.',
+      );
       return;
     }
     setAddDialogOpen(true);
@@ -607,7 +686,9 @@ const InventoryPage = () => {
     setAddDialogOpen(false);
   };
 
-  const handleCreateInventoryItem = async (options?: { stayOpen?: boolean }) => {
+  const handleCreateInventoryItem = async (options?: {
+    stayOpen?: boolean;
+  }) => {
     const isOrgView = viewMode === 'org' && selectedOrgId !== null;
     if (!selectedCatalogItem) {
       setCatalogError('Select an item to add.');
@@ -618,7 +699,9 @@ const InventoryPage = () => {
       return;
     }
     if (viewMode === 'org' && !canManageOrgInventory) {
-      setCatalogError('You do not have permission to add items to this organization.');
+      setCatalogError(
+        'You do not have permission to add items to this organization.',
+      );
       return;
     }
     if (destinationSelection.locationId === '') {
@@ -661,7 +744,9 @@ const InventoryPage = () => {
             });
           }
         } else if (isOrgView) {
-          setCatalogError('This item already exists for the selected location.');
+          setCatalogError(
+            'This item already exists for the selected location.',
+          );
           return;
         } else {
           await inventoryService.createItem({
@@ -702,11 +787,14 @@ const InventoryPage = () => {
       }
     } catch (err) {
       console.error('Error adding inventory item', err);
-      const status = err && typeof err === 'object' && 'response' in err
-        ? (err as { response?: { status?: number } }).response?.status
-        : undefined;
+      const status =
+        err && typeof err === 'object' && 'response' in err
+          ? (err as { response?: { status?: number } }).response?.status
+          : undefined;
       if (status === 403) {
-        setCatalogError('You do not have permission to add items to this organization.');
+        setCatalogError(
+          'You do not have permission to add items to this organization.',
+        );
       } else if (status === 409 && viewMode === 'org' && selectedOrgId) {
         const numericLocationId = Number(destinationSelection.locationId);
         let existing = items.find(
@@ -716,18 +804,24 @@ const InventoryPage = () => {
         );
         if (!existing && selectedCatalogItem) {
           try {
-            const lookupResult = await inventoryService.getOrgInventory(selectedOrgId, {
-              gameId: GAME_ID,
-              uexItemId: selectedCatalogItem.uexId,
-              locationId: numericLocationId,
-              limit: 1,
-              offset: 0,
-            });
+            const lookupResult = await inventoryService.getOrgInventory(
+              selectedOrgId,
+              {
+                gameId: GAME_ID,
+                uexItemId: selectedCatalogItem.uexId,
+                locationId: numericLocationId,
+                limit: 1,
+                offset: 0,
+              },
+            );
             if (lookupResult.items.length > 0) {
               existing = lookupResult.items[0];
             }
           } catch (lookupErr) {
-            console.error('Error looking up conflicting org inventory item', lookupErr);
+            console.error(
+              'Error looking up conflicting org inventory item',
+              lookupErr,
+            );
           }
         }
         if (existing) {
@@ -820,7 +914,15 @@ const InventoryPage = () => {
 
   useEffect(() => {
     setPage(0);
-  }, [debouncedSearch, filters.categoryId, filters.locationId, filters.sharedOnly, filters.valueRange, viewMode, selectedOrgId]);
+  }, [
+    debouncedSearch,
+    filters.categoryId,
+    filters.locationId,
+    filters.sharedOnly,
+    filters.valueRange,
+    viewMode,
+    selectedOrgId,
+  ]);
 
   useEffect(() => {
     setCatalogPage(0);
@@ -899,16 +1001,15 @@ const InventoryPage = () => {
       return;
     }
     setInlineDrafts(
-      items.reduce<Record<string, { locationId: number | ''; quantity: number }>>(
-        (acc, item) => {
-          acc[item.id] = {
-            locationId: item.locationId ?? '',
-            quantity: Number(item.quantity) || 0,
-          };
-          return acc;
-        },
-        {},
-      ),
+      items.reduce<
+        Record<string, { locationId: number | ''; quantity: number }>
+      >((acc, item) => {
+        acc[item.id] = {
+          locationId: item.locationId ?? '',
+          quantity: Number(item.quantity) || 0,
+        };
+        return acc;
+      }, {}),
     );
   }, [items, setInlineDrafts]);
 
@@ -1021,7 +1122,10 @@ const InventoryPage = () => {
     if (!Number.isInteger(parsedLocationId) || parsedLocationId <= 0) {
       errors.location = 'Select a valid location';
     }
-    if (!Number.isFinite(parsedQuantity) || parsedQuantity < MIN_INVENTORY_QUANTITY) {
+    if (
+      !Number.isFinite(parsedQuantity) ||
+      parsedQuantity < MIN_INVENTORY_QUANTITY
+    ) {
       errors.quantity = 'Quantity must be at least 0.01';
     }
 
@@ -1169,7 +1273,9 @@ const InventoryPage = () => {
   useEffect(() => {
     setNewRowErrors((prev) => ({
       ...prev,
-      org: newRowOrgBlocked ? 'Select an organization to add items in org view.' : null,
+      org: newRowOrgBlocked
+        ? 'Select an organization to add items in org view.'
+        : null,
     }));
   }, [newRowOrgBlocked]);
 
@@ -1199,7 +1305,7 @@ const InventoryPage = () => {
       })
       .catch((err) => {
         console.error('Failed to load locations', err);
-    });
+      });
   }, []);
 
   useEffect(() => {
@@ -1281,111 +1387,121 @@ const InventoryPage = () => {
     [inlineDrafts],
   );
 
-  const handleInlineSave = useCallback(async (item: InventoryRecord) => {
-    const draft = getInlineDraft(item);
-    const parsedLocationId =
-      draft.locationId === '' ? NaN : Number(draft.locationId);
-    const parsedQuantity = Number(draft.quantity);
+  const handleInlineSave = useCallback(
+    async (item: InventoryRecord) => {
+      const draft = getInlineDraft(item);
+      const parsedLocationId =
+        draft.locationId === '' ? NaN : Number(draft.locationId);
+      const parsedQuantity = Number(draft.quantity);
 
-    if (
-      !Number.isInteger(parsedLocationId) ||
-      parsedLocationId <= 0 ||
-      !Number.isFinite(parsedQuantity) ||
-      parsedQuantity < MIN_INVENTORY_QUANTITY
-    ) {
-      setInlineError((prev) => ({
-        ...prev,
-        [item.id]:
-          !Number.isInteger(parsedLocationId) || parsedLocationId <= 0
-            ? 'Select a valid location'
-            : 'Quantity must be at least 0.01',
-      }));
-      if (!Number.isInteger(parsedLocationId) || parsedLocationId <= 0) {
-        focusController.focus(item.id.toString(), 'location');
-      } else {
-        focusController.focus(item.id.toString(), 'quantity');
+      if (
+        !Number.isInteger(parsedLocationId) ||
+        parsedLocationId <= 0 ||
+        !Number.isFinite(parsedQuantity) ||
+        parsedQuantity < MIN_INVENTORY_QUANTITY
+      ) {
+        setInlineError((prev) => ({
+          ...prev,
+          [item.id]:
+            !Number.isInteger(parsedLocationId) || parsedLocationId <= 0
+              ? 'Select a valid location'
+              : 'Quantity must be at least 0.01',
+        }));
+        if (!Number.isInteger(parsedLocationId) || parsedLocationId <= 0) {
+          focusController.focus(item.id.toString(), 'location');
+        } else {
+          focusController.focus(item.id.toString(), 'quantity');
+        }
+        return false;
       }
-      return false;
-    }
 
-    const nextSaving = new Set(inlineSaving);
-    nextSaving.add(item.id);
-    setInlineSaving(nextSaving);
-    const prevItem =
-      items.find((entry) => entry.id === item.id) ??
-      ({
+      const nextSaving = new Set(inlineSaving);
+      nextSaving.add(item.id);
+      setInlineSaving(nextSaving);
+      const prevItem =
+        items.find((entry) => entry.id === item.id) ??
+        ({
+          ...item,
+        } as InventoryRecord);
+      const updatedItem: InventoryRecord = {
         ...item,
-      } as InventoryRecord);
-    const updatedItem: InventoryRecord = {
-      ...item,
-      locationId: parsedLocationId,
-      quantity: parsedQuantity,
-      locationName: locationNameById.get(parsedLocationId) || item.locationName,
-    };
-    setItems((prev) =>
-      prev.map((entry) => (entry.id === item.id ? updatedItem : entry)),
-    );
+        locationId: parsedLocationId,
+        quantity: parsedQuantity,
+        locationName:
+          locationNameById.get(parsedLocationId) || item.locationName,
+      };
+      setItems((prev) =>
+        prev.map((entry) => (entry.id === item.id ? updatedItem : entry)),
+      );
 
-    try {
-      if (viewMode === 'org' && selectedOrgId) {
-        await inventoryService.updateOrgItem(selectedOrgId, item.id, {
-          locationId: parsedLocationId,
-          quantity: parsedQuantity,
-        });
-      } else {
-        await inventoryService.updateItem(item.id, {
-          locationId: parsedLocationId,
-          quantity: parsedQuantity,
+      try {
+        if (viewMode === 'org' && selectedOrgId) {
+          await inventoryService.updateOrgItem(selectedOrgId, item.id, {
+            locationId: parsedLocationId,
+            quantity: parsedQuantity,
+          });
+        } else {
+          await inventoryService.updateItem(item.id, {
+            locationId: parsedLocationId,
+            quantity: parsedQuantity,
+          });
+        }
+        setInlineSaved((prev) => {
+          const next = new Set(prev);
+          next.add(item.id.toString());
+          setTimeout(() => {
+            setInlineSaved((current) => {
+              const copy = new Set(current);
+              copy.delete(item.id.toString());
+              return copy;
+            });
+          }, 1200);
+          return next;
         });
+        return true;
+      } catch (err) {
+        console.error('Inline save failed', err);
+        setItems((prev) =>
+          prev.map((entry) => (entry.id === item.id ? prevItem : entry)),
+        );
+        setInlineError((prev) => ({
+          ...prev,
+          [item.id]: 'Unable to save. Please try again.',
+        }));
+        focusController.focus(item.id.toString(), 'save');
+        return false;
+      } finally {
+        const updated = new Set(inlineSaving);
+        updated.delete(item.id);
+        setInlineSaving(updated);
       }
-      setInlineSaved((prev) => {
-        const next = new Set(prev);
-        next.add(item.id.toString());
-        setTimeout(() => {
-          setInlineSaved((current) => {
-            const copy = new Set(current);
-            copy.delete(item.id.toString());
-            return copy;
-          });
-        }, 1200);
-        return next;
-      });
-      return true;
-    } catch (err) {
-      console.error('Inline save failed', err);
-      setItems((prev) =>
-        prev.map((entry) => (entry.id === item.id ? prevItem : entry)),
-      );
-      setInlineError((prev) => ({
-        ...prev,
-        [item.id]: 'Unable to save. Please try again.',
-      }));
-      focusController.focus(item.id.toString(), 'save');
-      return false;
-    } finally {
-      const updated = new Set(inlineSaving);
-      updated.delete(item.id);
-      setInlineSaving(updated);
-    }
-  }, [
-    focusController,
-    getInlineDraft,
-    inlineSaving,
-    items,
-    locationNameById,
-    selectedOrgId,
-    viewMode,
-  ]);
+    },
+    [
+      focusController,
+      getInlineDraft,
+      inlineSaving,
+      items,
+      locationNameById,
+      selectedOrgId,
+      viewMode,
+    ],
+  );
 
-  const handleInlineSaveAndAdvance = useCallback(async (item: InventoryRecord) => {
-    const saved = await handleInlineSave(item);
-    if (saved) {
-      const advanced = await focusController.focusNext(item.id.toString(), 'save');
-      if (!advanced && items.length > 0) {
-        focusController.focus(items[0].id.toString(), 'location');
+  const handleInlineSaveAndAdvance = useCallback(
+    async (item: InventoryRecord) => {
+      const saved = await handleInlineSave(item);
+      if (saved) {
+        const advanced = await focusController.focusNext(
+          item.id.toString(),
+          'save',
+        );
+        if (!advanced && items.length > 0) {
+          focusController.focus(items[0].id.toString(), 'location');
+        }
       }
-    }
-  }, [focusController, handleInlineSave, items]);
+    },
+    [focusController, handleInlineSave, items],
+  );
 
   const openActionDialog = (mode: ActionMode) => {
     setActionMode(mode);
@@ -1456,7 +1572,9 @@ const InventoryPage = () => {
           notes: actionItem.notes,
         });
       } else {
-        await inventoryService.updateItem(actionItem.id, { quantity: remaining });
+        await inventoryService.updateItem(actionItem.id, {
+          quantity: remaining,
+        });
         await inventoryService.createItem({
           gameId: GAME_ID,
           uexItemId: actionItem.uexItemId,
@@ -1543,7 +1661,10 @@ const InventoryPage = () => {
         }}
       >
         <Stack spacing={2}>
-          <Typography variant="h6" sx={{ display: 'flex', alignItems: 'center', gap: 1 }}>
+          <Typography
+            variant="h6"
+            sx={{ display: 'flex', alignItems: 'center', gap: 1 }}
+          >
             {actionMode === 'edit' && <EditIcon fontSize="small" />}
             {actionMode === 'split' && <CallSplitIcon fontSize="small" />}
             {actionMode === 'share' && <ShareIcon fontSize="small" />}
@@ -1551,10 +1672,10 @@ const InventoryPage = () => {
             {actionMode === 'edit'
               ? 'Edit item'
               : actionMode === 'split'
-              ? 'Split item'
-              : actionMode === 'share'
-              ? 'Share item'
-              : 'Delete item'}
+                ? 'Split item'
+                : actionMode === 'share'
+                  ? 'Share item'
+                  : 'Delete item'}
           </Typography>
           {actionMode === 'edit' && (
             <>
@@ -1721,10 +1842,15 @@ const InventoryPage = () => {
           {actionMode === 'delete' && (
             <>
               <Typography variant="body2">
-                Delete <strong>{actionItem.itemName || `Item ${actionItem.uexItemId}`}</strong>?
+                Delete{' '}
+                <strong>
+                  {actionItem.itemName || `Item ${actionItem.uexItemId}`}
+                </strong>
+                ?
               </Typography>
               <Typography variant="body2" color="text.secondary">
-                This removes the record from the inventory. You can recreate it later.
+                This removes the record from the inventory. You can recreate it
+                later.
               </Typography>
               <Stack direction="row" spacing={1} justifyContent="flex-end">
                 <Button variant="text" onClick={closeActionMenu}>
@@ -1748,8 +1874,8 @@ const InventoryPage = () => {
 
   const addReady = Boolean(
     selectedCatalogItem &&
-    destinationSelection.locationId !== '' &&
-    newItemQuantity > 0,
+      destinationSelection.locationId !== '' &&
+      newItemQuantity > 0,
   );
 
   const handleAddKeyDown = (event: KeyboardEvent) => {
@@ -1833,10 +1959,13 @@ const InventoryPage = () => {
     const originalQuantity = Number(item.quantity) || 0;
     const draftQuantityNumber = Number(draft.quantity);
     const isDirty =
-      draftLocationId !== originalLocationId || draftQuantityNumber !== originalQuantity;
+      draftLocationId !== originalLocationId ||
+      draftQuantityNumber !== originalQuantity;
     const isRowActive = inlineActiveField?.rowKey === rowKey;
-    const isLocationActive = isRowActive && inlineActiveField?.field === 'location';
-    const isQuantityActive = isRowActive && inlineActiveField?.field === 'quantity';
+    const isLocationActive =
+      isRowActive && inlineActiveField?.field === 'location';
+    const isQuantityActive =
+      isRowActive && inlineActiveField?.field === 'quantity';
     const resolvedLocationName = Number.isFinite(draftLocationId)
       ? locationNameById.get(draftLocationId as number)
       : undefined;
@@ -1844,7 +1973,7 @@ const InventoryPage = () => {
       inlineLocationInputs[rowKey] ??
       (isLocationActive
         ? ''
-        : resolvedLocationName ?? item.locationName ?? '');
+        : (resolvedLocationName ?? item.locationName ?? ''));
     const saving = inlineSaving.has(item.id);
     const errorText = inlineError[item.id];
     const saved = inlineSaved.has(item.id.toString());
@@ -1885,7 +2014,14 @@ const InventoryPage = () => {
 
   return (
     <Box sx={{ minHeight: '100vh', backgroundColor: '#0b1118' }}>
-      <AppBar position="sticky" color="transparent" sx={{ backdropFilter: 'blur(6px)', borderBottom: '1px solid rgba(255,255,255,0.06)' }}>
+      <AppBar
+        position="sticky"
+        color="transparent"
+        sx={{
+          backdropFilter: 'blur(6px)',
+          borderBottom: '1px solid rgba(255,255,255,0.06)',
+        }}
+      >
         <Toolbar>
           <IconButton color="inherit" onClick={() => navigate('/dashboard')}>
             <ArrowBackIcon />
@@ -1932,7 +2068,10 @@ const InventoryPage = () => {
           <Container maxWidth="xl" sx={{ py: 1.5 }}>
             <Stack direction="row" spacing={1.5} alignItems="center">
               <BusinessIcon sx={{ color: ORG_ACCENT }} fontSize="small" />
-              <Typography variant="subtitle2" sx={{ color: '#f7f1e8', fontWeight: 600 }}>
+              <Typography
+                variant="subtitle2"
+                sx={{ color: '#f7f1e8', fontWeight: 600 }}
+              >
                 Organization mode
               </Typography>
               <Divider
@@ -1941,7 +2080,9 @@ const InventoryPage = () => {
                 sx={{ borderColor: 'rgba(242, 162, 85, 0.35)' }}
               />
               <Typography variant="body2" sx={{ color: '#f0d9c0' }}>
-                {selectedOrgId ? `Working in ${selectedOrgName}` : 'Select an organization to continue.'}
+                {selectedOrgId
+                  ? `Working in ${selectedOrgName}`
+                  : 'Select an organization to continue.'}
               </Typography>
             </Stack>
           </Container>
@@ -1990,325 +2131,397 @@ const InventoryPage = () => {
         )}
         <Box sx={{ pointerEvents: inventoryBusy ? 'none' : 'auto' }}>
           <Grid container spacing={3}>
-          <Grid item xs={12}>
-            <Card
-              sx={{
-                background: 'linear-gradient(120deg, #0f1724 0%, #0f1b2c 50%, #0c1220 100%)',
-                border: '1px solid rgba(255,255,255,0.05)',
-              }}
-            >
-              <CardContent>
-                <InventoryFiltersPanel
-                  filters={filters}
-                  setFilters={setFilters}
-                  categories={categories}
-                  locationOptions={locationOptions}
-                  valueText={valueText}
-                  maxQuantity={maxQuantity}
-                  sortBy={sortBy}
-                  sortDir={sortDir}
-                  setSortBy={(value) => setSortBy(value)}
-                  setSortDir={(updater) => setSortDir(updater)}
-                  groupBy={groupBy}
-                  setGroupBy={(value) => setGroupBy(value)}
-                  density={density}
-                  setDensity={(value) => setDensity(value)}
-                  viewMode={viewMode}
-                  setViewMode={(mode) => setViewMode(mode)}
-                  selectedOrgId={selectedOrgId}
-                  setSelectedOrgId={(value) => setSelectedOrgId(value)}
-                  orgOptions={orgOptions}
-                  userInitial={user?.username?.charAt(0).toUpperCase() || 'U'}
-                  onOpenAddDialog={openAddDialog}
-                  showAddButton={showAddButton}
-                  addButtonLabel={addButtonLabel}
-                  totalCount={totalCount}
-                  itemCount={items.length}
-                  autoFocusSearch
-                  disabled={inventoryBusy}
-                />
-                {viewMode === 'org' && selectedOrgId && !canManageOrgInventory && !orgPermissionsLoading && (
-                  <Alert severity="info" sx={{ mt: 2 }}>
-                    You do not have permission to add items to this organization.
-                  </Alert>
-                )}
-                {orgPermissionsError && (
-                  <Alert severity="warning" sx={{ mt: 2 }}>
-                    {orgPermissionsError}
-                  </Alert>
-                )}
-              </CardContent>
-            </Card>
-          </Grid>
+            <Grid item xs={12}>
+              <Card
+                sx={{
+                  background:
+                    'linear-gradient(120deg, #0f1724 0%, #0f1b2c 50%, #0c1220 100%)',
+                  border: '1px solid rgba(255,255,255,0.05)',
+                }}
+              >
+                <CardContent>
+                  <InventoryFiltersPanel
+                    filters={filters}
+                    setFilters={setFilters}
+                    categories={categories}
+                    locationOptions={locationOptions}
+                    valueText={valueText}
+                    maxQuantity={maxQuantity}
+                    sortBy={sortBy}
+                    sortDir={sortDir}
+                    setSortBy={(value) => setSortBy(value)}
+                    setSortDir={(updater) => setSortDir(updater)}
+                    groupBy={groupBy}
+                    setGroupBy={(value) => setGroupBy(value)}
+                    density={density}
+                    setDensity={(value) => setDensity(value)}
+                    viewMode={viewMode}
+                    setViewMode={(mode) => setViewMode(mode)}
+                    selectedOrgId={selectedOrgId}
+                    setSelectedOrgId={(value) => setSelectedOrgId(value)}
+                    orgOptions={orgOptions}
+                    userInitial={user?.username?.charAt(0).toUpperCase() || 'U'}
+                    onOpenAddDialog={openAddDialog}
+                    showAddButton={showAddButton}
+                    addButtonLabel={addButtonLabel}
+                    totalCount={totalCount}
+                    itemCount={items.length}
+                    autoFocusSearch
+                    disabled={inventoryBusy}
+                  />
+                  {viewMode === 'org' &&
+                    selectedOrgId &&
+                    !canManageOrgInventory &&
+                    !orgPermissionsLoading && (
+                      <Alert severity="info" sx={{ mt: 2 }}>
+                        You do not have permission to add items to this
+                        organization.
+                      </Alert>
+                    )}
+                  {orgPermissionsError && (
+                    <Alert severity="warning" sx={{ mt: 2 }}>
+                      {orgPermissionsError}
+                    </Alert>
+                  )}
+                </CardContent>
+              </Card>
+            </Grid>
 
-          <Grid item xs={12}>
-            <Card sx={{ backgroundColor: '#0e1520', border: '1px solid rgba(255,255,255,0.05)' }}>
-              <CardContent>
-                {refreshing && (
-                  <LinearProgress sx={{ mb: 2 }} color="primary" />
-                )}
-                {error && (
-                  <Box
-                    sx={{
-                      backgroundColor: 'rgba(255,99,71,0.08)',
-                      border: '1px solid rgba(255,99,71,0.2)',
-                      borderRadius: 2,
-                      p: 2,
-                      mb: 2,
-                    }}
-                  >
-                    <Typography color="error">{error}</Typography>
-                  </Box>
-                )}
-                {!showEmptyState && (
-                  <Stack
-                    direction="row"
-                    alignItems="center"
-                    spacing={2}
-                    sx={{ mb: 2, color: '#9aa0a6' }}
-                  >
-                    <ViewAgendaIcon fontSize="small" />
-                    <Typography variant="body2">
-                      Showing {items.length.toLocaleString()} of {totalCount.toLocaleString()} items
-                    </Typography>
-                  </Stack>
-                )}
-                {isEditorMode && (
-                  <>
+            <Grid item xs={12}>
+              <Card
+                sx={{
+                  backgroundColor: '#0e1520',
+                  border: '1px solid rgba(255,255,255,0.05)',
+                }}
+              >
+                <CardContent>
+                  {refreshing && (
+                    <LinearProgress sx={{ mb: 2 }} color="primary" />
+                  )}
+                  {error && (
                     <Box
                       sx={{
-                        position: 'sticky',
-                        top: 0,
-                        zIndex: 2,
-                        backgroundColor: '#0e1520',
-                        px: 1.5,
-                        py: 0.75,
-                        borderTop: '1px solid rgba(255,255,255,0.04)',
-                        borderBottom: '1px solid rgba(255,255,255,0.04)',
+                        backgroundColor: 'rgba(255,99,71,0.08)',
+                        border: '1px solid rgba(255,99,71,0.2)',
+                        borderRadius: 2,
+                        p: 2,
+                        mb: 2,
                       }}
                     >
+                      <Typography color="error">{error}</Typography>
+                    </Box>
+                  )}
+                  {!showEmptyState && (
+                    <Stack
+                      direction="row"
+                      alignItems="center"
+                      spacing={2}
+                      sx={{ mb: 2, color: '#9aa0a6' }}
+                    >
+                      <ViewAgendaIcon fontSize="small" />
+                      <Typography variant="body2">
+                        Showing {items.length.toLocaleString()} of{' '}
+                        {totalCount.toLocaleString()} items
+                      </Typography>
+                    </Stack>
+                  )}
+                  {isEditorMode && (
+                    <>
                       <Box
                         sx={{
-                          display: 'grid',
-                          gridTemplateColumns: {
-                            xs: '1fr',
-                            md:
-                              density === 'compact'
-                                ? '2fr 1fr 1fr 1fr auto'
-                                : '2fr 1fr 1fr 1fr auto',
-                          },
-                          alignItems: 'center',
-                          color: 'text.secondary',
-                          fontSize: 12,
-                          letterSpacing: 0.2,
-                          textTransform: 'uppercase',
+                          position: 'sticky',
+                          top: 0,
+                          zIndex: 2,
+                          backgroundColor: '#0e1520',
+                          px: 1.5,
+                          py: 0.75,
+                          borderTop: '1px solid rgba(255,255,255,0.04)',
+                          borderBottom: '1px solid rgba(255,255,255,0.04)',
                         }}
                       >
-                        <Typography variant="caption">Item</Typography>
-                        <Typography variant="caption">Location</Typography>
-                        <Typography variant="caption">Quantity</Typography>
-                        <Typography variant="caption">Updated</Typography>
-                        <Typography variant="caption" textAlign="right">
-                          Actions
-                        </Typography>
+                        <Box
+                          sx={{
+                            display: 'grid',
+                            gridTemplateColumns: {
+                              xs: '1fr',
+                              md:
+                                density === 'compact'
+                                  ? '2fr 1fr 1fr 1fr auto'
+                                  : '2fr 1fr 1fr 1fr auto',
+                            },
+                            alignItems: 'center',
+                            color: 'text.secondary',
+                            fontSize: 12,
+                            letterSpacing: 0.2,
+                            textTransform: 'uppercase',
+                          }}
+                        >
+                          <Typography variant="caption">Item</Typography>
+                          <Typography variant="caption">Location</Typography>
+                          <Typography variant="caption">Quantity</Typography>
+                          <Typography variant="caption">Updated</Typography>
+                          <Typography variant="caption" textAlign="right">
+                            Actions
+                          </Typography>
+                        </Box>
                       </Box>
-                    </Box>
-                    <InventoryNewRow
-                      isEditorMode={isEditorMode}
-                      itemOptions={newRowItemOptions}
-                      itemInput={newRowItemInput}
-                      selectedItem={newRowSelectedItem}
-                      itemLoading={newRowItemLoading}
-                      itemError={newRowItemError}
-                      locationInput={newRowLocationInput}
-                      locationEditing={newRowLocationEditing}
-                      selectedLocation={newRowSelectedLocation}
-                      filteredLocations={newRowFilteredLocations}
-                      draft={newRowDraft}
-                      errors={newRowErrors}
-                      dirty={newRowDirty}
-                      saving={newRowSaving}
-                      orgBlocked={newRowOrgBlocked}
-                      showQuantityWarning={
-                        Number.isFinite(newRowQuantityNumber) &&
-                        newRowQuantityNumber >= EDITOR_MODE_QUANTITY_MAX
-                      }
-                      onItemInputChange={(value, reason) => {
-                        setNewRowItemInput(value);
-                        if (reason === 'clear') {
-                          setNewRowSelectedItem(null);
-                          setNewRowDraft((prev) => ({ ...prev, itemId: '' }));
-                        }
-                        setNewRowErrors((prev) => ({ ...prev, item: null, api: null }));
-                      }}
-                      onItemSelect={(value) => {
-                        setNewRowSelectedItem(value);
-                        setNewRowDraft((prev) => ({
-                          ...prev,
-                          itemId: value ? value.uexId : '',
-                        }));
-                        setNewRowItemInput(value?.name ?? newRowItemInput);
-                        setNewRowErrors((prev) => ({ ...prev, item: null, api: null }));
-                        if (value) {
-                          newRowFocusController.focus('new-row', 'location');
-                        }
-                      }}
-                      onLocationInputChange={(value) => {
-                        setNewRowLocationInput(value);
-                        setNewRowLocationEditing(true);
-                        setNewRowErrors((prev) => ({ ...prev, location: null, api: null }));
-                      }}
-                      onLocationSelect={(value) => {
-                        setNewRowDraft((prev) => ({
-                          ...prev,
-                          locationId: value ? value.id : '',
-                        }));
-                        setNewRowLocationEditing(false);
-                        setNewRowLocationInput(value?.name ?? '');
-                        setNewRowErrors((prev) => ({ ...prev, location: null, api: null }));
-                        if (value) {
-                          newRowFocusController.focus('new-row', 'quantity');
+                      <InventoryNewRow
+                        isEditorMode={isEditorMode}
+                        itemOptions={newRowItemOptions}
+                        itemInput={newRowItemInput}
+                        selectedItem={newRowSelectedItem}
+                        itemLoading={newRowItemLoading}
+                        itemError={newRowItemError}
+                        locationInput={newRowLocationInput}
+                        locationEditing={newRowLocationEditing}
+                        selectedLocation={newRowSelectedLocation}
+                        filteredLocations={newRowFilteredLocations}
+                        draft={newRowDraft}
+                        errors={newRowErrors}
+                        dirty={newRowDirty}
+                        saving={newRowSaving}
+                        orgBlocked={newRowOrgBlocked}
+                        showQuantityWarning={
+                          Number.isFinite(newRowQuantityNumber) &&
+                          newRowQuantityNumber >= EDITOR_MODE_QUANTITY_MAX
                         }
-                      }}
-                      onLocationEnter={(bestMatch) => {
-                        if (bestMatch) {
-                          setNewRowDraft((prev) => ({ ...prev, locationId: bestMatch.id }));
-                          setNewRowLocationInput(bestMatch.name);
-                          setNewRowLocationEditing(false);
-                          setNewRowErrors((prev) => ({ ...prev, location: null, api: null }));
-                          newRowFocusController.focus('new-row', 'quantity');
-                        } else {
+                        onItemInputChange={(value, reason) => {
+                          setNewRowItemInput(value);
+                          if (reason === 'clear') {
+                            setNewRowSelectedItem(null);
+                            setNewRowDraft((prev) => ({ ...prev, itemId: '' }));
+                          }
                           setNewRowErrors((prev) => ({
                             ...prev,
-                            location: 'No matches found',
+                            item: null,
+                            api: null,
                           }));
-                        }
-                      }}
-                      onLocationFocus={() => {
-                        setNewRowLocationEditing(true);
-                        setNewRowLocationInput('');
-                      }}
-                      onLocationBlur={(value) => {
-                        setNewRowLocationEditing(false);
-                        setNewRowLocationInput(value);
-                        setNewRowErrors((prev) => ({ ...prev, location: null }));
-                      }}
-                      onQuantityChange={(value) => {
-                        const raw = value.trim();
-                        if (raw === '') {
-                          setNewRowDraft((prev) => ({ ...prev, quantity: '' }));
+                        }}
+                        onItemSelect={(value) => {
+                          setNewRowSelectedItem(value);
+                          setNewRowDraft((prev) => ({
+                            ...prev,
+                            itemId: value ? value.uexId : '',
+                          }));
+                          setNewRowItemInput(value?.name ?? newRowItemInput);
                           setNewRowErrors((prev) => ({
                             ...prev,
-                            quantity: 'Quantity is required',
+                            item: null,
                             api: null,
                           }));
-                          return;
-                        }
-                        const numeric = Number(raw);
-                        const nextQuantity = Number.isNaN(numeric)
-                          ? ''
-                          : Math.min(numeric, EDITOR_MODE_QUANTITY_MAX);
-                        setNewRowDraft((prev) => ({
-                          ...prev,
-                          quantity: nextQuantity,
-                        }));
-                        if (!Number.isFinite(numeric) || numeric < MIN_INVENTORY_QUANTITY) {
+                          if (value) {
+                            newRowFocusController.focus('new-row', 'location');
+                          }
+                        }}
+                        onLocationInputChange={(value) => {
+                          setNewRowLocationInput(value);
+                          setNewRowLocationEditing(true);
                           setNewRowErrors((prev) => ({
                             ...prev,
-                            quantity: 'Quantity must be at least 0.01',
+                            location: null,
                             api: null,
                           }));
-                        } else {
-                          setNewRowErrors((prev) => ({ ...prev, quantity: null, api: null }));
+                        }}
+                        onLocationSelect={(value) => {
+                          setNewRowDraft((prev) => ({
+                            ...prev,
+                            locationId: value ? value.id : '',
+                          }));
+                          setNewRowLocationEditing(false);
+                          setNewRowLocationInput(value?.name ?? '');
+                          setNewRowErrors((prev) => ({
+                            ...prev,
+                            location: null,
+                            api: null,
+                          }));
+                          if (value) {
+                            newRowFocusController.focus('new-row', 'quantity');
+                          }
+                        }}
+                        onLocationEnter={(bestMatch) => {
+                          if (bestMatch) {
+                            setNewRowDraft((prev) => ({
+                              ...prev,
+                              locationId: bestMatch.id,
+                            }));
+                            setNewRowLocationInput(bestMatch.name);
+                            setNewRowLocationEditing(false);
+                            setNewRowErrors((prev) => ({
+                              ...prev,
+                              location: null,
+                              api: null,
+                            }));
+                            newRowFocusController.focus('new-row', 'quantity');
+                          } else {
+                            setNewRowErrors((prev) => ({
+                              ...prev,
+                              location: 'No matches found',
+                            }));
+                          }
+                        }}
+                        onLocationFocus={() => {
+                          setNewRowLocationEditing(true);
+                          setNewRowLocationInput('');
+                        }}
+                        onLocationBlur={(value) => {
+                          setNewRowLocationEditing(false);
+                          setNewRowLocationInput(value);
+                          setNewRowErrors((prev) => ({
+                            ...prev,
+                            location: null,
+                          }));
+                        }}
+                        onQuantityChange={(value) => {
+                          const raw = value.trim();
+                          if (raw === '') {
+                            setNewRowDraft((prev) => ({
+                              ...prev,
+                              quantity: '',
+                            }));
+                            setNewRowErrors((prev) => ({
+                              ...prev,
+                              quantity: 'Quantity is required',
+                              api: null,
+                            }));
+                            return;
+                          }
+                          const numeric = Number(raw);
+                          const nextQuantity = Number.isNaN(numeric)
+                            ? ''
+                            : Math.min(numeric, EDITOR_MODE_QUANTITY_MAX);
+                          setNewRowDraft((prev) => ({
+                            ...prev,
+                            quantity: nextQuantity,
+                          }));
+                          if (
+                            !Number.isFinite(numeric) ||
+                            numeric < MIN_INVENTORY_QUANTITY
+                          ) {
+                            setNewRowErrors((prev) => ({
+                              ...prev,
+                              quantity: 'Quantity must be at least 0.01',
+                              api: null,
+                            }));
+                          } else {
+                            setNewRowErrors((prev) => ({
+                              ...prev,
+                              quantity: null,
+                              api: null,
+                            }));
+                          }
+                        }}
+                        onQuantityEnter={() =>
+                          newRowFocusController.focus('new-row', 'save')
                         }
-                      }}
-                      onQuantityEnter={() => newRowFocusController.focus('new-row', 'save')}
-                      onSave={handleNewRowSave}
-                      onRetry={handleNewRowSave}
-                      itemRef={newRowItemRef}
-                      locationRef={newRowLocationRef}
-                      quantityRef={newRowQuantityRef}
-                      saveRef={newRowSaveRef}
-                    />
-                  </>
-                )}
-                {showEmptyState ? (
-                  <Box sx={{ textAlign: 'center', py: 8 }}>
-                    <InventoryIcon sx={{ fontSize: 42, color: '#4A9EFF' }} />
-                    <Typography variant="h6" sx={{ mt: 2 }}>
-                      No inventory matches your filters
-                    </Typography>
-                    <Typography color="text.secondary">
-                      Adjust filters or sync new items to get started.
-                    </Typography>
-                  </Box>
-                ) : (
-                  <>
-                    <Stack spacing={2}>
-                      {Array.from(groupedItems.entries()).map(([group, groupItems]) => (
-                        <Box
-                          key={group}
-                          sx={{
-                            border: '1px solid rgba(255,255,255,0.04)',
-                            borderRadius: 2,
-                            overflow: 'hidden',
-                          }}
-                        >
-                          <Box
-                            sx={{
-                              display: 'flex',
-                              alignItems: 'center',
-                              justifyContent: 'space-between',
-                              px: density === 'compact' ? 1.5 : 2,
-                              py: density === 'compact' ? 1 : 1.5,
-                              backgroundColor: 'rgba(255,255,255,0.02)',
-                            }}
-                          >
-                            <Stack direction="row" spacing={1} alignItems="center">
-                              <Chip
-                                size="small"
-                                label={group}
-                                color="primary"
-                                variant="outlined"
+                        onSave={handleNewRowSave}
+                        onRetry={handleNewRowSave}
+                        itemRef={newRowItemRef}
+                        locationRef={newRowLocationRef}
+                        quantityRef={newRowQuantityRef}
+                        saveRef={newRowSaveRef}
+                      />
+                    </>
+                  )}
+                  {showEmptyState ? (
+                    <Box sx={{ textAlign: 'center', py: 8 }}>
+                      <InventoryIcon sx={{ fontSize: 42, color: '#4A9EFF' }} />
+                      <Typography variant="h6" sx={{ mt: 2 }}>
+                        No inventory matches your filters
+                      </Typography>
+                      <Typography color="text.secondary">
+                        Adjust filters or sync new items to get started.
+                      </Typography>
+                    </Box>
+                  ) : (
+                    <>
+                      <Stack spacing={2}>
+                        {Array.from(groupedItems.entries()).map(
+                          ([group, groupItems]) => (
+                            <Box
+                              key={group}
+                              sx={{
+                                border: '1px solid rgba(255,255,255,0.04)',
+                                borderRadius: 2,
+                                overflow: 'hidden',
+                              }}
+                            >
+                              <Box
+                                sx={{
+                                  display: 'flex',
+                                  alignItems: 'center',
+                                  justifyContent: 'space-between',
+                                  px: density === 'compact' ? 1.5 : 2,
+                                  py: density === 'compact' ? 1 : 1.5,
+                                  backgroundColor: 'rgba(255,255,255,0.02)',
+                                }}
+                              >
+                                <Stack
+                                  direction="row"
+                                  spacing={1}
+                                  alignItems="center"
+                                >
+                                  <Chip
+                                    size="small"
+                                    label={group}
+                                    color="primary"
+                                    variant="outlined"
+                                  />
+                                  <Typography
+                                    variant="body2"
+                                    color="text.secondary"
+                                  >
+                                    {groupItems.length} item
+                                    {groupItems.length === 1 ? '' : 's'}
+                                  </Typography>
+                                </Stack>
+                              </Box>
+                              <Divider
+                                sx={{ borderColor: 'rgba(255,255,255,0.04)' }}
                               />
-                              <Typography variant="body2" color="text.secondary">
-                                {groupItems.length} item{groupItems.length === 1 ? '' : 's'}
-                              </Typography>
-                            </Stack>
-                          </Box>
-                          <Divider sx={{ borderColor: 'rgba(255,255,255,0.04)' }} />
-                          <Stack divider={<Divider flexItem sx={{ borderColor: 'rgba(255,255,255,0.04)' }} />}>
-                            {groupItems.map((item) => renderInlineRow(item))}
-                          </Stack>
-                        </Box>
-                      ))}
-                    </Stack>
-                    <TablePagination
-                      component="div"
-                      count={totalCount}
-                      page={page}
-                      onPageChange={(_, newPage) => {
-                        if (inventoryBusy) return;
-                        setPage(newPage);
-                      }}
-                      rowsPerPage={rowsPerPage}
-                      onRowsPerPageChange={(event) => {
-                        if (inventoryBusy) return;
-                        setRowsPerPage(parseInt(event.target.value, 10));
-                        setPage(0);
-                      }}
-                      rowsPerPageOptions={[10, 25, 50, 100, 250]}
-                      backIconButtonProps={{ disabled: inventoryBusy }}
-                      nextIconButtonProps={{ disabled: inventoryBusy }}
-                      SelectProps={{ disabled: inventoryBusy }}
-                      sx={{ mt: 2 }}
-                    />
-                  </>
-                )}
-              </CardContent>
-            </Card>
+                              <Stack
+                                divider={
+                                  <Divider
+                                    flexItem
+                                    sx={{
+                                      borderColor: 'rgba(255,255,255,0.04)',
+                                    }}
+                                  />
+                                }
+                              >
+                                {groupItems.map((item) =>
+                                  renderInlineRow(item),
+                                )}
+                              </Stack>
+                            </Box>
+                          ),
+                        )}
+                      </Stack>
+                      <TablePagination
+                        component="div"
+                        count={totalCount}
+                        page={page}
+                        onPageChange={(_, newPage) => {
+                          if (inventoryBusy) return;
+                          setPage(newPage);
+                        }}
+                        rowsPerPage={rowsPerPage}
+                        onRowsPerPageChange={(event) => {
+                          if (inventoryBusy) return;
+                          setRowsPerPage(parseInt(event.target.value, 10));
+                          setPage(0);
+                        }}
+                        rowsPerPageOptions={[10, 25, 50, 100, 250]}
+                        backIconButtonProps={{ disabled: inventoryBusy }}
+                        nextIconButtonProps={{ disabled: inventoryBusy }}
+                        SelectProps={{ disabled: inventoryBusy }}
+                        sx={{ mt: 2 }}
+                      />
+                    </>
+                  )}
+                </CardContent>
+              </Card>
+            </Grid>
           </Grid>
-        </Grid>
         </Box>
       </Container>
 
@@ -2350,7 +2563,9 @@ const InventoryPage = () => {
                       onKeyDown={handleCatalogSearchKeyDown}
                     />
                     <FormControl fullWidth>
-                      <InputLabel id="catalog-category-label">Category</InputLabel>
+                      <InputLabel id="catalog-category-label">
+                        Category
+                      </InputLabel>
                       <Select
                         labelId="catalog-category-label"
                         label="Category"
@@ -2371,7 +2586,11 @@ const InventoryPage = () => {
                         ))}
                       </Select>
                     </FormControl>
-                    <Suspense fallback={<LinearProgress sx={{ height: 4, borderRadius: 2 }} />}>
+                    <Suspense
+                      fallback={
+                        <LinearProgress sx={{ height: 4, borderRadius: 2 }} />
+                      }
+                    >
                       <LazySystemLocationSelector
                         value={destinationSelection}
                         onChange={setDestinationSelection}
@@ -2387,14 +2606,18 @@ const InventoryPage = () => {
                           type="number"
                           inputProps={{ min: 0.01, step: 0.01 }}
                           value={newItemQuantity}
-                          onChange={(e) => setNewItemQuantity(Number(e.target.value))}
+                          onChange={(e) =>
+                            setNewItemQuantity(Number(e.target.value))
+                          }
                         />
                         <Stack direction="row" spacing={1}>
                           <Button
                             size="small"
                             variant="outlined"
                             onClick={() =>
-                              setNewItemQuantity((qty) => Number(Math.max(0.01, qty - 1).toFixed(2)))
+                              setNewItemQuantity((qty) =>
+                                Number(Math.max(0.01, qty - 1).toFixed(2)),
+                              )
                             }
                           >
                             -1
@@ -2403,7 +2626,9 @@ const InventoryPage = () => {
                             size="small"
                             variant="outlined"
                             onClick={() =>
-                              setNewItemQuantity((qty) => Number(Math.max(0.01, qty + 1).toFixed(2)))
+                              setNewItemQuantity((qty) =>
+                                Number(Math.max(0.01, qty + 1).toFixed(2)),
+                              )
                             }
                           >
                             +1
@@ -2417,7 +2642,8 @@ const InventoryPage = () => {
                         onChange={(e) => setNewItemNotes(e.target.value)}
                       />
                       <Typography variant="caption" color="text.secondary">
-                        Tip: Ctrl/Cmd + Enter to add and keep this dialog open for rapid entry.
+                        Tip: Ctrl/Cmd + Enter to add and keep this dialog open
+                        for rapid entry.
                       </Typography>
                     </Stack>
                   </Stack>
@@ -2433,12 +2659,19 @@ const InventoryPage = () => {
                     minHeight: 360,
                   }}
                 >
-                  <Stack direction="row" alignItems="center" spacing={1} sx={{ mb: 1 }}>
+                  <Stack
+                    direction="row"
+                    alignItems="center"
+                    spacing={1}
+                    sx={{ mb: 1 }}
+                  >
                     <Typography variant="subtitle2" sx={{ fontWeight: 700 }}>
                       Catalog results
                     </Typography>
                     {catalogLoading ? (
-                      <LinearProgress sx={{ flex: 1, height: 4, borderRadius: 1 }} />
+                      <LinearProgress
+                        sx={{ flex: 1, height: 4, borderRadius: 1 }}
+                      />
                     ) : (
                       <Typography variant="caption" color="text.secondary">
                         {catalogTotal.toLocaleString()} items
@@ -2446,7 +2679,9 @@ const InventoryPage = () => {
                     )}
                   </Stack>
                   {catalogLoading ? (
-                    <Box sx={{ display: 'flex', justifyContent: 'center', py: 4 }}>
+                    <Box
+                      sx={{ display: 'flex', justifyContent: 'center', py: 4 }}
+                    >
                       <CircularProgress size={24} />
                     </Box>
                   ) : catalogItems.length === 0 ? (
@@ -2481,7 +2716,9 @@ const InventoryPage = () => {
                           }}
                         >
                           <ListItemIcon>
-                            <Radio checked={selectedCatalogItem?.id === item.id} />
+                            <Radio
+                              checked={selectedCatalogItem?.id === item.id}
+                            />
                           </ListItemIcon>
                           <ListItemText
                             primary={item.name}
diff --git a/frontend/src/pages/Login.tsx b/frontend/src/pages/Login.tsx
index e366603..f3fd5e2 100644
--- a/frontend/src/pages/Login.tsx
+++ b/frontend/src/pages/Login.tsx
@@ -59,11 +59,19 @@ const Login = () => {
       } else {
         const errorData = await response.json();
         console.error('Login error:', errorData);
-        setError(errorData.message || errorData.error || 'Invalid username or password');
+        setError(
+          errorData.message ||
+            errorData.error ||
+            'Invalid username or password',
+        );
       }
     } catch (err: unknown) {
       console.error('Login error:', err);
-      setError(err instanceof Error ? err.message : 'Cannot connect to server. Please make sure the backend is running.');
+      setError(
+        err instanceof Error
+          ? err.message
+          : 'Cannot connect to server. Please make sure the backend is running.',
+      );
     } finally {
       setLoading(false);
     }
@@ -241,7 +249,8 @@ const Login = () => {
           <DialogContent>
             {!resetSuccess && (
               <Typography sx={{ mb: 2, color: '#9aa0a6' }}>
-                Enter your email address and we'll send you a link to reset your password.
+                Enter your email address and we'll send you a link to reset your
+                password.
               </Typography>
             )}
 
@@ -279,7 +288,10 @@ const Login = () => {
               </Button>
             ) : (
               <>
-                <Button onClick={handleCloseForgotPassword} disabled={resetLoading}>
+                <Button
+                  onClick={handleCloseForgotPassword}
+                  disabled={resetLoading}
+                >
                   Cancel
                 </Button>
                 <Button
diff --git a/frontend/src/pages/Profile.tsx b/frontend/src/pages/Profile.tsx
index db2b69f..573d333 100644
--- a/frontend/src/pages/Profile.tsx
+++ b/frontend/src/pages/Profile.tsx
@@ -42,7 +42,10 @@ const Profile = () => {
   const [currentPassword, setCurrentPassword] = useState('');
   const [newPassword, setNewPassword] = useState('');
   const [confirmPassword, setConfirmPassword] = useState('');
-  const [passwordMessage, setPasswordMessage] = useState({ type: '', text: '' });
+  const [passwordMessage, setPasswordMessage] = useState({
+    type: '',
+    text: '',
+  });
   const [changingPassword, setChangingPassword] = useState(false);
 
   useEffect(() => {
@@ -132,11 +135,17 @@ const Profile = () => {
         setMessage({ type: 'success', text: 'Profile updated successfully!' });
       } else {
         const error = await response.json();
-        setMessage({ type: 'error', text: error.message || 'Failed to update profile' });
+        setMessage({
+          type: 'error',
+          text: error.message || 'Failed to update profile',
+        });
       }
     } catch (error) {
       console.error('Error updating profile:', error);
-      setMessage({ type: 'error', text: 'An error occurred while updating your profile' });
+      setMessage({
+        type: 'error',
+        text: 'An error occurred while updating your profile',
+      });
     } finally {
       setSaving(false);
     }
@@ -154,7 +163,10 @@ const Profile = () => {
 
     // Validate password length
     if (newPassword.length < 6) {
-      setPasswordMessage({ type: 'error', text: 'Password must be at least 6 characters' });
+      setPasswordMessage({
+        type: 'error',
+        text: 'Password must be at least 6 characters',
+      });
       return;
     }
 
@@ -183,11 +195,17 @@ const Profile = () => {
         setNewPassword('');
         setConfirmPassword('');
       } else {
-        setPasswordMessage({ type: 'error', text: data.message || 'Failed to change password' });
+        setPasswordMessage({
+          type: 'error',
+          text: data.message || 'Failed to change password',
+        });
       }
     } catch (error) {
       console.error('Error changing password:', error);
-      setPasswordMessage({ type: 'error', text: 'An error occurred while changing your password' });
+      setPasswordMessage({
+        type: 'error',
+        text: 'An error occurred while changing your password',
+      });
     } finally {
       setChangingPassword(false);
     }
@@ -375,12 +393,18 @@ const Profile = () => {
         {/* Change Password Card */}
         <Card sx={{ mt: 4 }}>
           <CardContent sx={{ p: 4 }}>
-            <Typography variant="h6" sx={{ mb: 2, fontWeight: 600, color: '#e8eaed' }}>
+            <Typography
+              variant="h6"
+              sx={{ mb: 2, fontWeight: 600, color: '#e8eaed' }}
+            >
               Change Password
             </Typography>
 
             {passwordMessage.text && (
-              <Alert severity={passwordMessage.type as 'success' | 'error'} sx={{ mb: 3 }}>
+              <Alert
+                severity={passwordMessage.type as 'success' | 'error'}
+                sx={{ mb: 3 }}
+              >
                 {passwordMessage.text}
               </Alert>
             )}
@@ -432,7 +456,9 @@ const Profile = () => {
                   startIcon={<LockIcon />}
                   disabled={changingPassword}
                 >
-                  {changingPassword ? 'Changing Password...' : 'Change Password'}
+                  {changingPassword
+                    ? 'Changing Password...'
+                    : 'Change Password'}
                 </Button>
               </Stack>
             </form>
diff --git a/frontend/src/pages/Register.tsx b/frontend/src/pages/Register.tsx
index dba3342..b3b1539 100644
--- a/frontend/src/pages/Register.tsx
+++ b/frontend/src/pages/Register.tsx
@@ -66,7 +66,11 @@ const Register = () => {
       }
     } catch (err: unknown) {
       console.error('Registration error:', err);
-      setError(err instanceof Error ? err.message : 'Cannot connect to server. Please make sure the backend is running.');
+      setError(
+        err instanceof Error
+          ? err.message
+          : 'Cannot connect to server. Please make sure the backend is running.',
+      );
     } finally {
       setLoading(false);
     }
diff --git a/frontend/src/pages/ResetPassword.tsx b/frontend/src/pages/ResetPassword.tsx
index 04afd97..b726b9c 100644
--- a/frontend/src/pages/ResetPassword.tsx
+++ b/frontend/src/pages/ResetPassword.tsx
@@ -27,7 +27,9 @@ const ResetPassword = () => {
 
   useEffect(() => {
     if (!token) {
-      setError('Invalid or missing reset token. Please request a new password reset link.');
+      setError(
+        'Invalid or missing reset token. Please request a new password reset link.',
+      );
     }
   }, [token]);
 
diff --git a/frontend/src/services/inventory.service.ts b/frontend/src/services/inventory.service.ts
index 3b477bc..a57f126 100644
--- a/frontend/src/services/inventory.service.ts
+++ b/frontend/src/services/inventory.service.ts
@@ -93,7 +93,8 @@ const buildInventoryQuery = (params: InventorySearchParams) => {
   if (params.uexItemId !== undefined) query.uex_item_id = params.uexItemId;
   if (params.locationId !== undefined) query.location_id = params.locationId;
   if (params.sharedOnly !== undefined) query.shared_only = params.sharedOnly;
-  if (params.sharedOrgId !== undefined) query.shared_org_id = params.sharedOrgId;
+  if (params.sharedOrgId !== undefined)
+    query.shared_org_id = params.sharedOrgId;
   if (params.search) query.search = params.search;
   if (params.minQuantity !== undefined) query.min_quantity = params.minQuantity;
   if (params.maxQuantity !== undefined) query.max_quantity = params.maxQuantity;
@@ -185,7 +186,12 @@ export const inventoryService = {
   /**
    * Create new inventory item
    */
-  async createItem(item: Omit<InventoryItem, 'id' | 'userId' | 'dateAdded' | 'dateModified' | 'active'>): Promise<InventoryItem> {
+  async createItem(
+    item: Omit<
+      InventoryItem,
+      'id' | 'userId' | 'dateAdded' | 'dateModified' | 'active'
+    >,
+  ): Promise<InventoryItem> {
     const response = await axios.post(`${API_URL}/api/inventory`, item, {
       headers: getAuthHeader(),
     });
@@ -195,10 +201,17 @@ export const inventoryService = {
   /**
    * Update inventory item
    */
-  async updateItem(id: string, updates: Partial<InventoryItem>): Promise<InventoryItem> {
-    const response = await axios.put(`${API_URL}/api/inventory/${id}`, updates, {
-      headers: getAuthHeader(),
-    });
+  async updateItem(
+    id: string,
+    updates: Partial<InventoryItem>,
+  ): Promise<InventoryItem> {
+    const response = await axios.put(
+      `${API_URL}/api/inventory/${id}`,
+      updates,
+      {
+        headers: getAuthHeader(),
+      },
+    );
     return response.data;
   },
 
@@ -268,13 +281,10 @@ export const inventoryService = {
       offset?: number;
     },
   ): Promise<InventoryListResponse> {
-    const response = await axios.get(
-      `${API_URL}/api/orgs/${orgId}/inventory`,
-      {
-        params: buildOrgInventoryQuery(params),
-        headers: getAuthHeader(),
-      },
-    );
+    const response = await axios.get(`${API_URL}/api/orgs/${orgId}/inventory`, {
+      params: buildOrgInventoryQuery(params),
+      headers: getAuthHeader(),
+    });
 
     return response.data;
   },
diff --git a/frontend/src/services/uex.service.ts b/frontend/src/services/uex.service.ts
index ca3eb99..48fbd37 100644
--- a/frontend/src/services/uex.service.ts
+++ b/frontend/src/services/uex.service.ts
@@ -40,7 +40,9 @@ export interface StarSystem {
 }
 
 export const uexService = {
-  async searchItems(params: CatalogSearchParams): Promise<CatalogSearchResponse> {
+  async searchItems(
+    params: CatalogSearchParams,
+  ): Promise<CatalogSearchResponse> {
     const response = await axios.get(`${API_URL}/api/uex/items`, {
       params,
       headers: getAuthHeader(),
diff --git a/frontend/src/utils/focusController.test.ts b/frontend/src/utils/focusController.test.ts
index 580d673..01cfdad 100644
--- a/frontend/src/utils/focusController.test.ts
+++ b/frontend/src/utils/focusController.test.ts
@@ -18,8 +18,12 @@ describe('FocusController', () => {
     const calls: string[] = [];
     const controller = makeController(['row-1']);
 
-    controller.register('row-1', 'location', () => calls.push('row-1:location'));
-    controller.register('row-1', 'quantity', () => calls.push('row-1:quantity'));
+    controller.register('row-1', 'location', () =>
+      calls.push('row-1:location'),
+    );
+    controller.register('row-1', 'quantity', () =>
+      calls.push('row-1:quantity'),
+    );
     controller.register('row-1', 'save', () => calls.push('row-1:save'));
 
     await controller.focusNext('row-1', 'location');
@@ -31,7 +35,9 @@ describe('FocusController', () => {
     const controller = makeController(['row-1', 'row-2']);
 
     controller.register('row-1', 'save', () => calls.push('row-1:save'));
-    controller.register('row-2', 'location', () => calls.push('row-2:location'));
+    controller.register('row-2', 'location', () =>
+      calls.push('row-2:location'),
+    );
 
     await controller.focusNext('row-1', 'save');
     expect(calls).toContain('row-2:location');
@@ -45,7 +51,9 @@ describe('FocusController', () => {
     });
 
     controller.register('row-1', 'save', () => calls.push('row-1:save'));
-    controller.register('row-2', 'location', () => calls.push('row-2:location'));
+    controller.register('row-2', 'location', () =>
+      calls.push('row-2:location'),
+    );
 
     await controller.focusNext('row-1', 'save');
     expect(calls).toEqual(['boundary:row-1', 'row-2:location']);
diff --git a/frontend/src/utils/focusController.ts b/frontend/src/utils/focusController.ts
index 16ef179..9fbb291 100644
--- a/frontend/src/utils/focusController.ts
+++ b/frontend/src/utils/focusController.ts
@@ -36,7 +36,11 @@ export class FocusController<RowKey, FieldKey> {
    * Register a focus callback for a row/field combination.
    * Returns an unregister function.
    */
-  register(rowKey: RowKey, fieldKey: FieldKey, focus: FocusCallback): () => void {
+  register(
+    rowKey: RowKey,
+    fieldKey: FieldKey,
+    focus: FocusCallback,
+  ): () => void {
     let fields = this.registry.get(rowKey);
     if (!fields) {
       fields = new Map<FieldKey, FocusCallback>();
@@ -81,7 +85,10 @@ export class FocusController<RowKey, FieldKey> {
    * Advance focus to the next field in the same row, or the next row's first field.
    * If at the last row, delegates to onBoundary to resolve the next target (e.g., next page).
    */
-  async focusNext(currentRow: RowKey, currentField: FieldKey): Promise<boolean> {
+  async focusNext(
+    currentRow: RowKey,
+    currentField: FieldKey,
+  ): Promise<boolean> {
     const fieldIndex = this.fieldOrder.indexOf(currentField);
     const rowOrder = this.getRowOrder();
     const rowIndex = rowOrder.indexOf(currentRow);