diff --git a/apps/edr-freight-web/backoffice/vite.config.ts b/apps/edr-freight-web/backoffice/vite.config.ts
index 0772bea14..f5a3563a8 100644
--- a/apps/edr-freight-web/backoffice/vite.config.ts
+++ b/apps/edr-freight-web/backoffice/vite.config.ts
@@ -1,23 +1,35 @@
 import path from "node:path";
 import { fileURLToPath } from "node:url";
+import type { IncomingMessage, ServerResponse } from "node:http";
 
-/// <reference types="vitest/config" />
-import { defineConfig } from "vite";
+import { defineConfig } from "vitest/config";
 import react from "@vitejs/plugin-react";
 import tailwindcss from "@tailwindcss/vite";
+import type { ViteDevServer, PreviewServer } from "vite";
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
+
 function userManagementSpaFallback() {
-  const rewrite = (req) => {
-    const url = req.url || '';
+  const rewrite = (req: IncomingMessage) => {
+    const url = req.url ?? '';
     if (!url.startsWith('/_um/') && url !== '/_um') return;
     if (/\.[a-zA-Z0-9]+$/.test(url.split('?')[0])) return;
     req.url = '/_um/index.html';
   };
   return {
     name: 'user-management-spa-fallback',
-    configureServer(s){ s.middlewares.use((req,_r,next)=>{rewrite(req);next();}); },
-    configurePreviewServer(s){ s.middlewares.use((req,_r,next)=>{rewrite(req);next();}); },
+    configureServer(s: ViteDevServer) {
+      s.middlewares.use((req: IncomingMessage, _r: ServerResponse, next: () => void) => {
+        rewrite(req);
+        next();
+      });
+    },
+    configurePreviewServer(s: PreviewServer) {
+      s.middlewares.use((req: IncomingMessage, _r: ServerResponse, next: () => void) => {
+        rewrite(req);
+        next();
+      });
+    },
   };
 }
 
@@ -29,6 +41,11 @@ export default defineConfig({
       // Resolve from TS source so Vite gets ESM named exports (dist is CommonJS).
       "@edr/types": path.resolve(__dirname, "../../../packages/types/src/index.ts"),
     },
+    // Force a single copy of these singletons so MantineProvider context is
+    // shared between the backoffice app and @edr/ui-common (which ships its
+    // own node_modules copy). Without this, two separate @mantine/core
+    // instances are bundled and the context lookup fails at runtime.
+    dedupe: ["react", "react-dom", "@mantine/core", "@mantine/hooks"],
   },
   server: {
     port: 5183,
diff --git a/packages/types/src/common/payments.ts b/packages/types/src/common/payments.ts
index 6439395f4..ebc6e34dd 100644
--- a/packages/types/src/common/payments.ts
+++ b/packages/types/src/common/payments.ts
@@ -137,7 +137,7 @@ export interface ConfirmPaymentRequest {
 }
 
 /** Response of `POST /payments/initiate` and shape of intent lookups. */
-export interface PaymentIntentSnapshot {
+export type PaymentIntentSnapshot ={
   intentId: string;
   service: PaymentService;
   referenceType: PaymentReferenceType;