Production Release 2024-08-01

src/auth/components/UserRedirect.tsx

@@ -0,0 +1,20 @@
+import { useIsAuthenticated } from "@/auth/hooks/queries/useIsAuthenticated";
+import { Redirect, Switch } from "react-router-dom";
+
+export function UserRedirect() {
+  const isAuthenticated = useIsAuthenticated();
+
+  if (isAuthenticated === undefined) {
+    return null;
+  }
+
+  if (isAuthenticated) {
+    return (
+      <Switch>
+        <Redirect to="/user/main" />
+      </Switch>
+    );
+  }
+
+  return null;
+}

src/auth/views/components/AuthContainer.tsx

@@ -3,6 +3,7 @@ import { Background } from "@/components/Background/Background";
 import { LandingPageAppBar } from "@/components/AppBar/LandingPageAppBar";
 import { ReactNode } from "react";
 import { PaddedCardContainer } from "@/components/Card/PaddedCardContainer";
+import { UserRedirect } from "@/auth/components/UserRedirect";
 
 interface Props {
   children?: ReactNode;
@@ -25,6 +26,7 @@ export function AuthContainer({ children, belowCard, aboveCard }: Props) {
         <PaddedCardContainer>{children}</PaddedCardContainer>
         {belowCard}
       </Box>
+      <UserRedirect />
     </Background>
   );
 }

src/components/Creatives/CreateCreativeButton.tsx

@@ -16,7 +16,11 @@ import {
   CreateCreativeDocument,
 } from "@/graphql-client/graphql";
 
