Bugfixes/update stats urls (#103)

* edit terms of service * fix urls to stats app * removed searchbar * fix addresslink * fix transactions link
akash-network · Feb 16, 2024 · 53fc329 · 53fc329
1 parent f00c40f
commit 53fc329
Show file tree

Hide file tree

Showing 10 changed files with 74 additions and 262 deletions.
diff --git a/deploy-web/next-env.d.ts b/deploy-web/next-env.d.ts
@@ -1,5 +1,6 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
+/// <reference types="next/navigation-types/compat/navigation" />
 
 // NOTE: This file should not be edited
 // see https://nextjs.org/docs/basic-features/typescript for more information.
diff --git a/deploy-web/src/components/layout/Header.tsx b/deploy-web/src/components/layout/Header.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode, useState } from "react";
+import React, { ReactNode } from "react";
 import Box from "@mui/material/Box";
 import AppBar from "@mui/material/AppBar";
 import Toolbar from "@mui/material/Toolbar";
@@ -12,11 +12,9 @@ import { WalletStatus } from "./WalletStatus";
 import Link from "next/link";
 import { UrlService } from "@src/utils/urlUtils";
 import { useRouter } from "next/router";
-import SearchBar from "./SearchBar";
 import { AccountMenu } from "./AccountMenu";
 import MenuIcon from "@mui/icons-material/Menu";
 import CloseIcon from "@mui/icons-material/Close";
