Merge branch 'ethereum:dev' into Anish_Gupta1/fix#15489

Author: Anish-Gupta1

app/[locale]/[...slug]/page.tsx

@@ -7,6 +7,7 @@ import mdComponents from "@/components/MdComponents"
 
 import { dataLoader } from "@/lib/utils/data/dataLoader"
 import { dateToString } from "@/lib/utils/date"
+import { getLayoutFromSlug } from "@/lib/utils/layout"
 import { getPostSlugs } from "@/lib/utils/md"
 import { getRequiredNamespacesForPage } from "@/lib/utils/translations"
 
@@ -19,18 +20,6 @@ import { getMdMetadata } from "@/lib/md/metadata"
 
 const loadData = dataLoader([["gfissues", fetchGFIs]])
 
-function getLayoutFromSlug(slug: string) {
-  if (slug.includes("developers/docs")) {
-    return "docs"
-  }
-
-  if (slug.includes("developers/tutorials")) {
-    return "tutorial"
-  }
-
-  return "static"
-}
-
 export default async function Page({
   params,
 }: {
@@ -69,7 +58,8 @@ export default async function Page({
     slug,
     // TODO: Address component typing error here (flip `FC` types to prop object types)
     // @ts-expect-error Incompatible component function signatures
-    components: { ...mdComponents, ...componentsMapping },
+    baseComponents: mdComponents,
+    componentsMapping,
     scope: {
       gfissues,
     },

app/[locale]/resources/_components/resources.tsx

@@ -125,8 +125,12 @@ const ResourcesPage = ({ txCostsMedianUsd }: ResourcesPageProps) => {
                       <div className="h-full bg-background bg-gradient-to-br from-white to-primary/10 px-2 py-6 dark:from-transparent dark:to-primary/10">
                         {metric && metric}
                         <ResourcesContainer>
-                          {items.map((item) => (
-                            <ResourceItem item={item} key={item.title} />
+                          {items.map(({ className, ...item }) => (
+                            <ResourceItem
+                              item={item}
+                              key={item.title}
+                              className={className}
+                            />
                           ))}
                         </ResourcesContainer>
                       </div>

app/[locale]/wallets/find-wallet/_components/find-wallet.tsx

@@ -2,18 +2,12 @@
 
 import type { ChildOnlyProp, Wallet } from "@/lib/types"
 
-import BannerNotification from "@/components/Banners/BannerNotification"
 import Breadcrumbs from "@/components/Breadcrumbs"
 import FindWalletProductTable from "@/components/FindWalletProductTable"
-import { Image } from "@/components/Image"
 import MainArticle from "@/components/MainArticle"
-import InlineLink from "@/components/ui/Link"
-
-import { cn } from "@/lib/utils/cn"
 
 import { useTranslation } from "@/hooks/useTranslation"
 import { usePathname } from "@/i18n/routing"
-import HeroImage from "@/public/images/wallets/wallet-hero.png"
 
 const Subtitle = ({ children }: ChildOnlyProp) => (
   <p className="mb-6 text-xl leading-[1.4] text-body-medium last:mb-8">
@@ -31,41 +25,12 @@ const FindWalletPage = ({ wallets }: Props) => {
 
   return (
     <MainArticle className="relative flex flex-col">
-      <BannerNotification shouldShow={true}>
-        {t("page-find-wallet-footnote-1")}
-      </BannerNotification>
-
-      <div
-        className={cn(
-          "relative mb-[44px] flex w-full flex-col p-12 md:flex-row",
-          "bg-gradient-to-r from-accent-a/10 to-accent-c/10 dark:from-accent-a/20 dark:to-accent-c-hover/20"
-        )}
-      >
-        <div className="mt-8 w-full sm:mt-0 md:w-1/2">
-          <Breadcrumbs slug={pathname} />
-          <h1 className="mb-8 mt-8 text-[2.5rem] leading-[1.4] md:text-5xl">
-            {t("page-find-wallet-title")}
-          </h1>
-          <Subtitle>{t("page-find-wallet-description")}</Subtitle>
-          <Subtitle>
-            {t("page-find-wallet-desc-2")}{" "}
-            <InlineLink href="/wallets">
-              {t("page-find-wallet-desc-2-wallets-link")}
-            </InlineLink>
-          </Subtitle>
-        </div>
-        <div className="flex w-full items-center justify-center md:w-1/2">
-          <Image
-            src={HeroImage}
-            // TODO: adjust value when the old theme breakpoints are removed (src/theme.ts)
-            sizes="(max-width: 480px) 100vw, 500px"
-            alt=""
-            priority
-            style={{
-              objectFit: "contain",
-            }}
-          />
-        </div>
+      <div className="flex w-full flex-col gap-8 px-4 pb-4 pt-11 md:w-1/2">
+        <Breadcrumbs slug={pathname} />
+        <h1 className="text-[2.5rem] leading-[1.4] md:text-5xl">
+          {t("page-find-wallet-title")}
+        </h1>
+        <Subtitle>{t("page-find-wallet-description")}</Subtitle>
       </div>
 
       <FindWalletProductTable wallets={wallets} />