diff --git a/packages/frontend/src/components/projects/project/settings/DomainCard.tsx b/packages/frontend/src/components/projects/project/settings/DomainCard.tsx
index 1a68cb0..f1b8c55 100644
--- a/packages/frontend/src/components/projects/project/settings/DomainCard.tsx
+++ b/packages/frontend/src/components/projects/project/settings/DomainCard.tsx
@@ -155,6 +155,7 @@ const DomainCard = ({ domain, repo, project }: DomainCardProps) => {
           </table>
         </Card>
       )}
+
       <EditDomainDialog
         handleOpen={() => {
           setEditDialogOpen((preVal) => !preVal);
diff --git a/packages/frontend/src/components/projects/project/settings/Domains.tsx b/packages/frontend/src/components/projects/project/settings/Domains.tsx
index b4b6f80..f6e9159 100644
--- a/packages/frontend/src/components/projects/project/settings/Domains.tsx
+++ b/packages/frontend/src/components/projects/project/settings/Domains.tsx
@@ -5,8 +5,6 @@ import { Button, Typography } from '@material-tailwind/react';
 
 import DomainCard from './DomainCard';
 import { DomainDetails } from '../../../../types/project';
-import domainsData from '../../../../assets/domains.json';
-import repositories from '../../../../assets/repositories.json';
 
 const Domains = () => {
   const { id } = useParams();
@@ -15,15 +13,23 @@ const Domains = () => {
   const { projects } = useOutletContext();
 
   const currProject = useMemo(() => {
-    return projects.find((data: any) => Number(data.id) === Number(id));
+    return projects.find((data: any) => {
+      return Number(data?.id) === Number(id);
+    });
   }, [id]);
 
   const linkedRepo = useMemo(() => {
-    return repositories.find(
-      (repo) => repo.id === Number(currProject?.repositoryId),
+    return currProject.repositories.find(
+      (repo: any) => repo.id === Number(currProject?.repositoryId),
     );
   }, [currProject]);
 
+  const domains = currProject.deployments
+    .filter((deployment: any) => {
+      return deployment.domain != null;
+    })
+    .map((deployment: any) => deployment.domain);
+
   return (
     <>
       <div className="flex justify-between p-2">
@@ -35,7 +41,7 @@ const Domains = () => {
         </Link>
       </div>
 
-      {(domainsData as DomainDetails[]).map((domain) => {
+      {(domains as DomainDetails[]).map((domain) => {
         return (
           <DomainCard
             domain={domain}
diff --git a/packages/frontend/src/layouts/ProjectSearch.tsx b/packages/frontend/src/layouts/ProjectSearch.tsx
index f1753f5..d3a65bd 100644
--- a/packages/frontend/src/layouts/ProjectSearch.tsx
+++ b/packages/frontend/src/layouts/ProjectSearch.tsx
@@ -30,6 +30,16 @@ const ProjectSearch = () => {
               hash: '',
               message: '',
             },
+            domain: deployment.domain
+              ? {
+                  ...deployment.domain,
+                  record: {
+                    type: '',
+                    name: '',
+                    value: '',
+                  },
+                }
+              : null,
           };
         });
 
@@ -44,7 +54,17 @@ const ProjectSearch = () => {
           domain: null,
           createdBy: project.owner.name,
           source: '',
-          repositoryId: project.repository,
+          repositoryId: 0,
+          repositories: [
+            {
+              id: 0,
+              title: project.repository,
+              updatedAt: '',
+              user: '',
+              private: false,
+              branch: [''],
+            },
+          ],
           // TODO: populate from github API
           latestCommit: {
             message: '',
diff --git a/packages/frontend/src/types/project.ts b/packages/frontend/src/types/project.ts
index 62358e0..30d95df 100644
--- a/packages/frontend/src/types/project.ts
+++ b/packages/frontend/src/types/project.ts
@@ -75,8 +75,8 @@ export enum GitSelect {
 }
 
 export enum DomainStatus {
-  LIVE = 'live',
-  PENDING = 'pending',
+  LIVE = 'Live',
+  PENDING = 'Pending',
 }
 
 export interface DomainDetails {