From 65405213b652428a27cb19dbfc454505610fc7f6 Mon Sep 17 00:00:00 2001
From: Neeraj <neeraj.rtly@gmail.com>
Date: Mon, 21 Oct 2024 15:27:40 +0530
Subject: [PATCH 1/6] Remove organization switcher from sidebar

---
 packages/frontend/src/components/Logo.tsx     |  9 +--
 .../src/components/shared/Sidebar/Sidebar.tsx | 63 ++-----------------
 .../frontend/src/pages/org-slug/layout.tsx    |  5 +-
 3 files changed, 9 insertions(+), 68 deletions(-)

diff --git a/packages/frontend/src/components/Logo.tsx b/packages/frontend/src/components/Logo.tsx
index 6b6d8131..c3bceb09 100644
--- a/packages/frontend/src/components/Logo.tsx
+++ b/packages/frontend/src/components/Logo.tsx
@@ -1,13 +1,7 @@
-import { Link } from 'react-router-dom';
 import { Heading } from './shared/Heading';
 
-interface LogoProps {
-  orgSlug?: string;
-}
-
-export const Logo = ({ orgSlug }: LogoProps) => {
+export const Logo = () => {
   return (
-    <Link to={`/${orgSlug}`}>
       <div className="flex items-center gap-3 px-0 lg:px-2">
         <img
           src="/logo.svg"
@@ -18,6 +12,5 @@ export const Logo = ({ orgSlug }: LogoProps) => {
           Snowball
         </Heading>
       </div>
-    </Link>
   );
 };
diff --git a/packages/frontend/src/components/shared/Sidebar/Sidebar.tsx b/packages/frontend/src/components/shared/Sidebar/Sidebar.tsx
index 9c0ca570..daad9918 100644
--- a/packages/frontend/src/components/shared/Sidebar/Sidebar.tsx
+++ b/packages/frontend/src/components/shared/Sidebar/Sidebar.tsx
@@ -1,6 +1,6 @@
-import { useCallback, useEffect, useMemo, useState } from 'react';
-import { NavLink, useNavigate, useParams } from 'react-router-dom';
-import { Organization, User } from 'gql-client';
+import { useCallback, useEffect, useState } from 'react';
+import { useNavigate } from 'react-router-dom';
+import { User } from 'gql-client';
 import { motion } from 'framer-motion';
 import { useDisconnect } from 'wagmi';
 
@@ -19,8 +19,6 @@ import { getInitials } from 'utils/geInitials';
 import { Button } from 'components/shared/Button';
 import { cn } from 'utils/classnames';
 import { useMediaQuery } from 'usehooks-ts';
-import { SIDEBAR_MENU } from './constants';
-import { UserSelect } from 'components/shared/UserSelect';
 import { BASE_URL } from 'utils/constants';
 
 interface SidebarProps {
@@ -28,7 +26,6 @@ interface SidebarProps {
 }
 
 export const Sidebar = ({ mobileOpen }: SidebarProps) => {
-  const { orgSlug } = useParams();
   const navigate = useNavigate();
   const client = useGQLClient();
   const isDesktop = useMediaQuery('(min-width: 960px)');
@@ -45,46 +42,6 @@ export const Sidebar = ({ mobileOpen }: SidebarProps) => {
     fetchUser();
   }, []);
 
-  const [selectedOrgSlug, setSelectedOrgSlug] = useState(orgSlug);
-  const [organizations, setOrganizations] = useState<Organization[]>([]);
-
-  const fetchUserOrganizations = useCallback(async () => {
-    const { organizations } = await client.getOrganizations();
-    setOrganizations(organizations);
-  }, [orgSlug]);
-
-  useEffect(() => {
-    fetchUserOrganizations();
-    setSelectedOrgSlug(orgSlug);
-  }, [orgSlug]);
-
-  const formattedSelected = useMemo(() => {
-    const selected = organizations.find((org) => org.slug === selectedOrgSlug);
-    return {
-      value: selected?.slug ?? '',
-      label: selected?.name ?? '',
-      imgSrc: '/logo.svg',
-    };
-  }, [organizations, selectedOrgSlug, orgSlug]);
-
-  const formattedSelectOptions = useMemo(() => {
-    return organizations.map((org) => ({
-      value: org.slug,
-      label: org.name,
-      imgSrc: '/logo.svg',
-    }));
-  }, [organizations, selectedOrgSlug, orgSlug]);
-
-  const renderMenu = useMemo(() => {
-    return SIDEBAR_MENU(orgSlug).map(({ title, icon, url }, index) => (
-      <NavLink to={url} key={index}>
-        <Tabs.Trigger icon={icon} value={title}>
-          {title}
-        </Tabs.Trigger>
-      </NavLink>
-    ));
-  }, [orgSlug]);
-
   const handleLogOut = useCallback(async () => {
     await fetch(`${BASE_URL}/auth/logout`, {
       method: 'POST',
@@ -115,18 +72,10 @@ export const Sidebar = ({ mobileOpen }: SidebarProps) => {
       >
         {/* Logo */}
         <div className="hidden lg:flex">
-          <Logo orgSlug={orgSlug} />
-        </div>
-        {/* Switch organization */}
-        <div className="flex flex-1 flex-col gap-4">
-          <UserSelect
-            value={formattedSelected}
-            options={formattedSelectOptions}
-          />
-          <Tabs defaultValue="Projects" orientation="vertical">
-            <Tabs.List>{renderMenu}</Tabs.List>
-          </Tabs>
+          <Logo />
         </div>
+        {/* This element ensures the space between logo and navigation */}
+        <div className="flex-1"></div>
         {/* Bottom navigation */}
         <div className="flex flex-col gap-5 justify-end">
           <Tabs defaultValue="Projects" orientation="vertical">
diff --git a/packages/frontend/src/pages/org-slug/layout.tsx b/packages/frontend/src/pages/org-slug/layout.tsx
index b1bf2226..4cf7955a 100644
--- a/packages/frontend/src/pages/org-slug/layout.tsx
+++ b/packages/frontend/src/pages/org-slug/layout.tsx
@@ -9,7 +9,7 @@ import {
 import { Sidebar } from 'components/shared/Sidebar';
 import { OctokitProvider } from 'context/OctokitContext';
 import { ComponentPropsWithoutRef, useEffect, useState } from 'react';
-import { Outlet, useParams } from 'react-router-dom';
+import { Outlet } from 'react-router-dom';
 import { AnimatePresence, motion } from 'framer-motion';
 import { cn } from 'utils/classnames';
 import { useMediaQuery } from 'usehooks-ts';
@@ -22,7 +22,6 @@ export const DashboardLayout = ({
   className,
   ...props
 }: DashboardLayoutProps) => {
-  const { orgSlug } = useParams();
   const isDesktop = useMediaQuery('(min-width: 960px)');
 
   const [isSidebarOpen, setIsSidebarOpen] = useState(false);
@@ -45,7 +44,7 @@ export const DashboardLayout = ({
       >
         {/* Header on mobile */}
         <div className="flex lg:hidden items-center px-4 py-2.5 justify-between">
-          <Logo orgSlug={orgSlug} />
+          <Logo />
           <div className="flex items-center gap-0.5">
             <AnimatePresence>
               {isSidebarOpen ? (
-- 
2.45.2


From 76d72a72c624f760af6283e22dd99da4b71cd142 Mon Sep 17 00:00:00 2001
From: Neeraj <neeraj.rtly@gmail.com>
Date: Tue, 22 Oct 2024 10:44:15 +0530
Subject: [PATCH 2/6] Display DNS URLs in overview tab

---
 .../pages/org-slug/projects/id/Overview.tsx   | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/packages/frontend/src/pages/org-slug/projects/id/Overview.tsx b/packages/frontend/src/pages/org-slug/projects/id/Overview.tsx
index 0e495065..66e97359 100644
--- a/packages/frontend/src/pages/org-slug/projects/id/Overview.tsx
+++ b/packages/frontend/src/pages/org-slug/projects/id/Overview.tsx
@@ -129,15 +129,19 @@ const OverviewTabPanel = () => {
             <Heading className="text-lg leading-6 font-medium truncate">
               {project.name}
             </Heading>
-            {project.baseDomains && project.baseDomains.length > 0 && project.baseDomains.map((baseDomain, index) => (
-              <a
-                key={index}
-                href={`https://${project.name}.${baseDomain}`}
-                className="text-sm text-elements-low-em tracking-tight truncate"
-              >
-                {baseDomain}
-              </a>
-            ))}
+            {project.baseDomains &&
+              project.baseDomains.length > 0 &&
+              project.baseDomains.map((baseDomain, index) => (
+                <p>
+                  <a
+                    key={index}
+                    href={`https://${project.name}.${baseDomain}`}
+                    className="text-sm text-elements-low-em tracking-tight truncate"
+                  >
+                    {baseDomain}
+                  </a>
+                </p>
+              ))}
           </div>
         </div>
         <OverviewInfo label="Domain" icon={<GlobeIcon />}>
@@ -209,7 +213,7 @@ const OverviewTabPanel = () => {
             No current deployment found.
           </p>
         )}
-        {project.auctionId && <AuctionCard project={project}/>}
+        {project.auctionId && <AuctionCard project={project} />}
       </div>
       <Activity activities={activities} isLoading={fetchingActivities} />
     </div>
-- 
2.45.2


From 2b00028935936990936165c76b6fb16e8637fdbf Mon Sep 17 00:00:00 2001
From: Neeraj <neeraj.rtly@gmail.com>
Date: Tue, 22 Oct 2024 11:24:17 +0530
Subject: [PATCH 3/6] Update snowball repo URL

---
 packages/deployer/deploy-frontend.staging.sh                    | 2 +-
 packages/deployer/records/application-deployment-request.yml    | 2 +-
 packages/deployer/records/application-record.yml                | 2 +-
 .../deployer/staging-records/application-deployment-request.yml | 2 +-
 packages/deployer/staging-records/application-record.yml        | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/deployer/deploy-frontend.staging.sh b/packages/deployer/deploy-frontend.staging.sh
index 0aba8e70..2672ddbd 100755
--- a/packages/deployer/deploy-frontend.staging.sh
+++ b/packages/deployer/deploy-frontend.staging.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Repository URL
-REPO_URL="https://github.com/snowball-tools/snowballtools-base"
+REPO_URL="https://git.vdb.to/cerc-io/snowballtools-base"
 
 # Get the latest commit hash from the repository
 LATEST_HASH=$(git ls-remote $REPO_URL HEAD | awk '{print $1}')
diff --git a/packages/deployer/records/application-deployment-request.yml b/packages/deployer/records/application-deployment-request.yml
index eb2eccb6..4ac07d40 100644
--- a/packages/deployer/records/application-deployment-request.yml
+++ b/packages/deployer/records/application-deployment-request.yml
@@ -14,5 +14,5 @@ record:
       LACONIC_HOSTED_CONFIG_app_wallet_connect_id: eda9ba18042a5ea500f358194611ece2
   meta:
     note: Added by Snowball @ Thu Apr  4 14:49:41 UTC 2024
-    repository: "https://github.com/snowball-tools/snowballtools-base"
+    repository: "https://git.vdb.to/cerc-io/snowballtools-base"
     repository_ref: 351db16336eacc3e1f9119ceb8d1282b8e27a27e
diff --git a/packages/deployer/records/application-record.yml b/packages/deployer/records/application-record.yml
index ea3538f9..9c1d614c 100644
--- a/packages/deployer/records/application-record.yml
+++ b/packages/deployer/records/application-record.yml
@@ -2,7 +2,7 @@ record:
   type: ApplicationRecord
   version: 0.0.2
   repository_ref: 351db16336eacc3e1f9119ceb8d1282b8e27a27e
-  repository: ["https://github.com/snowball-tools/snowballtools-base"]
+  repository: ["https://git.vdb.to/cerc-io/snowballtools-base"]
   app_type: webapp
   name: snowballtools-base-frontend
   app_version: 0.1.8
diff --git a/packages/deployer/staging-records/application-deployment-request.yml b/packages/deployer/staging-records/application-deployment-request.yml
index 1378a94c..e3a022a7 100644
--- a/packages/deployer/staging-records/application-deployment-request.yml
+++ b/packages/deployer/staging-records/application-deployment-request.yml
@@ -20,5 +20,5 @@ record:
       LACONIC_HOSTED_CONFIG_turnkey_organization_id: 5049ae99-5bca-40b3-8317-504384d4e591
   meta:
     note: Added by Snowball @ Mon Jun 24 23:51:48 UTC 2024
-    repository: "https://github.com/snowball-tools/snowballtools-base"
+    repository: "https://git.vdb.to/cerc-io/snowballtools-base"
     repository_ref: 61e3e88a6c9d57e95441059369ee5a46f5c07601
diff --git a/packages/deployer/staging-records/application-record.yml b/packages/deployer/staging-records/application-record.yml
index cbfa4af6..fa9b4089 100644
--- a/packages/deployer/staging-records/application-record.yml
+++ b/packages/deployer/staging-records/application-record.yml
@@ -2,7 +2,7 @@ record:
   type: ApplicationRecord
   version: 0.0.1
   repository_ref: 61e3e88a6c9d57e95441059369ee5a46f5c07601
-  repository: ["https://github.com/snowball-tools/snowballtools-base"]
+  repository: ["https://git.vdb.to/cerc-io/snowballtools-base"]
   app_type: webapp
   name: staging-snowballtools-base-frontend
   app_version: 0.0.0
-- 
2.45.2


From da6dd3c442e1b960a9eb990faac193a8f8dc9226 Mon Sep 17 00:00:00 2001
From: Neeraj <neeraj.rtly@gmail.com>
Date: Tue, 22 Oct 2024 14:38:22 +0530
Subject: [PATCH 4/6] Add loader to redeploy confirm dialog button

---
 packages/frontend/src/components/Logo.tsx     | 20 ++---
 .../Dialog/ChangeStateToProductionDialog.tsx  | 14 ++++
 .../components/projects/create/Configure.tsx  | 79 ++++++++++++-------
 .../ProjectRepoCard/ProjectRepoCard.tsx       |  2 +-
 .../deployments/DeploymentDetailsCard.tsx     | 31 +++++---
 .../project/deployments/DeploymentMenu.tsx    | 12 +++
 .../project/overview/Activity/AuctionCard.tsx | 49 ++++++++----
 .../project/settings/DeleteProjectDialog.tsx  |  6 +-
 .../frontend/src/context/Web3Provider.tsx     |  2 +-
 packages/frontend/src/index.tsx               | 11 ++-
 packages/frontend/src/pages/auth/Login.tsx    |  2 +-
 .../frontend/src/pages/components/modals.tsx  |  5 +-
 .../org-slug/projects/create/success/Id.tsx   |  6 +-
 .../projects/create/template/index.tsx        |  4 +-
 .../pages/org-slug/projects/id/Overview.tsx   |  2 +-
 .../id/settings/EnvironmentVariables.tsx      | 26 +++---
 .../id/settings/EnvironmentVariablesForm.tsx  |  5 +-
 .../frontend/src/stories/MockStoriesData.ts   |  7 +-
 18 files changed, 187 insertions(+), 96 deletions(-)

diff --git a/packages/frontend/src/components/Logo.tsx b/packages/frontend/src/components/Logo.tsx
index c3bceb09..81cf3555 100644
--- a/packages/frontend/src/components/Logo.tsx
+++ b/packages/frontend/src/components/Logo.tsx
@@ -2,15 +2,15 @@ import { Heading } from './shared/Heading';
 
 export const Logo = () => {
   return (
-      <div className="flex items-center gap-3 px-0 lg:px-2">
-        <img
-          src="/logo.svg"
-          alt="Snowball Logo"
-          className="lg:h-10 lg:w-10 h-8 w-8 rounded-lg"
-        />
-        <Heading className="lg:text-[24px] text-[19px] font-semibold">
-          Snowball
-        </Heading>
-      </div>
+    <div className="flex items-center gap-3 px-0 lg:px-2">
+      <img
+        src="/logo.svg"
+        alt="Snowball Logo"
+        className="lg:h-10 lg:w-10 h-8 w-8 rounded-lg"
+      />
+      <Heading className="lg:text-[24px] text-[19px] font-semibold">
+        Snowball
+      </Heading>
+    </div>
   );
 };
diff --git a/packages/frontend/src/components/projects/Dialog/ChangeStateToProductionDialog.tsx b/packages/frontend/src/components/projects/Dialog/ChangeStateToProductionDialog.tsx
index 1e6d9f58..efb9c2fa 100644
--- a/packages/frontend/src/components/projects/Dialog/ChangeStateToProductionDialog.tsx
+++ b/packages/frontend/src/components/projects/Dialog/ChangeStateToProductionDialog.tsx
@@ -10,11 +10,16 @@ import {
   LinkChainIcon,
 } from 'components/shared/CustomIcon';
 import { TagProps } from 'components/shared/Tag';
+import {
+  ArrowRightCircleFilledIcon,
+  LoadingIcon,
+} from 'components/shared/CustomIcon';
 
 interface ChangeStateToProductionDialogProps extends ConfirmDialogProps {
   deployment: Deployment;
   newDeployment?: Deployment;
   domains: Domain[];
+  isConfirmButtonLoading?: boolean;
 }
 
 export const ChangeStateToProductionDialog = ({
@@ -24,6 +29,7 @@ export const ChangeStateToProductionDialog = ({
   open,
   handleCancel,
   handleConfirm,
+  isConfirmButtonLoading,
   ...props
 }: ChangeStateToProductionDialogProps) => {
   const currentChip = {
@@ -41,6 +47,14 @@ export const ChangeStateToProductionDialog = ({
       handleCancel={handleCancel}
       open={open}
       handleConfirm={handleConfirm}
+      confirmButtonProps={{
+        disabled: isConfirmButtonLoading,
+        rightIcon: isConfirmButtonLoading ? (
+          <LoadingIcon className="animate-spin" />
+        ) : (
+          <ArrowRightCircleFilledIcon />
+        ),
+      }}
     >
       <div className="flex flex-col gap-7">
         <div className="flex flex-col gap-3">
diff --git a/packages/frontend/src/components/projects/create/Configure.tsx b/packages/frontend/src/components/projects/create/Configure.tsx
index 09a0b6b4..64899f58 100644
--- a/packages/frontend/src/components/projects/create/Configure.tsx
+++ b/packages/frontend/src/components/projects/create/Configure.tsx
@@ -25,7 +25,8 @@ type ConfigureDeploymentFormValues = {
   maxPrice?: string;
 };
 
-type ConfigureFormValues = ConfigureDeploymentFormValues & EnvironmentVariablesFormValues;
+type ConfigureFormValues = ConfigureDeploymentFormValues &
+  EnvironmentVariablesFormValues;
 
 const Configure = () => {
   const [isLoading, setIsLoading] = useState(false);
@@ -55,7 +56,10 @@ const Configure = () => {
   const isTabletView = useMediaQuery('(min-width: 720px)'); // md:
   const buttonSize = isTabletView ? { size: 'lg' as const } : {};
 
-  const createProject = async (data: FieldValues, envVariables: AddEnvironmentVariableInput[]): Promise<string> => {
+  const createProject = async (
+    data: FieldValues,
+    envVariables: AddEnvironmentVariableInput[],
+  ): Promise<string> => {
     setIsLoading(true);
     let projectId: string | null = null;
 
@@ -68,7 +72,7 @@ const Configure = () => {
       } else if (data.option === 'Auction') {
         auctionParams = {
           numProviders: Number(data.numProviders!),
-          maxPrice: (data.maxPrice!).toString(),
+          maxPrice: data.maxPrice!.toString(),
         };
       }
 
@@ -86,7 +90,7 @@ const Configure = () => {
           projectData,
           lrn,
           auctionParams,
-          envVariables
+          envVariables,
         );
 
         projectId = addProjectFromTemplate.id;
@@ -101,7 +105,7 @@ const Configure = () => {
           },
           lrn,
           auctionParams,
-          envVariables
+          envVariables,
         );
 
         projectId = addProject.id;
@@ -127,39 +131,44 @@ const Configure = () => {
 
   const handleFormSubmit = useCallback(
     async (createFormData: FieldValues) => {
-      const environmentVariables = createFormData.variables.map((variable: any) => {
-        return {
-          key: variable.key,
-          value: variable.value,
-          environments: Object.entries(createFormData.environment)
-            .filter(([, value]) => value === true)
-            .map(([key]) => key.charAt(0).toUpperCase() + key.slice(1)),
-        };
-      });
+      const environmentVariables = createFormData.variables.map(
+        (variable: any) => {
+          return {
+            key: variable.key,
+            value: variable.value,
+            environments: Object.entries(createFormData.environment)
+              .filter(([, value]) => value === true)
+              .map(([key]) => key.charAt(0).toUpperCase() + key.slice(1)),
+          };
+        },
+      );
 
-      const projectId = await createProject(createFormData, environmentVariables);
+      const projectId = await createProject(
+        createFormData,
+        environmentVariables,
+      );
 
       await client.getEnvironmentVariables(projectId);
 
       if (templateId) {
         createFormData.option === 'Auction'
           ? navigate(
-            `/${orgSlug}/projects/create/success/${projectId}?isAuction=true`,
-          )
+              `/${orgSlug}/projects/create/success/${projectId}?isAuction=true`,
+            )
           : navigate(
-            `/${orgSlug}/projects/create/template/deploy?projectId=${projectId}&templateId=${templateId}`
-          );
+              `/${orgSlug}/projects/create/template/deploy?projectId=${projectId}&templateId=${templateId}`,
+            );
       } else {
         createFormData.option === 'Auction'
           ? navigate(
-            `/${orgSlug}/projects/create/success/${projectId}?isAuction=true`
-          )
+              `/${orgSlug}/projects/create/success/${projectId}?isAuction=true`,
+            )
           : navigate(
-            `/${orgSlug}/projects/create/deploy?projectId=${projectId}`
-          );
+              `/${orgSlug}/projects/create/deploy?projectId=${projectId}`,
+            );
       }
     },
-    [client, createProject, dismiss, toast]
+    [client, createProject, dismiss, toast],
   );
 
   return (
@@ -190,10 +199,15 @@ const Configure = () => {
                     value={
                       {
                         value: value || 'LRN',
-                        label: value === 'Auction' ? 'Create Auction' : 'Deployer LRN',
+                        label:
+                          value === 'Auction'
+                            ? 'Create Auction'
+                            : 'Deployer LRN',
                       } as SelectOption
                     }
-                    onChange={(value) => onChange((value as SelectOption).value)}
+                    onChange={(value) =>
+                      onChange((value as SelectOption).value)
+                    }
                     options={[
                       { value: 'LRN', label: 'Deployer LRN' },
                       { value: 'Auction', label: 'Create Auction' },
@@ -205,7 +219,10 @@ const Configure = () => {
 
             {selectedOption === 'LRN' && (
               <div className="flex flex-col justify-start gap-4 mb-6">
-                <Heading as="h5" className="text-sm font-sans text-elements-low-em">
+                <Heading
+                  as="h5"
+                  className="text-sm font-sans text-elements-low-em"
+                >
                   The app will be deployed by the configured deployer
                 </Heading>
                 <span className="text-sm text-elements-high-em">
@@ -225,8 +242,12 @@ const Configure = () => {
             {selectedOption === 'Auction' && (
               <>
                 <div className="flex flex-col justify-start gap-4 mb-6">
-                  <Heading as="h5" className="text-sm font-sans text-elements-low-em">
-                    Set the number of deployers and maximum price for each deployment
+                  <Heading
+                    as="h5"
+                    className="text-sm font-sans text-elements-low-em"
+                  >
+                    Set the number of deployers and maximum price for each
+                    deployment
                   </Heading>
                   <span className="text-sm text-elements-high-em">
                     Number of Deployers
diff --git a/packages/frontend/src/components/projects/create/ProjectRepoCard/ProjectRepoCard.tsx b/packages/frontend/src/components/projects/create/ProjectRepoCard/ProjectRepoCard.tsx
index 29b4b065..48650ca5 100644
--- a/packages/frontend/src/components/projects/create/ProjectRepoCard/ProjectRepoCard.tsx
+++ b/packages/frontend/src/components/projects/create/ProjectRepoCard/ProjectRepoCard.tsx
@@ -39,7 +39,7 @@ export const ProjectRepoCard: React.FC<ProjectRepoCardProps> = ({
     }
 
     navigate(
-      `configure?owner=${repository.owner?.login}&name=${repository.name}&defaultBranch=${repository.default_branch}&fullName=${repository.full_name}&orgSlug=${orgSlug}`
+      `configure?owner=${repository.owner?.login}&name=${repository.name}&defaultBranch=${repository.default_branch}&fullName=${repository.full_name}&orgSlug=${orgSlug}`,
     );
   }, [client, repository, orgSlug, setIsLoading, navigate, toast]);
 
diff --git a/packages/frontend/src/components/projects/project/deployments/DeploymentDetailsCard.tsx b/packages/frontend/src/components/projects/project/deployments/DeploymentDetailsCard.tsx
index 499aed76..ea5a33a1 100644
--- a/packages/frontend/src/components/projects/project/deployments/DeploymentDetailsCard.tsx
+++ b/packages/frontend/src/components/projects/project/deployments/DeploymentDetailsCard.tsx
@@ -34,13 +34,13 @@ import { formatAddress } from '../../../../utils/format';
 import { DeploymentMenu } from './DeploymentMenu';
 
 const DEPLOYMENT_LOGS_STYLE = {
-  backgroundColor: "rgba(0,0,0, .9)",
-  padding: "2em",
-  borderRadius: "0.5em",
-  marginLeft: "0.5em",
-  marginRight: "0.5em",
-  color: "gray",
-  fontSize: "small",
+  backgroundColor: 'rgba(0,0,0, .9)',
+  padding: '2em',
+  borderRadius: '0.5em',
+  marginLeft: '0.5em',
+  marginRight: '0.5em',
+  color: 'gray',
+  fontSize: 'small',
 };
 
 interface DeployDetailsCardProps {
@@ -95,7 +95,11 @@ const DeploymentDetailsCard = ({
     const logs = await res.text();
     setDeploymentLogs(logs);
     handleOpenDialog();
-  }, [deployment.deployer.deployerApiUrl, deployment.applicationDeploymentRequestId, handleOpenDialog]);
+  }, [
+    deployment.deployer.deployerApiUrl,
+    deployment.applicationDeploymentRequestId,
+    handleOpenDialog,
+  ]);
 
   const renderDeploymentStatus = useCallback(
     (className?: string) => {
@@ -201,10 +205,15 @@ const DeploymentDetailsCard = ({
           prodBranchDomains={prodBranchDomains}
         />
       </div>
-      <Dialog open={openDialog} onClose={handleCloseDialog} fullWidth maxWidth="md">
+      <Dialog
+        open={openDialog}
+        onClose={handleCloseDialog}
+        fullWidth
+        maxWidth="md"
+      >
         <DialogTitle>Deployment logs</DialogTitle>
-        <DialogContent style={DEPLOYMENT_LOGS_STYLE} >
-          {deploymentLogs && <pre >{deploymentLogs}</pre>}
+        <DialogContent style={DEPLOYMENT_LOGS_STYLE}>
+          {deploymentLogs && <pre>{deploymentLogs}</pre>}
         </DialogContent>
         <DialogActions>
           <Button onClick={handleCloseDialog}>Close</Button>
diff --git a/packages/frontend/src/components/projects/project/deployments/DeploymentMenu.tsx b/packages/frontend/src/components/projects/project/deployments/DeploymentMenu.tsx
index 51532f34..8ef1dd61 100644
--- a/packages/frontend/src/components/projects/project/deployments/DeploymentMenu.tsx
+++ b/packages/frontend/src/components/projects/project/deployments/DeploymentMenu.tsx
@@ -48,6 +48,8 @@ export const DeploymentMenu = ({
   const [redeployToProduction, setRedeployToProduction] = useState(false);
   const [rollbackDeployment, setRollbackDeployment] = useState(false);
   const [assignDomainDialog, setAssignDomainDialog] = useState(false);
+  const [isConfirmButtonLoading, setConfirmButtonLoadingLoading] =
+    useState(false);
 
   const updateDeployment = async () => {
     const isUpdated = await client.updateDeploymentToProd(deployment.id);
@@ -71,6 +73,7 @@ export const DeploymentMenu = ({
 
   const redeployToProd = async () => {
     const isRedeployed = await client.redeployToProd(deployment.id);
+    setConfirmButtonLoadingLoading(false);
     if (isRedeployed) {
       await onUpdate();
       toast({
@@ -113,6 +116,13 @@ export const DeploymentMenu = ({
   };
 
   const deleteDeployment = async () => {
+    toast({
+      id: 'deployment_going_to_be_deleted',
+      title: 'Deployment going to be deleted',
+      variant: 'success',
+      onDismiss: dismiss,
+    });
+
     const isDeleted = await client.deleteDeployment(deployment.id);
     if (isDeleted) {
       await onUpdate();
@@ -228,11 +238,13 @@ export const DeploymentMenu = ({
         open={redeployToProduction}
         confirmButtonTitle="Redeploy"
         handleConfirm={async () => {
+          setConfirmButtonLoadingLoading(true);
           await redeployToProd();
           setRedeployToProduction((preVal) => !preVal);
         }}
         deployment={deployment}
         domains={deployment.domain ? [deployment.domain] : []}
+        isConfirmButtonLoading={isConfirmButtonLoading}
       />
       {Boolean(currentDeployment) && (
         <ChangeStateToProductionDialog
diff --git a/packages/frontend/src/components/projects/project/overview/Activity/AuctionCard.tsx b/packages/frontend/src/components/projects/project/overview/Activity/AuctionCard.tsx
index a5949099..5367553d 100644
--- a/packages/frontend/src/components/projects/project/overview/Activity/AuctionCard.tsx
+++ b/packages/frontend/src/components/projects/project/overview/Activity/AuctionCard.tsx
@@ -8,7 +8,10 @@ import {
   DialogActions,
 } from '@mui/material';
 
-import { CheckRoundFilledIcon, LoadingIcon } from 'components/shared/CustomIcon';
+import {
+  CheckRoundFilledIcon,
+  LoadingIcon,
+} from 'components/shared/CustomIcon';
 import { useGQLClient } from 'context/GQLClientContext';
 import { Button, Heading, Tag } from 'components/shared';
 
@@ -23,7 +26,11 @@ export const AuctionCard = ({ project }: { project: Project }) => {
   const client = useGQLClient();
 
   const getIconByAuctionStatus = (status: string) =>
-    status === 'completed' ? <CheckRoundFilledIcon /> : <LoadingIcon className="animate-spin" />;
+    status === 'completed' ? (
+      <CheckRoundFilledIcon />
+    ) : (
+      <LoadingIcon className="animate-spin" />
+    );
 
   const checkAuctionStatus = useCallback(async () => {
     const result = await client.getAuctionData(project.auctionId);
@@ -61,7 +68,7 @@ export const AuctionCard = ({ project }: { project: Project }) => {
         {auctionStatus.toUpperCase()}
       </Tag>
     ),
-    [auctionStatus]
+    [auctionStatus],
   );
 
   const handleOpenDialog = () => setOpenDialog(true);
@@ -71,19 +78,25 @@ export const AuctionCard = ({ project }: { project: Project }) => {
     <>
       <div className="p-3 gap-2 rounded-xl border border-gray-200 transition-colors hover:bg-base-bg-alternate flex flex-col mt-8">
         <div className="flex justify-between items-center">
-          <Heading className="text-lg leading-6 font-medium">Auction details</Heading>
+          <Heading className="text-lg leading-6 font-medium">
+            Auction details
+          </Heading>
           <Button onClick={handleOpenDialog} variant="tertiary" size="sm">
             View details
           </Button>
         </div>
 
         <div className="flex justify-between items-center mt-1">
-          <span className="text-elements-high-em text-sm font-medium tracking-tight">Auction Status</span>
+          <span className="text-elements-high-em text-sm font-medium tracking-tight">
+            Auction Status
+          </span>
           <div className="ml-2">{renderAuctionStatus()}</div>
         </div>
 
         <div className="flex justify-between items-center mt-2">
-          <span className="text-elements-high-em text-sm font-medium tracking-tight">Auction Id</span>
+          <span className="text-elements-high-em text-sm font-medium tracking-tight">
+            Auction Id
+          </span>
           <span className="text-elements-mid-em text-sm text-right">
             {project.auctionId}
           </span>
@@ -91,7 +104,9 @@ export const AuctionCard = ({ project }: { project: Project }) => {
 
         {deployerLrns?.length > 0 && (
           <div className="mt-3">
-            <span className="text-elements-high-em text-sm font-medium tracking-tight">Deployer LRNs</span>
+            <span className="text-elements-high-em text-sm font-medium tracking-tight">
+              Deployer LRNs
+            </span>
             {deployerLrns.map((lrn, index) => (
               <p key={index} className="text-elements-mid-em text-sm">
                 {'\u2022'} {lrn}
@@ -101,22 +116,28 @@ export const AuctionCard = ({ project }: { project: Project }) => {
         )}
 
         <div className="flex justify-between items-center mt-1">
-          <span className="text-elements-high-em text-sm font-medium tracking-tight">Deployer Funds Status</span>
+          <span className="text-elements-high-em text-sm font-medium tracking-tight">
+            Deployer Funds Status
+          </span>
           <div className="ml-2">
-            <Tag
-              size="xs"
-              type={fundsStatus ? 'positive' : 'emphasized'}
-            >
+            <Tag size="xs" type={fundsStatus ? 'positive' : 'emphasized'}>
               {fundsStatus ? 'RELEASED' : 'LOCKED'}
             </Tag>
           </div>
         </div>
       </div>
 
-      <Dialog open={openDialog} onClose={handleCloseDialog} fullWidth maxWidth="md">
+      <Dialog
+        open={openDialog}
+        onClose={handleCloseDialog}
+        fullWidth
+        maxWidth="md"
+      >
         <DialogTitle>Auction Details</DialogTitle>
         <DialogContent>
-          {auctionDetails && <pre>{JSON.stringify(auctionDetails, null, 2)}</pre>}
+          {auctionDetails && (
+            <pre>{JSON.stringify(auctionDetails, null, 2)}</pre>
+          )}
         </DialogContent>
         <DialogActions>
           <Button onClick={handleCloseDialog}>Close</Button>
diff --git a/packages/frontend/src/components/projects/project/settings/DeleteProjectDialog.tsx b/packages/frontend/src/components/projects/project/settings/DeleteProjectDialog.tsx
index 7ae30d8e..4287e4c0 100644
--- a/packages/frontend/src/components/projects/project/settings/DeleteProjectDialog.tsx
+++ b/packages/frontend/src/components/projects/project/settings/DeleteProjectDialog.tsx
@@ -60,8 +60,10 @@ const DeleteProjectDialog = ({
           <Modal.Body>
             <Input
               label={
-                "Deleting your project is irreversible. Enter your project's name " + '"' +
-                project.name + '"' +
+                "Deleting your project is irreversible. Enter your project's name " +
+                '"' +
+                project.name +
+                '"' +
                 ' below to confirm you want to permanently delete it:'
               }
               id="input"
diff --git a/packages/frontend/src/context/Web3Provider.tsx b/packages/frontend/src/context/Web3Provider.tsx
index 3c71785c..593b85ac 100644
--- a/packages/frontend/src/context/Web3Provider.tsx
+++ b/packages/frontend/src/context/Web3Provider.tsx
@@ -55,7 +55,7 @@ const siweConfig = createSIWEConfig({
       statement: 'Sign in With Ethereum.',
     }).prepareMessage(),
   getNonce: async () => {
-    return generateNonce()
+    return generateNonce();
   },
   getSession: async () => {
     try {
diff --git a/packages/frontend/src/index.tsx b/packages/frontend/src/index.tsx
index f0cded53..66812111 100644
--- a/packages/frontend/src/index.tsx
+++ b/packages/frontend/src/index.tsx
@@ -17,7 +17,6 @@ import { LogErrorBoundary } from 'utils/log-error';
 import { BASE_URL } from 'utils/constants';
 import Web3ModalProvider from './context/Web3Provider';
 
-
 console.log(`v-0.0.9`);
 
 const root = ReactDOM.createRoot(
@@ -33,11 +32,11 @@ root.render(
   <LogErrorBoundary>
     <React.StrictMode>
       <ThemeProvider>
-      <Web3ModalProvider>
-        <GQLClientProvider client={gqlClient}>
-          <App />
-          <Toaster />
-        </GQLClientProvider>
+        <Web3ModalProvider>
+          <GQLClientProvider client={gqlClient}>
+            <App />
+            <Toaster />
+          </GQLClientProvider>
         </Web3ModalProvider>
       </ThemeProvider>
     </React.StrictMode>
diff --git a/packages/frontend/src/pages/auth/Login.tsx b/packages/frontend/src/pages/auth/Login.tsx
index a514e59f..a1acc1c5 100644
--- a/packages/frontend/src/pages/auth/Login.tsx
+++ b/packages/frontend/src/pages/auth/Login.tsx
@@ -12,7 +12,7 @@ export const Login = () => {
 
       <div className="self-stretch p-4 xs:p-6 flex-col justify-center items-center gap-8 flex">
         <div className="self-stretch flex-col justify-center  items-center gap-3 flex">
-        <w3m-button />
+          <w3m-button />
         </div>
       </div>
     </div>
diff --git a/packages/frontend/src/pages/components/modals.tsx b/packages/frontend/src/pages/components/modals.tsx
index 8e333101..91d5f29b 100644
--- a/packages/frontend/src/pages/components/modals.tsx
+++ b/packages/frontend/src/pages/components/modals.tsx
@@ -39,7 +39,7 @@ const deployment: Deployment = {
   deployer: {
     deployerApiUrl: 'https://webapp-deployer-api.example.com',
     deployerId: 'bafyreicrtgmkir4evvvysxdqxddf2ftdq2wrzuodgvwnxr4rmubi4obdfu',
-    deployerLrn:'lrn://example/deployers/webapp-deployer-api.example.com'
+    deployerLrn: 'lrn://example/deployers/webapp-deployer-api.example.com',
   },
   status: DeploymentStatus.Ready,
   createdBy: {
@@ -53,7 +53,8 @@ const deployment: Deployment = {
   },
   createdAt: '1677676800', // 2023-03-01T12:00:00Z
   updatedAt: '1677680400', // 2023-03-01T13:00:00Z
-  applicationDeploymentRequestId: 'bafyreiaycvq6imoppnpwdve4smj6t6ql5svt5zl3x6rimu4qwyzgjorize',
+  applicationDeploymentRequestId:
+    'bafyreiaycvq6imoppnpwdve4smj6t6ql5svt5zl3x6rimu4qwyzgjorize',
 };
 
 const domains: Domain[] = [
diff --git a/packages/frontend/src/pages/org-slug/projects/create/success/Id.tsx b/packages/frontend/src/pages/org-slug/projects/create/success/Id.tsx
index bd1d680c..37883c8c 100644
--- a/packages/frontend/src/pages/org-slug/projects/create/success/Id.tsx
+++ b/packages/frontend/src/pages/org-slug/projects/create/success/Id.tsx
@@ -1,4 +1,4 @@
-import { Link,  useParams, useSearchParams } from 'react-router-dom';
+import { Link, useParams, useSearchParams } from 'react-router-dom';
 import Lottie from 'lottie-react';
 
 import { Badge } from 'components/shared/Badge';
@@ -48,7 +48,9 @@ const Id = () => {
           {/* Heading */}
           <div className="flex flex-col items-center gap-1.5">
             <Heading as="h3" className="font-medium text-xl">
-              {isAuction? 'Auction created successfully.' : 'Project deployment created successfully.'}
+              {isAuction
+                ? 'Auction created successfully.'
+                : 'Project deployment created successfully.'}
             </Heading>
           </div>
 
diff --git a/packages/frontend/src/pages/org-slug/projects/create/template/index.tsx b/packages/frontend/src/pages/org-slug/projects/create/template/index.tsx
index 4024e521..9879c56d 100644
--- a/packages/frontend/src/pages/org-slug/projects/create/template/index.tsx
+++ b/packages/frontend/src/pages/org-slug/projects/create/template/index.tsx
@@ -54,7 +54,7 @@ const CreateRepo = () => {
         setIsLoading(true);
 
         navigate(
-          `configure?templateId=${template.id}&templateOwner=${owner}&templateRepo=${repo}&owner=${data.account}&name=${data.repoName}&isPrivate=false&orgSlug=${orgSlug}`
+          `configure?templateId=${template.id}&templateOwner=${owner}&templateRepo=${repo}&owner=${data.account}&name=${data.repoName}&isPrivate=false&orgSlug=${orgSlug}`,
         );
       } catch (err) {
         setIsLoading(false);
@@ -173,7 +173,7 @@ const CreateRepo = () => {
           <Controller
             name="isPrivate"
             control={control}
-            render={({ }) => (
+            render={({}) => (
               <Checkbox label="Make this repo private" disabled={true} />
             )}
           />
diff --git a/packages/frontend/src/pages/org-slug/projects/id/Overview.tsx b/packages/frontend/src/pages/org-slug/projects/id/Overview.tsx
index 66e97359..9346deb0 100644
--- a/packages/frontend/src/pages/org-slug/projects/id/Overview.tsx
+++ b/packages/frontend/src/pages/org-slug/projects/id/Overview.tsx
@@ -135,7 +135,7 @@ const OverviewTabPanel = () => {
                 <p>
                   <a
                     key={index}
-                    href={`https://${project.name}.${baseDomain}`}
+                    href={`https://${project.name.toLowerCase()}.${baseDomain}`}
                     className="text-sm text-elements-low-em tracking-tight truncate"
                   >
                     {baseDomain}
diff --git a/packages/frontend/src/pages/org-slug/projects/id/settings/EnvironmentVariables.tsx b/packages/frontend/src/pages/org-slug/projects/id/settings/EnvironmentVariables.tsx
index d284a4a6..e76aa364 100644
--- a/packages/frontend/src/pages/org-slug/projects/id/settings/EnvironmentVariables.tsx
+++ b/packages/frontend/src/pages/org-slug/projects/id/settings/EnvironmentVariables.tsx
@@ -64,15 +64,17 @@ export const EnvironmentVariablesTabPanel = () => {
 
   const createEnvironmentVariablesHandler = useCallback(
     async (createFormData: FieldValues) => {
-      const environmentVariables = createFormData.variables.map((variable: any) => {
-        return {
-          key: variable.key,
-          value: variable.value,
-          environments: Object.entries(createFormData.environment)
-            .filter(([, value]) => value === true)
-            .map(([key]) => key.charAt(0).toUpperCase() + key.slice(1)),
-        };
-      });
+      const environmentVariables = createFormData.variables.map(
+        (variable: any) => {
+          return {
+            key: variable.key,
+            value: variable.value,
+            environments: Object.entries(createFormData.environment)
+              .filter(([, value]) => value === true)
+              .map(([key]) => key.charAt(0).toUpperCase() + key.slice(1)),
+          };
+        },
+      );
 
       const { addEnvironmentVariables: isEnvironmentVariablesAdded } =
         await client.addEnvironmentVariables(id!, environmentVariables);
@@ -124,7 +126,11 @@ export const EnvironmentVariablesTabPanel = () => {
         </Heading>
         <Collapse open={createNewVariable}>
           <FormProvider {...methods}>
-            <form onSubmit={methods.handleSubmit((data) => createEnvironmentVariablesHandler(data))}>
+            <form
+              onSubmit={methods.handleSubmit((data) =>
+                createEnvironmentVariablesHandler(data),
+              )}
+            >
               <div className="p-4 bg-slate-100">
                 <EnvironmentVariablesForm />
               </div>
diff --git a/packages/frontend/src/pages/org-slug/projects/id/settings/EnvironmentVariablesForm.tsx b/packages/frontend/src/pages/org-slug/projects/id/settings/EnvironmentVariablesForm.tsx
index ebe9bdc2..447d76fd 100644
--- a/packages/frontend/src/pages/org-slug/projects/id/settings/EnvironmentVariablesForm.tsx
+++ b/packages/frontend/src/pages/org-slug/projects/id/settings/EnvironmentVariablesForm.tsx
@@ -67,7 +67,10 @@ const EnvironmentVariablesForm = () => {
       <div className="flex gap-2 p-2">
         <Checkbox label="Production" {...register('environment.production')} />
         <Checkbox label="Preview" {...register('environment.preview')} />
-        <Checkbox label="Development" {...register('environment.development')} />
+        <Checkbox
+          label="Development"
+          {...register('environment.development')}
+        />
       </div>
     </>
   );
diff --git a/packages/frontend/src/stories/MockStoriesData.ts b/packages/frontend/src/stories/MockStoriesData.ts
index 3a64356f..be3ff31a 100644
--- a/packages/frontend/src/stories/MockStoriesData.ts
+++ b/packages/frontend/src/stories/MockStoriesData.ts
@@ -102,12 +102,13 @@ export const deployment0: Deployment = {
   domain: domain0,
   commitMessage: 'Commit Message',
   createdBy: user,
-  deployer:  {
+  deployer: {
     deployerApiUrl: 'https://webapp-deployer-api.example.com',
     deployerId: 'bafyreicrtgmkir4evvvysxdqxddf2ftdq2wrzuodgvwnxr4rmubi4obdfu',
-    deployerLrn:'lrn://deployer.apps.snowballtools.com '
+    deployerLrn: 'lrn://deployer.apps.snowballtools.com ',
   },
-  applicationDeploymentRequestId: 'bafyreiaycvq6imoppnpwdve4smj6t6ql5svt5zl3x6rimu4qwyzgjorize',
+  applicationDeploymentRequestId:
+    'bafyreiaycvq6imoppnpwdve4smj6t6ql5svt5zl3x6rimu4qwyzgjorize',
 };
 
 export const project: Project = {
-- 
2.45.2


From bbcbd4b5d395a49d43de6650b131fd82d10efbae Mon Sep 17 00:00:00 2001
From: IshaVenikar <ishavenikar7@gmail.com>
Date: Tue, 22 Oct 2024 15:03:53 +0530
Subject: [PATCH 5/6] Set correct project name in import flow

---
 packages/frontend/src/components/projects/create/Configure.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/components/projects/create/Configure.tsx b/packages/frontend/src/components/projects/create/Configure.tsx
index 64899f58..d1380f64 100644
--- a/packages/frontend/src/components/projects/create/Configure.tsx
+++ b/packages/frontend/src/components/projects/create/Configure.tsx
@@ -98,7 +98,7 @@ const Configure = () => {
         const { addProject } = await client.addProject(
           orgSlug!,
           {
-            name: fullName!,
+            name: `${owner}-${name}`,
             prodBranch: defaultBranch!,
             repository: fullName!,
             template: 'webapp',
-- 
2.45.2


From 7504b3848d448aaab257443aa0032c3aaa7f704c Mon Sep 17 00:00:00 2001
From: Neeraj <neeraj.rtly@gmail.com>
Date: Tue, 22 Oct 2024 15:31:09 +0530
Subject: [PATCH 6/6] Update toast messages

---
 packages/frontend/src/components/Logo.tsx     | 29 ++++++++++++-------
 .../project/deployments/DeploymentMenu.tsx    |  8 ++---
 .../src/components/shared/Sidebar/Sidebar.tsx |  5 ++--
 .../frontend/src/pages/org-slug/layout.tsx    |  5 ++--
 4 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/packages/frontend/src/components/Logo.tsx b/packages/frontend/src/components/Logo.tsx
index 81cf3555..6b6d8131 100644
--- a/packages/frontend/src/components/Logo.tsx
+++ b/packages/frontend/src/components/Logo.tsx
@@ -1,16 +1,23 @@
+import { Link } from 'react-router-dom';
 import { Heading } from './shared/Heading';
 
-export const Logo = () => {
+interface LogoProps {
+  orgSlug?: string;
+}
+
+export const Logo = ({ orgSlug }: LogoProps) => {
   return (
-    <div className="flex items-center gap-3 px-0 lg:px-2">
-      <img
-        src="/logo.svg"
-        alt="Snowball Logo"
-        className="lg:h-10 lg:w-10 h-8 w-8 rounded-lg"
-      />
-      <Heading className="lg:text-[24px] text-[19px] font-semibold">
-        Snowball
-      </Heading>
-    </div>
+    <Link to={`/${orgSlug}`}>
+      <div className="flex items-center gap-3 px-0 lg:px-2">
+        <img
+          src="/logo.svg"
+          alt="Snowball Logo"
+          className="lg:h-10 lg:w-10 h-8 w-8 rounded-lg"
+        />
+        <Heading className="lg:text-[24px] text-[19px] font-semibold">
+          Snowball
+        </Heading>
+      </div>
+    </Link>
   );
 };
diff --git a/packages/frontend/src/components/projects/project/deployments/DeploymentMenu.tsx b/packages/frontend/src/components/projects/project/deployments/DeploymentMenu.tsx
index 8ef1dd61..fec28246 100644
--- a/packages/frontend/src/components/projects/project/deployments/DeploymentMenu.tsx
+++ b/packages/frontend/src/components/projects/project/deployments/DeploymentMenu.tsx
@@ -117,8 +117,8 @@ export const DeploymentMenu = ({
 
   const deleteDeployment = async () => {
     toast({
-      id: 'deployment_going_to_be_deleted',
-      title: 'Deployment going to be deleted',
+      id: 'deleting_deployment',
+      title: 'Deleting deployment....',
       variant: 'success',
       onDismiss: dismiss,
     });
@@ -127,8 +127,8 @@ export const DeploymentMenu = ({
     if (isDeleted) {
       await onUpdate();
       toast({
-        id: 'deployment_deleted',
-        title: 'Deployment deleted',
+        id: 'deployment_removal_requested',
+        title: 'Deployment removal requested',
         variant: 'success',
         onDismiss: dismiss,
       });
diff --git a/packages/frontend/src/components/shared/Sidebar/Sidebar.tsx b/packages/frontend/src/components/shared/Sidebar/Sidebar.tsx
index daad9918..15e88d16 100644
--- a/packages/frontend/src/components/shared/Sidebar/Sidebar.tsx
+++ b/packages/frontend/src/components/shared/Sidebar/Sidebar.tsx
@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useState } from 'react';
-import { useNavigate } from 'react-router-dom';
+import { useNavigate, useParams } from 'react-router-dom';
 import { User } from 'gql-client';
 import { motion } from 'framer-motion';
 import { useDisconnect } from 'wagmi';
@@ -26,6 +26,7 @@ interface SidebarProps {
 }
 
 export const Sidebar = ({ mobileOpen }: SidebarProps) => {
+  const { orgSlug } = useParams();
   const navigate = useNavigate();
   const client = useGQLClient();
   const isDesktop = useMediaQuery('(min-width: 960px)');
@@ -72,7 +73,7 @@ export const Sidebar = ({ mobileOpen }: SidebarProps) => {
       >
         {/* Logo */}
         <div className="hidden lg:flex">
-          <Logo />
+          <Logo orgSlug={orgSlug} />
         </div>
         {/* This element ensures the space between logo and navigation */}
         <div className="flex-1"></div>
diff --git a/packages/frontend/src/pages/org-slug/layout.tsx b/packages/frontend/src/pages/org-slug/layout.tsx
index 4cf7955a..b1bf2226 100644
--- a/packages/frontend/src/pages/org-slug/layout.tsx
+++ b/packages/frontend/src/pages/org-slug/layout.tsx
@@ -9,7 +9,7 @@ import {
 import { Sidebar } from 'components/shared/Sidebar';
 import { OctokitProvider } from 'context/OctokitContext';
 import { ComponentPropsWithoutRef, useEffect, useState } from 'react';
-import { Outlet } from 'react-router-dom';
+import { Outlet, useParams } from 'react-router-dom';
 import { AnimatePresence, motion } from 'framer-motion';
 import { cn } from 'utils/classnames';
 import { useMediaQuery } from 'usehooks-ts';
@@ -22,6 +22,7 @@ export const DashboardLayout = ({
   className,
   ...props
 }: DashboardLayoutProps) => {
+  const { orgSlug } = useParams();
   const isDesktop = useMediaQuery('(min-width: 960px)');
 
   const [isSidebarOpen, setIsSidebarOpen] = useState(false);
@@ -44,7 +45,7 @@ export const DashboardLayout = ({
       >
         {/* Header on mobile */}
         <div className="flex lg:hidden items-center px-4 py-2.5 justify-between">
-          <Logo />
+          <Logo orgSlug={orgSlug} />
           <div className="flex items-center gap-0.5">
             <AnimatePresence>
               {isSidebarOpen ? (
-- 
2.45.2