trim prop forwarding and locale lookups

Author: dnywh

src/components/DropdownIcon/DropdownIcon.jsx

@@ -3,7 +3,9 @@ import { styled } from "@pigment-css/react";
 
 // See ChevronRightIcon too, which was a fork of this (and more basic primitive)
 // In fact, perhaps this should have a ChevronDownIcon embedded
-const StyledIconWrapper = styled(IconWrapper)(({ theme }) => ({
+const StyledIconWrapper = styled(IconWrapper, {
+  shouldForwardProp: (prop) => prop !== "variant",
+})(({ theme }) => ({
   pointerEvents: "none",
   position: "absolute",
   right: "0.75rem",

src/components/Select/Select.jsx

@@ -7,7 +7,9 @@ const SilentContainer = styled("div")(({ theme }) => ({
   position: "relative",
 }));
 
-const StyledSelect = styled(HeadlessSelect)(({ theme }) => ({
+const StyledSelect = styled(HeadlessSelect, {
+  shouldForwardProp: (prop) => prop !== "variant",
+})(({ theme }) => ({
   width: "100%",
   appearance: "none", // Reset browser-specific styles
   color: theme.colors.text.ui.primary,

src/i18n/services/locale.ts

@@ -38,6 +38,15 @@ export async function getUserLocale() {
   } = await supabase.auth.getUser();
 
   if (user?.id) {
+    const metadataLocale = normaliseLocale(
+      typeof user.user_metadata?.preferred_locale === "string"
+        ? user.user_metadata.preferred_locale
+        : null
+    );
+    if (metadataLocale) {
+      return metadataLocale;
+    }
+
     const { data: profile, error: profileError } = await supabase
       .from("profiles")
       .select("preferred_locale")
@@ -55,15 +64,6 @@ export async function getUserLocale() {
     if (profileLocale) {
       return profileLocale;
     }
-
-    const metadataLocale = normaliseLocale(
-      typeof user.user_metadata?.preferred_locale === "string"
-        ? user.user_metadata.preferred_locale
-        : null
-    );
-    if (metadataLocale) {
-      return metadataLocale;
-    }
   }
 
   if (acceptedLocales.length > 0) {

supabase/functions/send-email-for-newsletter-issue-resend-audience/index.ts

@@ -26,10 +26,6 @@ const handler = async (_request: Request): Promise<Response> => {
 
     const audienceConfigs = getNewsletterAudienceConfigs();
 
-    if (audienceConfigs.length === 0) {
-      throw new Error("No newsletter audiences configured");
-    }
-
     const broadcasts = [];
 
     for (const { locale, audienceId } of audienceConfigs) {