Merge branch 'main' of github.com:guildxyz/guild.xyz into restructure…

…-driver-with-referrals

package.json

@@ -53,7 +53,6 @@
     "@radix-ui/react-focus-scope": "^1.1.0",
     "@radix-ui/react-label": "^2.1.0",
     "@radix-ui/react-popover": "^1.1.1",
-    "@radix-ui/react-progress": "^1.1.0",
     "@radix-ui/react-select": "^2.1.1",
     "@radix-ui/react-separator": "^1.1.0",
     "@radix-ui/react-slot": "^1.1.0",

src/pages/[guild]/index.tsx

@@ -22,6 +22,7 @@ import useStayConnectedToast from "components/[guild]/StayConnectedToast"
 import { ThemeProvider, useThemeContext } from "components/[guild]/ThemeContext"
 import useGuild from "components/[guild]/hooks/useGuild"
 import useGuildPermission from "components/[guild]/hooks/useGuildPermission"
+import InfoBanner from "components/_app/InfoBanner"
 import { BackToExplorerButton } from "components/common/Layout/components/BackToExplorerButton"
 import LinkPreviewHead from "components/common/LinkPreviewHead"
 import Section from "components/common/Section"
@@ -85,7 +86,7 @@ const DynamicDiscordBotPermissionsChecker = dynamic(
 )
 
 const GuildPage = (): JSX.Element => {
-  const { description, socialLinks, featureFlags, isDetailed } = useGuild()
+  const { description, socialLinks, featureFlags, isDetailed, urlName } = useGuild()
 
   const { isAdmin } = useGuildPermission()
   const { isMember } = useMembership()
@@ -103,6 +104,16 @@ const GuildPage = (): JSX.Element => {
       {featureFlags?.includes("ONGOING_ISSUES") && <DynamicOngoingIssuesBanner />}
 
       <Layout>
+        {/* temporary */}
+        {urlName === "base" && (
+          <InfoBanner>
+            <b>Important Notice: Discord Role Distribution Delay</b> We are currently
+            experiencing a delay in Discord role distribution due to Discord's API
+            rate limit and the high volume of new members. While this process may
+            take longer than usual, we kindly ask for your patience and
+            understanding.
+          </InfoBanner>
+        )}
         <LayoutHero className="pb-24">
           <LayoutBanner>
             <GuildPageBanner />

src/v2/components/ui/Form.tsx

@@ -97,7 +97,7 @@ const FormLabel = forwardRef<
     <Label
       ref={ref}
       className={cn(
-        "group mb-2 text-md aria-disabled:text-muted-foreground",
+        "group mb-2 text-md aria-disabled:text-muted-foreground ",
         className
       )}
       htmlFor={formItemId}

src/v2/components/ui/Select.stories.tsx

@@ -0,0 +1,30 @@
+import {
+  SelectContent,
+  SelectItem,
+  Select as SelectRoot,
+  SelectTrigger,
+  SelectValue,
+} from "@/components/ui/Select"
+import { Meta } from "@storybook/react"
+
+export const Select = () => {
+  return (
+    <SelectRoot>
+      <SelectTrigger>
+        <SelectValue placeholder="Theme" />
+      </SelectTrigger>
+      <SelectContent>
+        <SelectItem value="light">Light</SelectItem>
+        <SelectItem value="dark">Dark</SelectItem>
+        <SelectItem value="system">System</SelectItem>
+      </SelectContent>
+    </SelectRoot>
+  )
+}
+
+const meta: Meta<typeof Select> = {
+  title: "Design system/Select",
+  component: Select,
+}
+
+export default meta