Merge pull request #13372 from ethereum/staging

Backmerge banner fix

Author: corwintines

src/components/BannerNotification/DismissableBanner.stories.tsx

@@ -3,7 +3,7 @@ import React from "react"
 import { Center, Text } from "@chakra-ui/react"
 
 // Components
-import BannerNotification from "@/components/BannerNotification"
+import BannerNotification from "@/components/Banners/BannerNotification"
 
 const BugBountyBanner = () => (
   <BannerNotification shouldShow>

src/components/BannerNotification/index.tsx renamed to src/components/Banners/BannerNotification.tsx

@@ -3,7 +3,7 @@ import React, { useEffect, useState } from "react"
 import { Center, CloseButton } from "@chakra-ui/react"
 
 // Components
-import BannerNotification from "@/components/BannerNotification"
+import BannerNotification from "../BannerNotification"
 
 // Interface
 export type DismissableBannerProps = {
@@ -28,9 +28,9 @@ const DismissableBanner = ({
   }
 
   return (
-    <BannerNotification shouldShow={show}>
-      <Center paddingEnd={8}>{children}</Center>
-      <CloseButton onClick={onClose} aria-label="Close Banner" />
+    <BannerNotification shouldShow={show} gap='8'>
+      <Center marginInlineStart='auto'>{children}</Center>
+      <CloseButton marginInlineStart='auto' onClick={onClose} aria-label="Close Banner" />
     </BannerNotification>
   )
 }

src/components/Banners/BugBountyBanner/index.tsx

@@ -1,8 +1,9 @@
 import { Box } from "@chakra-ui/react"
 
+import Emoji from "../Emoji"
+import InlineLink from "../Link"
+
 import BannerNotification from "./BannerNotification"
-import Emoji from "./Emoji"
-import InlineLink from "./Link"
 
 const UpgradeBannerNotification = () => (
   <BannerNotification shouldShow>

src/components/Banners/DismissableBanner/index.tsx

@@ -16,7 +16,7 @@ import {
 import { ChildOnlyProp } from "@/lib/types"
 import type { DocsFrontmatter, MdPageContent } from "@/lib/interfaces"
 
-import BannerNotification from "@/components/BannerNotification"
+import BannerNotification from "@/components/Banners/BannerNotification"
 import { ButtonLink } from "@/components/Buttons"
 import CallToContribute from "@/components/CallToContribute"
 import Card from "@/components/Card"

src/components/UpgradeBannerNotification.tsx renamed to src/components/Banners/UpgradeBannerNotification.tsx

@@ -14,7 +14,7 @@ import {
 import type { ChildOnlyProp } from "@/lib/types"
 import type { MdPageContent, UseCasesFrontmatter } from "@/lib/interfaces"
 
-import BannerNotification from "@/components/BannerNotification"
+import BannerNotification from "@/components/Banners/BannerNotification"
 import { List as ButtonDropdownList } from "@/components/ButtonDropdown"
 import Emoji from "@/components/Emoji"
 import FeedbackCard from "@/components/FeedbackCard"

src/layouts/Docs.tsx

@@ -15,7 +15,7 @@ import {
 
 import type { BasePageProps, ChildOnlyProp, Lang, Wallet } from "@/lib/types"
 
-import BannerNotification from "@/components/BannerNotification"
+import BannerNotification from "@/components/Banners/BannerNotification"
 import Breadcrumbs from "@/components/Breadcrumbs"
 import { MobileFiltersMenu } from "@/components/FindWallet/MobileFiltersMenu"
 import WalletFilterPersona from "@/components/FindWallet/WalletFilterPersona"