-import SearchIcon from "@mui/icons-material/Search";
 
 type Props = {
   isMobileOpen: boolean;
@@ -71,49 +69,36 @@ export const Header: React.FunctionComponent<Props> = ({ children, isMobileOpen,
   const { classes } = useStyles();
   const router = useRouter();
   const smallScreen = useMediaQuery(theme.breakpoints.down("md"));
-  const [isMobileSearch, setIsMobileSearch] = useState(false);
 
   return (
     <AppBar position="fixed" color="default" elevation={0} component="header">
       <Toolbar variant="dense" className={classes.accountBar}>
         <ErrorBoundary FallbackComponent={ErrorFallback}>
-          {!isMobileSearch && (
-            <Box sx={{ display: "flex", alignItems: "center" }}>
-              <Box href={UrlService.home()} component={Link} sx={{ height: "35px", width: "140px" }}>
-                <Image
-                  alt="Cloudmos Logo"
-                  src={theme.palette.mode === "dark" ? "/images/cloudmos-logo.png" : "/images/cloudmos-logo-light.png"}
-                  layout="responsive"
-                  quality={100}
-                  width={140}
-                  height={35}
-                  loading="eager"
-                  priority
-                />
-              </Box>
+          <Box sx={{ display: "flex", alignItems: "center" }}>
+            <Box href={UrlService.home()} component={Link} sx={{ height: "35px", width: "140px" }}>
+              <Image
+                alt="Cloudmos Logo"
+                src={theme.palette.mode === "dark" ? "/images/cloudmos-logo.png" : "/images/cloudmos-logo-light.png"}
+                layout="responsive"
+                quality={100}
+                width={140}
+                height={35}
+                loading="eager"
+                priority
+              />
             </Box>
-          )}
-
-          {(isMobileSearch || !smallScreen) && <SearchBar isMobileSearch={isMobileSearch} onSearchClose={() => setIsMobileSearch(false)} />}
+          </Box>
 
           <Box>
-            {smallScreen && !isMobileSearch && (
-              <IconButton color="inherit" aria-label="open drawer" edge="start" onClick={() => setIsMobileSearch(true)} sx={{ display: { md: "none" } }}>
-                <SearchIcon />
-              </IconButton>
-            )}
-
-            {!isMobileSearch && (
-              <IconButton
-                color="inherit"
-                aria-label="open drawer"
-                edge="start"
-                onClick={handleDrawerToggle}
-                sx={{ display: { md: "none" }, marginLeft: ".5rem" }}
-              >
-                {isMobileOpen ? <CloseIcon /> : <MenuIcon />}
-              </IconButton>
-            )}
+            <IconButton
+              color="inherit"
+              aria-label="open drawer"
+              edge="start"
+              onClick={handleDrawerToggle}
+              sx={{ display: { md: "none" }, marginLeft: ".5rem" }}
+            >
+              {isMobileOpen ? <CloseIcon /> : <MenuIcon />}
+            </IconButton>
           </Box>
 
           <Box sx={{ maxHeight: `${accountBarHeight}px`, alignItems: "center", display: { xs: "none", sm: "none", md: "flex" } }}>
@@ -148,4 +133,3 @@ export const Header: React.FunctionComponent<Props> = ({ children, isMobileOpen,
     </AppBar>
   );
 };
-
diff --git a/deploy-web/src/components/layout/SearchBar.tsx b/deploy-web/src/components/layout/SearchBar.tsx
diff --git a/deploy-web/src/components/layout/WalletStatus.tsx b/deploy-web/src/components/layout/WalletStatus.tsx
@@ -69,7 +69,12 @@ export const WalletStatus: React.FunctionComponent<Props> = ({}) => {
               <Box sx={{ textAlign: "left", display: "flex", alignItems: "center" }}>
                 <Box sx={{ fontWeight: "bold", fontSize: ".9rem", display: "flex", alignItems: "center" }}>
                   <AccountBalanceWalletIcon fontSize="small" sx={{ fontSize: "1rem" }} color="disabled" />
-                  <Box sx={{ marginLeft: ".5rem", lineHeight: ".9rem", cursor: "pointer" }} component={Link} href={UrlService.address(address)}>
+                  <Box
+                    sx={{ marginLeft: ".5rem", lineHeight: ".9rem", cursor: "pointer" }}
+                    component={Link}
+                    target="_blank"
+                    href={`https://stats.akash.network/addresses/${address}`}
+                  >
                     <CustomTooltip arrow title={<Address address={address} isCopyable />}>
                       <span>{walletName}</span>
                     </CustomTooltip>

diff --git a/deploy-web/src/components/shared/AddressLink.tsx b/deploy-web/src/components/shared/AddressLink.tsx
@@ -1,6 +1,5 @@
 import React, { ReactNode } from "react";
 import Link from "next/link";
-import { UrlService } from "@src/utils/urlUtils";
 import { Address } from "./Address";
 
 type Props = {
@@ -11,15 +10,18 @@ type Props = {
 
 export const AddressLink: React.FunctionComponent<Props> = ({ address, addressBookMode, ...rest }) => {
   let href = null;
+  let target = "_self";
   if (address.startsWith("akashvaloper")) {
-    href = UrlService.validator(address);
+    href = `https://stats.akash.network/validators/${address}`;
+    target = "_blank";
   } else if (address.startsWith("akash")) {
-    href = UrlService.address(address);
+    href = `https://stats.akash.network/addresses/${address}`;
+    target = "_blank";
   }
 
   if (href) {
     return (
-      <Link href={href}>
+      <Link href={href} target={target}>
         <Address address={address} addressBookMode={addressBookMode} disableTruncate />
       </Link>
     );

diff --git a/deploy-web/src/context/WalletProvider/WalletProvider.tsx b/deploy-web/src/context/WalletProvider/WalletProvider.tsx
@@ -338,7 +338,7 @@ export function useWallet() {
 
 const TransactionSnackbarContent = ({ snackMessage, transactionHash }) => {
   const theme = useTheme();
-  const txUrl = transactionHash && UrlService.transaction(transactionHash);
+  const txUrl = transactionHash && `https://stats.akash.network/transactions/${transactionHash}`;
 
   return (
     <>
@@ -355,4 +355,3 @@ const TransactionSnackbarContent = ({ snackMessage, transactionHash }) => {
     </>
   );
 };
-
diff --git a/deploy-web/src/pages/terms-of-service/index.tsx b/deploy-web/src/pages/terms-of-service/index.tsx
@@ -28,10 +28,9 @@ export function TermsOfService() {
           These Terms of Use constitute a legally binding agreement made between you, whether personally or on behalf of an entity (&ldquo;you&rdquo;) and
           MaxMax Labs Inc. (&quot;Company&quot;, &ldquo;we&rdquo;, &ldquo;us&rdquo;, or &ldquo;our&rdquo;), concerning your access to and use of the
           https://cloudmos.io/ website as well as any other media form, media channel, mobile website or mobile application related, linked, or otherwise
-          connected thereto (collectively, the &ldquo;Site&rdquo;). We are registered in Canada and have our registered office at CP 82027 Terrebonne RPO chemin
-          gascon, Terrebonne, Quebec J6X 0J8. Our VAT number is 1229169005. You agree that by accessing the Site, you have read, understood, and agree to be
-          bound by all of these Terms of Use. IF YOU DO NOT AGREE WITH ALL OF THESE TERMS OF USE, THEN YOU ARE EXPRESSLY PROHIBITED FROM USING THE SITE AND YOU
-          MUST DISCONTINUE USE IMMEDIATELY.
+          connected thereto (collectively, the &ldquo;Site&rdquo;). P.O. Box 144, 3119 9 Forum Lane, Camana Bay, George Town, Grand Cayman KY1-9006, Cayman
+          Islands. You agree that by accessing the Site, you have read, understood, and agree to be bound by all of these Terms of Use. IF YOU DO NOT AGREE WITH
+          ALL OF THESE TERMS OF USE, THEN YOU ARE EXPRESSLY PROHIBITED FROM USING THE SITE AND YOU MUST DISCONTINUE USE IMMEDIATELY.
         </p>
 
         <p>
@@ -574,7 +573,7 @@ export function TermsOfService() {
 
         <p>In order to resolve a complaint regarding the Site or to receive further information regarding use of the Site, please contact us at:</p>
 
-        <p>MaxMax Labs Inc. CP 82027 Terrebonne RPO chemin gascon Terrebonne, Quebec J6X 0J8 Canada Phone: (888) 546-3184 [email protected]</p>
+        <p>P.O. Box 144, 3119 9 Forum Lane, Camana Bay, George Town, Grand Cayman KY1-9006, Cayman Islands. [email protected]</p>
       </PageContainer>
     </Layout>
   );

diff --git a/deploy-web/src/utils/urlUtils.ts b/deploy-web/src/utils/urlUtils.ts
@@ -35,17 +35,8 @@ export class UrlService {
   static faq = (q?: FaqAnchorType) => `/faq${q ? "#" + q : ""}`;
   static privacyPolicy = () => "/privacy-policy";
   static termsOfService = () => "/terms-of-service";
-  static blocks = () => `/blocks`;
-  static block = (height: number) => `/blocks/${height}${appendSearchParams({ network: getSelectedNetworkQueryParam() })}`;
-  static transactions = () => `/transactions`;
-  static transaction = (hash: string) => `/transactions/${hash}${appendSearchParams({ network: getSelectedNetworkQueryParam() })}`;
-  static address = (address: string) => `/addresses/${address}${appendSearchParams({ network: getSelectedNetworkQueryParam() })}`;
-  static addressTransactions = (address: string) => `/addresses/${address}/transactions`;
-  static addressDeployments = (address: string) => `/addresses/${address}/deployments`;
-  static validators = () => "/validators";
-  static validator = (address: string) => `/validators/${address}${appendSearchParams({ network: getSelectedNetworkQueryParam() })}`;
-  static proposals = () => "/proposals";
-  static proposal = (id: number) => `/proposals/${id}`;
+
+  // User
   static userSettings = () => "/user/settings";
   static userAddressBook = () => `/user/settings/address-book`;
   static userFavorites = () => `/user/settings/favorites`;