diff --git a/pages/[accountName].tsx b/pages/[accountName].tsx
index 479522c31020567e2c3a33650188d961cc104ede..bd665412842fb9fa6fbe4c1bcba8fd859849c1bb 100644
--- a/pages/[accountName].tsx
+++ b/pages/[accountName].tsx
@@ -24,7 +24,7 @@ import { Button } from "@/components/ui/button";
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
import useConvertedAccountDetails from "@/hooks/common/useConvertedAccountDetails";
import useDynamicGlobal from "@/hooks/api/homePage/useDynamicGlobal";
-
+import ErrorPage from "./ErrorPage";
interface AccountSearchParams {
accountName?: string | undefined;
fromBlock: number | undefined;
@@ -98,6 +98,7 @@ export default function Account() {
liveDataEnabled,
dynamicGlobalData
);
+
const accountOperationsProps = {
accountName: accountNameFromRoute,
operationTypes: filtersParam.length
@@ -277,6 +278,16 @@ export default function Account() {
}
};
+ // get the accountName and treat it as a string
+ const routeAccountName = Array.isArray(router.query.accountName)
+ ? router.query.accountName[0] // If it's an array, get the first element
+ : router.query.accountName; // Otherwise, treat it as a string directly
+
+ if(routeAccountName && !routeAccountName.startsWith("@"))
+ {
+ return <ErrorPage />;
+ }
+
if (!accountDetails) {
return (
<Loader2 className="animate-spin mt-1 text-black dark:text-white h-12 w-12 ml-3 ..." />
diff --git a/pages/balanceHistory/[accountName].tsx b/pages/balanceHistory/[accountName].tsx
index d7f9ba591833ea0fdb20609d11757c51dda4e985..d8b86759f02995b2867c310756c306564aaa230d 100644
--- a/pages/balanceHistory/[accountName].tsx
+++ b/pages/balanceHistory/[accountName].tsx
@@ -20,6 +20,7 @@ import BalanceHistorySearch from "@/components/home/searches/BalanceHistorySearc
import { Card, CardHeader } from "@/components/ui/card";
import BalanceHistoryChart from "@/components/balanceHistory/BalanceHistoryChart";
+import ErrorPage from "../ErrorPage";
// Memoizing the BalanceHistoryChart component to avoid unnecessary re-renders
const MemoizedBalanceHistoryChart = React.memo(BalanceHistoryChart);
@@ -172,6 +173,16 @@ export default function BalanceHistory() {
message = "Showing Results with applied filters.";
}
+ // get the accountName
+ const routeAccountName = Array.isArray(router.query.accountName)
+ ? router.query.accountName[0] // If it's an array, get the first element
+ : router.query.accountName; // Otherwise, treat it as a string directly
+
+ if(routeAccountName && !routeAccountName.startsWith("@"))
+ {
+ return <ErrorPage />;
+ }
+
return (
<>
<Head>