Merge branch 'main' into dev-change-notfound-page

layerswap · Sep 6, 2024 · 9cc56fb · 9cc56fb
2 parents 3cd8d84 + f463e51
commit 9cc56fb
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/app/[searchParam]/SearchData.tsx b/app/[searchParam]/SearchData.tsx
@@ -31,7 +31,6 @@ export default function SearchData({ searchParam }: { searchParam: string }) {
     const basePath = process.env.NEXT_PUBLIC_APP_BASE_PATH
 
     const apiClient = new LayerSwapApiClient()
-
     const { data, error, isLoading } = useSWR<ApiResponse<SwapData[]>>(`/explorer/${searchParam}?version=${process.env.NEXT_PUBLIC_API_VERSION}`, apiClient.fetcher, { dedupingInterval: 60000 });
 
     const swap = data?.data?.[0]?.swap

diff --git a/app/[searchParam]/page.tsx b/app/[searchParam]/page.tsx
@@ -2,9 +2,10 @@ import SearchData from "./SearchData";
 
 export default async function Page({ params }: { params: { searchParam: string } }) {
 
+  console.log(params.searchParam)
   return (
     <main className="w-full py-5 px-6 xl:px-0">
-      <SearchData searchParam={params.searchParam} />
+      <SearchData searchParam={decodeURIComponent(params.searchParam)} />
     </main>
   )
 }
diff --git a/components/Footer.tsx b/components/Footer.tsx
@@ -80,7 +80,7 @@ const Footer = () => {
             </div>
             <div className="mt-3 order-1 md:mt-0 place-self-start">
                 <p className="text-center text-xs text-primary-text-muted leading-6">
-                    &copy; {new Date().getFullYear()} Bransfer, Inc. All rights reserved.
+                    &copy; {new Date().getFullYear()} Layerswap Labs, Inc. All rights reserved.
                 </p>
             </div>
         </footer>

diff --git a/components/Search.tsx b/components/Search.tsx
@@ -27,7 +27,7 @@ const Search = () => {
 
     const handleSearch = () => {
         const url = getLastPart(searchParam)
-        router.push(`/${url}`)
+        router.push(`/${encodeURIComponent(String(url))}`)
     }
 
     const clearSearch = () => {

diff --git a/components/notFound.tsx b/components/notFound.tsx
@@ -8,13 +8,13 @@ export default function NotFound() {
             <div className="flex flex-col items-center justify-center text-center p-4 relative z-20">
                 <h1 className="text-2xl font-semibold text-white md:text-4xl">We couldn&apos;t find anything</h1>
                 <p className="text-base text-primary-text-placeholder mt-2">Please make sure you entered a valid address/source Tx/destination TX.</p>
-                <span className="text-base text-primary-text-placeholder block">if the issue persists, you can contact our support.</span>
+                <span className="text-base text-primary-text-placeholder block">If the issue persists, you can contact our support.</span>
                 <div className="flex items-center mt-6 gap-x-3">
                     <Link href="/" className="w-full px-5 py-2 text-sm tracking-wide text-primary-text transition-colors duration-200 bg-secondary-600 rounded-lg shrink-0 sm:w-auto hover:bg-secondary-700/80">
                         Clear search
                     </Link>
                 </div>
             </div>
         </section>
-    )
-}
+    );
+}