Merge pull request #1526 from ssvlabs/refactor/remove-bapps

fix: removed bapps

Author: sumbat-ssvlabs

pnpm-lock.yaml

@@ -123,9 +123,10 @@ async function addReviewers(owner, repo, prNumber) {
       {
         reviewers: [
           "IlyaVi",
+          "sumbat-ssvlabs",
+          "Chris-ssvlabs",
           "axelrod-blox",
           "nir-ssvlabs",
-          "sumbat-ssvlabs",
           "stefan-ssv-labs",
         ],
       },

scripts/pr-automation/index.cjs

@@ -1,4 +1,3 @@
-import { Navbar } from "@/app/layouts/dashboard/navbar";
 import { NavbarDVT } from "@/app/layouts/dashboard/navbar-dvt";
 import { AssetWithdrawalModal } from "@/components/modals/bapp/asset-withdrawal-modal";
 import { AssetsDepositModal } from "@/components/modals/bapp/assets-deposit-modal";
@@ -9,7 +8,6 @@ import { TransactionModal } from "@/components/ui/transaction-modal";
 import { useAccount } from "@/hooks/account/use-account";
 import { useAccountState } from "@/hooks/account/use-account-state.ts";
 import { useMaintenance } from "@/hooks/app/use-maintenance";
-import { useAppVersion } from "@/hooks/temp-delete-after-merge/use-app-version";
 import { useBlockNavigationOnPendingTx } from "@/hooks/use-block-navigation-on-pending-tx";
 import { useIdentify } from "@/lib/analytics/mixpanel/useIdentify";
 import { useTrackPageViews } from "@/lib/analytics/mixpanel/useTrackPageViews";
@@ -33,7 +31,6 @@ export const DashboardLayout: FC<ComponentPropsWithRef<"div">> = ({
 
   const { isMaintenancePage } = useMaintenance();
   const { isLoadingClusters, isLoadingOperators } = useAccountState();
-  const app = useAppVersion();
   if (isMaintenancePage) {
     return <Navigate to="/maintenance" replace />;
   }
@@ -66,11 +63,7 @@ export const DashboardLayout: FC<ComponentPropsWithRef<"div">> = ({
               exit={{ opacity: 0 }}
               key="content"
             >
-              {app.isDvtOnly ? (
-                <NavbarDVT className="px-5" />
-              ) : (
-                <Navbar className="px-5" />
-              )}
+              <NavbarDVT className="px-5" />
               <main className={cn(className, "flex-1 overflow-auto")}>
                 {children}
               </main>

src/app/layouts/dashboard/dashboard.tsx

@@ -4,9 +4,7 @@ import { Navigate } from "react-router";
 import { cn } from "@/lib/utils/tw.ts";
 import { SsvLoader } from "@/components/ui/ssv-loader.tsx";
 import { motion } from "framer-motion";
-import { useAppVersion } from "@/hooks/temp-delete-after-merge/use-app-version";
 
-const REDIRECT_EXCLUSIONS = ["/", "/connect", "/compliance"];
 export const Redirector = () => {
   const { isLoadingClusters, isLoadingOperators, hasClusters, hasOperators } =
     useAccountState();
@@ -17,8 +15,6 @@ export const Redirector = () => {
   const landedOnClusterPage = landingPage.startsWith("/clusters");
   const landedOnOperatorsPage = landingPage.startsWith("/operators");
 
-  const app = useAppVersion();
-
   if (isLoadingClusters)
     return (
       <motion.div
@@ -54,12 +50,5 @@ export const Redirector = () => {
   if (landedOnOperatorsPage && hasOperators)
     return <Navigate to={landingPage} replace />;
 
-  if (app.isDvtOnly) {
-    return <Navigate to="/join" replace />;
-  }
-
-  if (!REDIRECT_EXCLUSIONS.includes(landingPage))
-    return <Navigate to={landingPage} replace />;
-
-  return <Navigate to="/account/my-delegations" />;
+  return <Navigate to="/join" replace />;
 };

src/app/routes/root-redirection.tsx

@@ -7,7 +7,6 @@ import { proxy, useSnapshot } from "valtio";
 
 import { Compliance } from "@/app/routes/compliance";
 import { Maintenance } from "@/app/routes/maintenance";
-import { accountRoutes } from "@/app/routes/router/route-definitions/account-routes.tsx";
 import type { RouteObject } from "react-router-dom";
 import { createBrowserRouter, Outlet } from "react-router-dom";
 import { NotFound } from "./not-found";
@@ -36,7 +35,6 @@ const routes = [
         element: <FeeRecipientAddress />,
       },
       joinRoutes,
-      accountRoutes,
       clustersRoutes,
       operatorsRoutes,
     ],

src/app/routes/router.tsx

@@ -4,7 +4,6 @@ import { useCreatedOptimisticOperators } from "@/hooks/operator/use-created-opti
 import { getPaginatedAccountOperatorsQueryOptions } from "@/hooks/operator/use-paginated-account-operators";
 import { useQuery } from "@tanstack/react-query";
 import { useMyBAppAccount } from "@/hooks/b-app/use-my-b-app-account.ts";
-import { useAppVersion } from "@/hooks/temp-delete-after-merge/use-app-version";
 
 export const useAccountState = () => {
   const account = useAccount();
@@ -21,8 +20,6 @@ export const useAccountState = () => {
 
   const createdOptimisticOperators = useCreatedOptimisticOperators();
 
-  const app = useAppVersion();
-
   const isLoading =
     clusters.isLoading || operators.isLoading || myBAppAccount.isLoading;
 
@@ -43,9 +40,7 @@ export const useAccountState = () => {
     ? "/connect"
     : isLoading
       ? undefined
-      : app.isDvtOnly
-        ? dvtRoutePath
-        : "/account/my-delegations";
+      : dvtRoutePath;
 
   return {
     isLoading,