Create Organisation Fix

PostFundManagement.ConsoleUI/src/components/users/CreateUserModal.tsx

@@ -6,7 +6,7 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
 import { UserPlus, Shield, Hash, Mail, Phone, Lock, Building, CheckCircle2 } from 'lucide-react';
 import { Modal } from '../ui/Modal';
 import { useToast } from '../ui/Toast';
-import { createUser, getSystemRoles, assignUserRole, getTenants } from '../../services/api';
+import { createUser, getSystemRoles, assignUserRole, getTenants, getUsers } from '../../services/api';
 import { useAuth } from '../../auth/AuthProvider';
 import { useRbac } from '../../auth/rbac';
 import { CreateUserRequest, Role, Tenant } from '../../types';
@@ -136,8 +136,22 @@ export const CreateUserModal: React.FC<CreateUserModalProps> = ({
 
       await createUser(values.tenantId, values.idNumber.trim(), payload);
 
-      // If an initial role was chosen and we have a newly generated user,
-      // invalidate query cache to refresh directory
+      if (values.initialRoleId) {
+        try {
+          await queryClient.invalidateQueries({ queryKey: ['users-directory'] });
+          await queryClient.invalidateQueries({ queryKey: ['users'] });
+          const freshUsers = await getUsers(1, 1000, { email: values.email.trim() });
+          const createdUser = freshUsers.find(
+            (u) => u.email && u.email.toLowerCase() === values.email.trim().toLowerCase()
+          );
+          if (createdUser) {
+            await assignUserRole(createdUser.id, values.initialRoleId);
+          }
+        } catch {
+          // Graceful fallback
+        }
+      }
+
       return values;
     },
     onSuccess: (values) => {