-export function CreateCreativeButton() {
+interface Props {
+  index: number;
+}
+
+export function CreateCreativeButton({ index }: Props) {
   const { values, setFieldValue } = useFormikContext<CampaignForm>();
   const [, , isCreating] = useField<boolean>("isCreating");
   const [, newMeta, newHelper] = useField<Creative>("newCreative");
@@ -29,7 +33,11 @@ export function CreateCreativeButton() {
       values.adSets.forEach((adSet, idx) => {
         void setFieldValue(`adSets.${idx}.creatives`, [
           ...adSet.creatives,
-          validCreativeFields(data.createCreative, advertiser.id, true),
+          validCreativeFields(
+            data.createCreative,
+            advertiser.id,
+            idx === index,
+          ),
         ]);
       });
       isCreating.setValue(false);

src/components/Creatives/CreativeForm.tsx

@@ -120,10 +120,9 @@ const CreativeTypeSpecificFields = ({
 }: {
   creativeType?: string;
 }) => {
-  if (creativeType === "notification_all_v1")
-    return <NotificationAd useCustomButton />;
+  if (creativeType === "notification_all_v1") return <NotificationAd />;
   if (creativeType === "inline_content_all_v1")
-    return <InlineContentAd useCustomButton alignPreview="row" />;
+    return <InlineContentAd alignPreview="row" />;
 
   return null;
 };

src/components/Creatives/CreativeSelect.tsx

@@ -17,7 +17,7 @@ export function CreativeSelect(
     options: Creative[];
     useSelectedAdStyle?: boolean;
     showState?: boolean;
-    index?: number;
+    index: number;
     hideCreated?: boolean;
     useButtonSelection?: boolean;
   } & PropsWithChildren,
@@ -99,9 +99,11 @@ export function CreativeSelect(
           sx={{ maxWidth: "200px", alignSelf: "end", marginTop: 2 }}
           onClick={(e) => {
             e.preventDefault();
-
-            const mapped = curr.map((c) => ({ ...c, included: true }));
             values.adSets.forEach((adSet, idx) => {
+              const mapped = curr.map((c) => ({
+                ...c,
+                included: idx === index,
+              }));
               void setFieldValue(
                 `adSets.${idx}.creatives`,
                 _.uniqBy([...adSet.creatives, ...mapped], "id"),

src/user/ads/AdsExistingAd.tsx

@@ -27,7 +27,11 @@ import { useLingui } from "@lingui/react";
 import { useQuery } from "@apollo/client";
 import { filterCreativesByCampaignFormat } from "@/user/ads/filterCreativesByCampaignFormat";
 
-export function AdsExistingAd() {
+interface Props {
+  index: number;
+}
+
+export function AdsExistingAd({ index }: Props) {
   const { _: lingui } = useLingui();
   const { isShowingAds, setIsShowingAds } = useContext(FormContext);
   const { creatives } = useAdvertiserCreatives();
@@ -47,7 +51,9 @@ export function AdsExistingAd() {
         ["asc", "desc"],
       ) as CreativeFragment[];
 
-      const filtered = creativeOptionList.filter((c) => c.state === "active");
+      const filtered = creativeOptionList.filter(
+        (c) => c.state === "active" || c.state === "draft",
+      );
       const excludeExisting = filtered.filter((e) => {
         const associatedOptions = creatives ?? [];
         return associatedOptions.find((ao) => ao.id === e.id) === undefined;
@@ -79,7 +85,7 @@ export function AdsExistingAd() {
         <Typography variant="subtitle1" fontWeight={500}>
           <Trans>
             Ads are modular building blocks that can be paired with ad sets to
-            build unique combinations. Your previously approved ads will show
+            build unique combinations. Your previously created ads will show
             here. Select by using the box next to the name. Use the
             &quot;Complete selection&quot; button to finish.
           </Trans>
@@ -123,8 +129,8 @@ export function AdsExistingAd() {
               advertiserId: advertiser.id,
               included: false,
             }))}
+            index={index}
             useSelectedAdStyle={false}
-            showState={false}
             useButtonSelection
           />
         )}

src/user/ads/InlineContentAd.tsx

@@ -13,9 +13,9 @@ import { msg, Trans } from "@lingui/macro";
 
 interface InlineAdProps {
   name?: string;
-  useCustomButton?: boolean;
   useContainer?: boolean;
   alignPreview?: "column" | "row";
+  index?: number;
 }
 
 export function InlineContentAd(props: InlineAdProps) {
@@ -91,10 +91,10 @@ const InlineAdForm = (props: InlineAdProps) => {
         />
       )}
 
-      {props.useCustomButton !== true && (
+      {props.index !== undefined && (
         <Stack direction="row" justifyContent="space-between" mt={1}>
           <div />
-          <CreateCreativeButton />
+          <CreateCreativeButton index={props.index} />
         </Stack>
       )}
     </>

src/user/ads/NotificationAd.tsx

@@ -11,8 +11,8 @@ import { useLingui } from "@lingui/react";
 
 interface NotificationAdProps {
   name?: string;
-  useCustomButton?: boolean;
   useContainer?: boolean;
+  index?: number;
 }
 
 export function NotificationAd(props: NotificationAdProps) {
@@ -85,10 +85,10 @@ const NotificationAdForm = (props: NotificationAdProps) => {
         helperText={_(msg`Example - https://brave.com/brave-rewards/`)}
       />
 
-      {props.useCustomButton !== true && (
+      {props.index !== undefined && (
         <Stack direction="row" justifyContent="space-between" mt={1}>
           <div />
-          <CreateCreativeButton />
+          <CreateCreativeButton index={props.index} />
         </Stack>
       )}
     </>

src/user/views/adsManager/views/advanced/components/adSet/fields/AdSetAds.tsx

@@ -43,22 +43,32 @@ export function AdSetAds({ index }: Props) {
         <ShowAdsButton />
       </CardContainer>
 
-      <AdsExistingAd />
-      <CampaignFormatSpecificModal format={values.format} />
+      <AdsExistingAd index={index} />
+      <CampaignFormatSpecificModal format={values.format} index={index} />
     </>
   );
 }
 
-function CampaignFormatSpecificModal(props: { format: CampaignFormat }) {
+function CampaignFormatSpecificModal(props: {
+  format: CampaignFormat;
+  index: number;
+}) {
   const [, meta, helper] = useField<boolean>("isCreating");
   const name = "newCreative";
 
   let adComponent;
   if (props.format === CampaignFormat.PushNotification)
-    adComponent = <NotificationAd name={name} useContainer={false} />;
+    adComponent = (
+      <NotificationAd name={name} useContainer={false} index={props.index} />
+    );
   else if (props.format === CampaignFormat.NewsDisplayAd)
     adComponent = (
-      <InlineContentAd name={name} useContainer={false} alignPreview="row" />
+      <InlineContentAd
+        name={name}
+        useContainer={false}
+        alignPreview="row"
+        index={props.index}
+      />
     );
 
   return (