Merge branch 'develop' into na/backend/disc-events-exclude-attending

nabramow · web-flow · commit 2c879f9cc321 · 2026-06-25T12:07:07.000+01:00
diff --git a/app/backend/src/couchers/servicers/bugs.py b/app/backend/src/couchers/servicers/bugs.py
@@ -202,7 +202,7 @@ def ReportBug(
             f"**Page**: {request.page}\n"
             f"**User**: {user_details} / `{(context._sofa or '')[:12]}`"
         )
-        issue_labels = ["bug tool", "bug: triage needed"]
+        issue_labels = ["bug: triage needed"]
 
         json_body = {"title": issue_title, "body": issue_body, "labels": issue_labels}
 
diff --git a/app/backend/src/tests/test_bugs.py b/app/backend/src/tests/test_bugs.py
@@ -69,7 +69,7 @@ def dud_post(url, auth, json):
             assert json == {
                 "title": "subject",
                 "body": expected_body,
-                "labels": ["bug tool", "bug: triage needed"],
+                "labels": ["bug: triage needed"],
             }
 
             class _PostReturn:
@@ -130,7 +130,7 @@ def dud_post(url, auth, json):
             assert json == {
                 "title": "subject",
                 "body": expected_body,
-                "labels": ["bug tool", "bug: triage needed"],
+                "labels": ["bug: triage needed"],
             }
 
             class _PostReturn:
diff --git a/app/web/components/FlipCard.tsx b/app/web/components/FlipCard.tsx
@@ -1,8 +1,8 @@
 import { Box, Stack, Typography } from "@mui/material";
+import { useTranslation } from "i18n";
+import { GLOBAL } from "i18n/namespaces";
 import { ReactNode, useCallback, useState } from "react";
 
