Merge branch 'dev' into freight/nati-2

# Conflicts:
#	apps/edr-freight-api/src/app.module.ts
#	apps/edr-freight-api/src/seed/freight-permissions.registry.ts
#	apps/edr-freight-web/backoffice/src/components/layout/sidebar-sections.tsx
#	apps/edr-freight-web/backoffice/src/constants/URLS.ts
#	apps/edr-freight-web/backoffice/src/lib/permissions.ts

apps/edr-freight-web/backoffice/src/App.tsx

@@ -19,6 +19,7 @@ import ForgotPasswordPage from "./pages/auth/ForgotPasswordPage";
 import BookingContractPage from "./pages/bookings/BookingContractPage";
 import BookingRequestDetailPage from "./pages/bookings/BookingRequestDetailPage";
 import BookingRequestsPage from "./pages/bookings/BookingRequestsPage";
+import ConsolidationApprovalsPage from "./pages/bookings/ConsolidationApprovalsPage";
 import NewBookingPage from "./pages/bookings/NewBookingPage";
 import WagonCancellationsPage from "./pages/bookings/WagonCancellationsPage";
 import ContractRequestsPage from "./pages/contracts/ContractRequestsPage";
@@ -87,6 +88,7 @@ import TrainSchedulingGlobalRulesPage from "./pages/trainScheduling/TrainSchedul
 import TradeAccessPage from "./pages/configuration/TradeAccessPage";
 import OperationsStandardsPage from "./pages/settings/OperationsStandardsPage";
 import ExchangeRateSettingsCard from "./pages/settings/ExchangeRateSettingsCard";
+import ManualPaymentSettingsCard from "./pages/settings/ManualPaymentSettingsCard";
 import FirstMilePage from "./pages/operations/FirstMilePage";
 import LastMilePage from "./pages/operations/LastMilePage";
 import TrainDetailPage from "./pages/trains/TrainDetailPage";
@@ -116,6 +118,7 @@ import FaydaCallbackPage from "./pages/FaydaCallbackPage";
 import { UserManagementRoutes } from "./user-management/route";
 import SetPassword from "./shared/components/SetPassword";
 import SupportInboxPage from "./pages/support/SupportInboxPage";
+import ChatLaunchPage from "./pages/chat/ChatLaunchPage";
 import {
   APP_TITLE,
   buildSidebarSections,
@@ -299,6 +302,14 @@ const App = () => {
             </RequirePermission>
           }
         />
+        <Route
+          path="chat"
+          element={
+            <RequirePermission permission={FREIGHT_PERMS.chat.view}>
+              <ChatLaunchPage />
+            </RequirePermission>
+          }
+        />
         <Route
           path="customers"
           element={
@@ -381,6 +392,18 @@ const App = () => {
             </RequirePermission>
           }
         />
+        {/* Shared-wagon gate: consolidated pairs wait for a human decision
+            before either half reaches Operations. */}
+        <Route
+          path="consolidation-approvals"
+          element={
+            <RequirePermission
+              permission={FREIGHT_PERMS.bookings.approveConsolidation}
+            >
+              <ConsolidationApprovalsPage />
+            </RequirePermission>
+          }
+        />
         <Route
           path="booking-requests/:id"
           element={
@@ -1148,6 +1171,18 @@ const App = () => {
             </RequirePermission>
           }
         />
+        <Route
+          path="configuration/manual-payments"
+          element={
+            <RequirePermission
+              permission={FREIGHT_PERMS.settings.manualPayment.view}
+            >
+              <div className="p-4">
+                <ManualPaymentSettingsCard />
+              </div>
+            </RequirePermission>
+          }
+        />
         <Route
           path="configuration/exchange-rate"
           element={