Merge pull request #15879 from ethereum/master

Back merge `master` into `staging`

Author: wackerow

public/images/developers/resources-banner.png

@@ -34,7 +34,7 @@ const FixedDot = forwardRef<HTMLButtonElement, FixedDotProps>(
         {...props}
       >
         <FeedbackGlyphIcon
-          className={cn("text-white", !isExpanded && "-mx-1")}
+          className={cn("!h-8 !w-[26px] text-white", !isExpanded && "-mx-1")}
         />
         <div
           className={cn(

src/components/FeedbackWidget/FixedDot.tsx

@@ -38,7 +38,7 @@ const HamburgerButton = forwardRef<HTMLButtonElement, HamburgerProps>(
       >
         <svg
           viewBox="0 0 24 40"
-          className="relative h-10 w-6 stroke-body stroke-2 hover:stroke-primary-hover hover:text-primary-hover [&>path]:fill-none hover:[&>path]:stroke-primary-hover"
+          className="relative !h-10 !w-6 stroke-body stroke-2 hover:stroke-primary-hover hover:text-primary-hover [&>path]:fill-none hover:[&>path]:stroke-primary-hover"
           strokeLinecap="round"
           strokeLinejoin="round"
         >

src/components/Nav/Mobile/HamburgerButton.tsx

@@ -2,7 +2,6 @@ import type { Meta, StoryObj } from "@storybook/react"
 
 import { Center, Flex } from "../ui/flex"
 
-import FilterBurgerIcon from "./wallets/filter-burger.svg"
 import HighlightIcon from "./highlight.svg"
 import HighlightDarkIcon from "./highlight-dark.svg"
 import {
@@ -13,7 +12,6 @@ import {
   TrophyIcon,
 } from "./quiz"
 import {
-  DecentralizationEthGlyphIcon,
   DecentralizationGlyphIcon,
   DownloadGlyphIcon,
   EarthGlyphIcon,
@@ -101,105 +99,101 @@ const meta = {
 export default meta
 
 const iconsDefinitions = [
-  CorrectIcon,
-  IncorrectIcon,
-  GreenTickIcon,
-  StarConfettiIcon,
-  TrophyIcon,
-  DecentralizationGlyphIcon,
-  DecentralizationEthGlyphIcon,
-  DownloadGlyphIcon,
-  EarthGlyphIcon,
-  HardwareGlyphIcon,
-  MegaphoneGlyphIcon,
-  PrivacyGlyphIcon,
-  SovereigntyGlyphIcon,
-  VoteGlyphIcon,
-  AbyssGlyphIcon,
-  AllnodesGlyphIcon,
-  AnkrGlyphIcon,
-  AuditedIcon,
-  AvadoGlyphIcon,
-  BattleTestedIcon,
-  BedrockGlyphIcon,
-  BugBountyIcon,
-  CautionProductGlyph,
-  ChainLaboGlyphIcon,
-  ConsensysStakingGlyphIcon,
-  StakingDappnodeGlyphIcon,
-  DefaultOpenSourceGlyphIcon,
-  DockerGlyphIcon,
-  EconomicalIcon,
-  EthpoolGlyphIcon,
-  EverstakeGlyphIcon,
-  FigmentGlyphIcon,
-  GreenCheckProductGlyph,
-  P2PGlyphIcon,
-  KilnGlyphIcon,
-  LaunchnodesGlyphIcon,
-  LidoGlyphIcon,
-  LiquidityTokenIcon,
-  MultiClientIcon,
-  OpenSourceStakingIcon,
-  PermissionlessIcon,
-  RocketPoolGlyphIcon,
-  RockXGlyphIcon,
-  SelfCustodyIcon,
-  SenseiNodeGlyphIcon,
-  StafiGlyphIcon,
-  StakefishGlyphIcon,
-  StakewiseGlyphIcon,
-  StakingGlyphCentralizedIcon,
-  StakingGlyphCloudIcon,
-  StakingGlyphCPUIcon,
-  StakingGlyphEtherCircleIcon,
-  StakingGlyphTokenWalletIcon,
-  StereumGlyphIcon,
-  SquidGlyphIcon,
-  TrustlessIcon,
-  UnknownProductGlyph,
-  WagyuGlyphIcon,
-  WarningProductGlyph,
-  BrowserIcon,
-  BuyCryptoIcon,
-  ConnectDappsIcon,
-  DesktopIcon,
-  ENSSupportIcon,
-  ERC20SupportIcon,
-  FilterBurgerIcon,
-  GasFeeCustomizationIcon,
-  HardwareIcon,
-  HardwareSupportIcon,
-  Layer2Icon,
-  MobileIcon,
-  MultisigIcon,
-  NFTSupportIcon,
-  NonCustodialIcon,
-  OpenSourceWalletIcon,
-  RPCImportingIcon,
-  SocialRecoverIcon,
-  StakingIcon,
-  SwapIcon,
-  WithdrawCryptoIcon,
-  EthHomeIcon,
-  FeedbackThumbsUpIcon,
-  HighlightDarkIcon,
-  HighlightIcon,
+  { label: "AbyssGlyphIcon", Icon: AbyssGlyphIcon },
+  { label: "AllnodesGlyphIcon", Icon: AllnodesGlyphIcon },
+  { label: "AnkrGlyphIcon", Icon: AnkrGlyphIcon },
+  { label: "AuditedIcon", Icon: AuditedIcon },
+  { label: "AvadoGlyphIcon", Icon: AvadoGlyphIcon },
+  { label: "BattleTestedIcon", Icon: BattleTestedIcon },
+  { label: "BedrockGlyphIcon", Icon: BedrockGlyphIcon },
+  { label: "BrowserIcon", Icon: BrowserIcon },
+  { label: "BugBountyIcon", Icon: BugBountyIcon },
+  { label: "BuyCryptoIcon", Icon: BuyCryptoIcon },
+  { label: "CautionProductGlyph", Icon: CautionProductGlyph },
+  { label: "ChainLaboGlyphIcon", Icon: ChainLaboGlyphIcon },
+  { label: "ConnectDappsIcon", Icon: ConnectDappsIcon },
+  { label: "ConsensysStakingGlyphIcon", Icon: ConsensysStakingGlyphIcon },
+  { label: "CorrectIcon", Icon: CorrectIcon },
+  { label: "DecentralizationGlyphIcon", Icon: DecentralizationGlyphIcon },
+  { label: "DefaultOpenSourceGlyphIcon", Icon: DefaultOpenSourceGlyphIcon },
+  { label: "DesktopIcon", Icon: DesktopIcon },
+  { label: "DockerGlyphIcon", Icon: DockerGlyphIcon },
+  { label: "DownloadGlyphIcon", Icon: DownloadGlyphIcon },
+  { label: "EarthGlyphIcon", Icon: EarthGlyphIcon },
+  { label: "EconomicalIcon", Icon: EconomicalIcon },
+  { label: "ENSSupportIcon", Icon: ENSSupportIcon },
+  { label: "ERC20SupportIcon", Icon: ERC20SupportIcon },
+  { label: "EthHomeIcon", Icon: EthHomeIcon },
+  { label: "EthpoolGlyphIcon", Icon: EthpoolGlyphIcon },
+  { label: "EverstakeGlyphIcon", Icon: EverstakeGlyphIcon },
+  { label: "FeedbackThumbsUpIcon", Icon: FeedbackThumbsUpIcon },
+  { label: "FigmentGlyphIcon", Icon: FigmentGlyphIcon },
+  { label: "GasFeeCustomizationIcon", Icon: GasFeeCustomizationIcon },
+  { label: "GreenCheckProductGlyph", Icon: GreenCheckProductGlyph },
+  { label: "GreenTickIcon", Icon: GreenTickIcon },
+  { label: "HardwareGlyphIcon", Icon: HardwareGlyphIcon },
+  { label: "HardwareIcon", Icon: HardwareIcon },
+  { label: "HardwareSupportIcon", Icon: HardwareSupportIcon },
+  { label: "HighlightDarkIcon", Icon: HighlightDarkIcon },
+  { label: "HighlightIcon", Icon: HighlightIcon },
+  { label: "IncorrectIcon", Icon: IncorrectIcon },
+  { label: "KilnGlyphIcon", Icon: KilnGlyphIcon },
+  { label: "LaunchnodesGlyphIcon", Icon: LaunchnodesGlyphIcon },
+  { label: "Layer2Icon", Icon: Layer2Icon },
+  { label: "LidoGlyphIcon", Icon: LidoGlyphIcon },
+  { label: "LiquidityTokenIcon", Icon: LiquidityTokenIcon },
+  { label: "MegaphoneGlyphIcon", Icon: MegaphoneGlyphIcon },
+  { label: "MobileIcon", Icon: MobileIcon },
+  { label: "MultiClientIcon", Icon: MultiClientIcon },
+  { label: "MultisigIcon", Icon: MultisigIcon },
+  { label: "NFTSupportIcon", Icon: NFTSupportIcon },
+  { label: "NonCustodialIcon", Icon: NonCustodialIcon },
+  { label: "OpenSourceStakingIcon", Icon: OpenSourceStakingIcon },
+  { label: "OpenSourceWalletIcon", Icon: OpenSourceWalletIcon },
+  { label: "P2PGlyphIcon", Icon: P2PGlyphIcon },
+  { label: "PermissionlessIcon", Icon: PermissionlessIcon },
+  { label: "PrivacyGlyphIcon", Icon: PrivacyGlyphIcon },
+  { label: "RocketPoolGlyphIcon", Icon: RocketPoolGlyphIcon },
+  { label: "RockXGlyphIcon", Icon: RockXGlyphIcon },
+  { label: "RPCImportingIcon", Icon: RPCImportingIcon },
+  { label: "SelfCustodyIcon", Icon: SelfCustodyIcon },
+  { label: "SenseiNodeGlyphIcon", Icon: SenseiNodeGlyphIcon },
+  { label: "SocialRecoverIcon", Icon: SocialRecoverIcon },
+  { label: "SovereigntyGlyphIcon", Icon: SovereigntyGlyphIcon },
+  { label: "SquidGlyphIcon", Icon: SquidGlyphIcon },
+  { label: "StafiGlyphIcon", Icon: StafiGlyphIcon },
+  { label: "StakefishGlyphIcon", Icon: StakefishGlyphIcon },
+  { label: "StakewiseGlyphIcon", Icon: StakewiseGlyphIcon },
+  { label: "StakingDappnodeGlyphIcon", Icon: StakingDappnodeGlyphIcon },
+  { label: "StakingGlyphCentralizedIcon", Icon: StakingGlyphCentralizedIcon },
+  { label: "StakingGlyphCloudIcon", Icon: StakingGlyphCloudIcon },
+  { label: "StakingGlyphCPUIcon", Icon: StakingGlyphCPUIcon },
+  { label: "StakingGlyphEtherCircleIcon", Icon: StakingGlyphEtherCircleIcon },
+  { label: "StakingGlyphTokenWalletIcon", Icon: StakingGlyphTokenWalletIcon },
+  { label: "StakingIcon", Icon: StakingIcon },
+  { label: "StarConfettiIcon", Icon: StarConfettiIcon },
+  { label: "StereumGlyphIcon", Icon: StereumGlyphIcon },
+  { label: "SwapIcon", Icon: SwapIcon },
+  { label: "TrophyIcon", Icon: TrophyIcon },
+  { label: "TrustlessIcon", Icon: TrustlessIcon },
+  { label: "UnknownProductGlyph", Icon: UnknownProductGlyph },
+  { label: "VoteGlyphIcon", Icon: VoteGlyphIcon },
+  { label: "WagyuGlyphIcon", Icon: WagyuGlyphIcon },
+  { label: "WarningProductGlyph", Icon: WarningProductGlyph },
+  { label: "WithdrawCryptoIcon", Icon: WithdrawCryptoIcon },
 ]
 
-iconsDefinitions.sort((a, b) =>
-  (a?.displayName || "") > (b?.displayName || "") ? 1 : -1
-)
-const items = iconsDefinitions.map((IconDef, idx) => {
+iconsDefinitions.sort((a, b) => ((a?.label || "") > (b?.label || "") ? 1 : -1))
+const items = iconsDefinitions.map(({ Icon, label }, idx) => {
   return (
     <Flex
       key={idx}
       className="flex-col gap-4 border border-background-highlight p-4"
     >
       <Center>
-        <IconDef className="size-[50px]" />
+        <Icon className="size-[50px]" />
       </Center>
-      <Center>{IconDef.displayName}</Center>
+      <Center>{label}</Center>
     </Flex>
   )
 })

src/components/icons/Icons.stories.tsx

@@ -1,4 +1,3 @@
-import DecentralizationEthGlyphIcon from "./decentralization-eth-glyph.svg"
 import DecentralizationGlyphIcon from "./decentralization-glyph.svg"
 import DownloadGlyphIcon from "./download-glyph.svg"
 import EarthGlyphIcon from "./earth-glyph.svg"
@@ -9,7 +8,6 @@ import SovereigntyGlyphIcon from "./sovereignty-glyph.svg"
 import VoteGlyphIcon from "./vote-glyph.svg"
 
 export {
-  DecentralizationEthGlyphIcon,
   DecentralizationGlyphIcon,
   DownloadGlyphIcon,
   EarthGlyphIcon,