-import { useTranslation } from "../i18n";
-
 export interface FlipCardProps {
   icon: ReactNode;
   title: ReactNode;
@@ -20,7 +20,7 @@ export default function FlipCard({
   children,
   height = { xs: 300, md: 320 },
 }: FlipCardProps) {
-  const { t } = useTranslation(["GLOBAL"]);
+  const { t } = useTranslation([GLOBAL]);
   const [flipped, setFlipped] = useState(false);
   const toggle = useCallback(() => setFlipped((f) => !f), []);
 
diff --git a/app/web/components/Navigation/ReportButton.tsx b/app/web/components/Navigation/ReportButton.tsx
@@ -9,6 +9,7 @@ import {
 import Button from "components/Button";
 import { BugIcon } from "components/Icons";
 import { useTranslation } from "i18n";
+import { GLOBAL } from "i18n/namespaces";
 import { useState } from "react";
 import { theme } from "theme";
 
@@ -40,7 +41,7 @@ export default function ReportButton({
   isMenuLink?: boolean;
   sx?: SxProps<Theme>;
 }) {
-  const { t } = useTranslation("global");
+  const { t } = useTranslation(GLOBAL);
   const isBelowMd = useMediaQuery(theme.breakpoints.down("md"));
   const [isDialogOpen, setIsDialogOpen] = useState(false);
 
diff --git a/app/web/components/Navigation/ReportDialog.tsx b/app/web/components/Navigation/ReportDialog.tsx
@@ -14,6 +14,7 @@ import StyledLink from "components/StyledLink";
 import TextField from "components/TextField";
 import { RpcError } from "grpc-web";
 import { useTranslation } from "i18n";
+import { GLOBAL } from "i18n/namespaces";
 import { ReportBugRes } from "proto/bugs_pb";
 import { ComponentPropsWithRef, forwardRef, useState } from "react";
 import { useForm } from "react-hook-form";
@@ -56,7 +57,7 @@ const StyledReportTypeButton = styled(Button)(() => ({
 }));
 
 export default function ReportDialog({ open, onClose }: DialogProps) {
-  const { t } = useTranslation("global");
+  const { t } = useTranslation(GLOBAL);
 
   const [type, setType] = useState<"initial" | "bug">("initial");
   const {
diff --git a/app/web/components/StrongVerificationBadge.tsx b/app/web/components/StrongVerificationBadge.tsx
@@ -4,10 +4,10 @@ import { useTranslation } from "i18n";
 import { GLOBAL } from "i18n/namespaces";
 import React from "react";
 
-const StyledSpan = styled("span")(({ theme }) => ({
-  display: "inline-block",
+const StyledSpan = styled("span")(() => ({
+  display: "inline-flex",
+  alignItems: "center",
   verticalAlign: "middle",
-  marginLeft: theme.spacing(0.5),
 }));
 
 export default function StrongVerificationBadge() {
diff --git a/app/web/components/TOSLink.tsx b/app/web/components/TOSLink.tsx
@@ -1,4 +1,5 @@
 import { styled } from "@mui/material";
+import { GLOBAL } from "i18n/namespaces";
 import Link from "next/link";
 import { useTranslation } from "next-i18next";
 import { tosRoute } from "routes";
@@ -9,7 +10,7 @@ const StyledLink = styled(Link)(({ theme }) => ({
 }));
 
 export default function TOSLink() {
-  const { t } = useTranslation("global");
+  const { t } = useTranslation(GLOBAL);
   return (
     <StyledLink href={tosRoute} target="_blank">
       {t("terms_of_service")}
diff --git a/app/web/components/UserSummary.tsx b/app/web/components/UserSummary.tsx
@@ -1,4 +1,5 @@
 import {
+  Box,
   ListItemAvatar,
   ListItemText,
   Skeleton,
@@ -17,6 +18,13 @@ import useIsScreenSizeOrSmaller from "utils/useIsScreenSizeOrSmaller";
 
 import StrongVerificationBadge from "./StrongVerificationBadge";
 
+// It could be BlockedUser.AsObject or LiteUser.AsObject and only LiteUser has hasStrongVerification
+function isLiteUser(
+  user: LiteUser.AsObject | BlockedUser.AsObject,
+): user is LiteUser.AsObject {
+  return "hasStrongVerification" in user;
+}
+
 const StyledWrapper = styled("div")({
   display: "flex",
   padding: 0,
@@ -125,16 +133,14 @@ export default function UserSummary({
             sx={{ maxWidth: 300 }}
           />
         ) : (
-          <>
+          <Box sx={{ display: "flex", alignItems: "center", gap: 0.5 }}>
             {nameOnly
               ? nameValue
               : `${nameValue}${user && "age" in user ? `, ${user.age}` : ""}`}
-            {user &&
-            "hasStrongVerification" in user &&
-            user.hasStrongVerification ? (
+            {isLiteUser(user) && user.hasStrongVerification && (
               <StrongVerificationBadge />
-            ) : null}
-          </>
+            )}
+          </Box>
         )}
       </Typography>
     </Tooltip>
diff --git a/app/web/features/communities/CommunityPage/CommunityPage.tsx b/app/web/features/communities/CommunityPage/CommunityPage.tsx
@@ -1,4 +1,3 @@
-import { useFeatureValue } from "@growthbook/growthbook-react";
 import { styled, Typography } from "@mui/material";
 import HtmlMeta from "components/HtmlMeta";
 import EditCommunityPage from "features/communities/EditCommunityInfoPage";
@@ -33,7 +32,7 @@ export default function CommunityPage({
   edit: boolean | undefined;
 }) {
   const { t } = useTranslation([COMMUNITIES]);
-  const isPublicTripsEnabled = useFeatureValue("public_trips_enabled", false);
+  const isPublicTripsEnabled = process.env.NODE_ENV !== "production";
 
   return (
     <CommunityBase communityId={communityId}>
diff --git a/app/web/features/communities/CommunityPage/CommunityPageSubHeader.tsx b/app/web/features/communities/CommunityPage/CommunityPageSubHeader.tsx
@@ -1,4 +1,3 @@
-import { useFeatureValue } from "@growthbook/growthbook-react";
 import { TabContext } from "@mui/lab";
 import { Breadcrumbs, styled, Typography } from "@mui/material";
 import BetaFlag from "components/BetaFlag";
@@ -34,7 +33,7 @@ export default function CommunityPageSubHeader({
   tab: CommunityTab;
 }) {
   const { t } = useTranslation([COMMUNITIES, PUBLIC_TRIPS]);
-  const isPublicTripsEnabled = useFeatureValue("public_trips_enabled", false);
+  const isPublicTripsEnabled = process.env.NODE_ENV !== "production";
 
   const router = useRouter();
   const communityTabBarLabels: Partial<
diff --git a/app/web/features/dashboard/Dashboard.tsx b/app/web/features/dashboard/Dashboard.tsx
@@ -1,4 +1,3 @@
-import { useFeatureValue } from "@growthbook/growthbook-react";
 import { Alert, Box, Grid, Typography } from "@mui/material";
 import Divider from "components/Divider";
 import HtmlMeta from "components/HtmlMeta";
@@ -22,7 +21,7 @@ import UpcomingStays from "./UpcomingStays";
 
 export default function Dashboard() {
   const { t } = useTranslation([GLOBAL, DASHBOARD]);
-  const isPublicTripsEnabled = useFeatureValue("public_trips_enabled", false);
+  const isPublicTripsEnabled = process.env.NODE_ENV !== "production";
 
   return (
     <>
diff --git a/app/web/features/profile/view/UserOverview.tsx b/app/web/features/profile/view/UserOverview.tsx
@@ -126,11 +126,9 @@ export default function UserOverview({
       )}
 
       <StyledWrapper>
-        <StyledIntro variant="h1">
-          <span>
-            {user.name}
-            {user.hasStrongVerification ? <StrongVerificationBadge /> : null}
-          </span>
+        <StyledIntro variant="h1" gap={0.5}>
+          {user.name}
+          {user.hasStrongVerification && <StrongVerificationBadge />}
         </StyledIntro>
         <StyledLink
           href={routeToUser(user.username)}
diff --git a/app/web/features/profile/view/userLabels.tsx b/app/web/features/profile/view/userLabels.tsx
@@ -82,7 +82,7 @@ export const ResponseRateLabel = ({ user }: Props) => {
   const {
     t,
     i18n: { language },
-  } = useTranslation("profile");
+  } = useTranslation(PROFILE);
   // Localize the humanized durations at the call site (no global dayjs locale).
   const dayjsLocale = i18nToDayjsLocale(language);
 
@@ -163,7 +163,7 @@ const AgeAndGenderRenderer = ({ user }: Props) => {
     gender,
     pronouns,
   } = user;
-  const { t } = useTranslation("profile");
+  const { t } = useTranslation(PROFILE);
 
   const getBirthdateVerificationIcon = (
     status: BirthdateVerificationStatus,
@@ -233,7 +233,7 @@ const AgeAndGenderRenderer = ({ user }: Props) => {
 };
 
 export const AgeGenderLanguagesLabels = ({ user }: Props) => {
-  const { t } = useTranslation("profile");
+  const { t } = useTranslation(PROFILE);
   const { languages } = useLanguages();
 
   return (
diff --git a/app/web/features/search/SeachResultUserCard.tsx b/app/web/features/search/SeachResultUserCard.tsx
@@ -3,6 +3,7 @@ import { FlexboxProps, useMediaQuery } from "@mui/system";
 import Avatar from "components/Avatar";
 import { OpenInNewIcon } from "components/Icons";
 import ProfileLink from "components/ProfileLink/ProfileLink";
+import StrongVerificationBadge from "components/StrongVerificationBadge";
 import StyledLink from "components/StyledLink";
 import { useImpressionRef, useLogEvent } from "features/analytics/hooks";
 import { useSearchAnalytics } from "features/analytics/searchAnalyticsContext";
@@ -293,6 +294,7 @@ const SearchResultUserCard = ({
                   {user.name}
                 </Typography>
               </ProfileLink>
+              {user.hasStrongVerification && <StrongVerificationBadge />}
             </FlexRow>
             {!isNativeEmbed && !isMobile && (
               <StyledLink
diff --git a/app/web/pages/public-trips.tsx b/app/web/pages/public-trips.tsx
@@ -12,6 +12,14 @@ import nextI18nextConfig from "next-i18next.config";
 import { serverSideTranslations } from "next-i18next/serverSideTranslations";
 
 export const getStaticProps: GetStaticProps = async ({ locale }) => {
+  const isPublicTripsEnabled = process.env.NODE_ENV !== "production";
+
+  if (!isPublicTripsEnabled) {
+    return {
+      notFound: true,
+    };
+  }
+
   return {
     props: {
       ...(await serverSideTranslations(

Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,7 @@ def ReportBug(`
`202`	`202`	`f"Page: {request.page}\n"`
`203`	`203`	f"User: {user_details} / `{(context._sofa or '')[:12]}`"
`204`	`204`	`)`
`205`		`- issue_labels = ["bug tool", "bug: triage needed"]`
	`205`	`+ issue_labels = ["bug: triage needed"]`
`206`	`206`
`207`	`207`	`json_body = {"title": issue_title, "body": issue_body, "labels": issue_labels}`
`208`	`208`