Merge pull request #1366 from brave/master

Production Release 2024-10-08

package.json

@@ -70,7 +70,7 @@
     "@parcel/watcher": "2.4.1",
     "@types/lodash": "4.17.9",
     "@types/papaparse": "5.3.14",
-    "@types/react": "18.3.9",
+    "@types/react": "18.3.10",
     "@types/react-dom": "18.3.0",
     "@types/react-router-dom": "5.3.3",
     "@types/react-window": "1.8.8",
@@ -80,10 +80,10 @@
     "eslint": "8.57.1",
     "eslint-config-prettier": "9.1.0",
     "eslint-plugin-lingui": "0.3.0",
-    "eslint-plugin-react": "7.36.1",
+    "eslint-plugin-react": "7.37.0",
     "eslint-plugin-react-hooks": "4.6.2",
     "husky": "9.1.6",
-    "knip": "5.30.5",
+    "knip": "5.30.6",
     "lint-staged": "15.2.10",
     "npm-run-all2": "6.2.3",
     "prettier": "3.3.3",

src/components/Campaigns/CloseCampaignModal.tsx

@@ -0,0 +1,134 @@
+import { graphql } from "@/graphql-client/index";
+import { Box, Button, Modal, Stack, Typography } from "@mui/material";
+import { useContext, useState } from "react";
+import { modalStyles } from "@/theme";
+import { useAdvertiser } from "@/auth/hooks/queries/useAdvertiser";
+import { useMutation } from "@apollo/client";
+import BigNumber from "bignumber.js";
+import { Trans } from "@lingui/macro";
+import { useHistory } from "react-router-dom";
+import { FilterContext } from "@/state/context";
+import {
+  AdvertiserCampaignsDocument,
+  CampaignSummaryFragment,
+} from "@/graphql-client/graphql";
+import CancelIcon from "@mui/icons-material/Cancel";
+
+const ForceCampaignComplete = graphql(`
+  mutation ForceCampaignComplete($id: String!) {
+    forceCampaignCompletionAndTransferFunds(id: $id)
+  }
+`);
+
+interface Props {
+  campaign?: Pick<
+    CampaignSummaryFragment,
+    "id" | "hasInProcessOrCompleteTransfer" | "adsManagerCurrentBalance"
+  >;
+  type: "form" | "inline";
+  disabled?: boolean;
+}
+
+export function CloseCampaignModal({ campaign, type, disabled }: Props) {
+  const history = useHistory();
+  const [open, setOpen] = useState(false);
+  const { advertiser } = useAdvertiser();
+  const { fromDate } = useContext(FilterContext);
+
+  const [mutate, { loading: mutating }] = useMutation(ForceCampaignComplete, {
+    variables: { id: campaign?.id ?? "" },
+  });
+
+  const isInline = type === "inline";
+  const currentBalance = BigNumber(campaign?.adsManagerCurrentBalance ?? 0);
+  const hasNoBalance = currentBalance.lte(0);
+  if (!isInline && hasNoBalance) return null;
+  const hasInProcessOrCompleteTransfer =
+    campaign?.hasInProcessOrCompleteTransfer ?? false;
+
+  const doMutate = () => {
+    mutate({
+      refetchQueries: [
+        {
+          query: AdvertiserCampaignsDocument,
+          variables: {
+            id: advertiser.id,
+            filter: { from: fromDate?.toISOString() },
+          },
+        },
+      ],
+      onCompleted: (data) => {
+        if (window.confirm(data.forceCampaignCompletionAndTransferFunds)) {
+          history.replace("/user/main/campaign");
+        } else {
+          window.location.reload();
+        }
+      },
+    });
+  };
+
+  return (
+    <>
+      <Button
+        variant={isInline ? "text" : "outlined"}
+        color="error"
+        size={isInline ? "small" : "medium"}
+        disabled={
+          mutating ||
+          hasInProcessOrCompleteTransfer ||
+          (isInline && hasNoBalance) ||
+          disabled
+        }
+        sx={{ borderRadius: "12px" }}
+        startIcon={isInline ? <CancelIcon /> : undefined}
+        onClick={() => {
+          setOpen(true);
+        }}
+      >
+        {isInline && <Trans>Close</Trans>}
+        {!isInline && <Trans>Close Campaign</Trans>}
+      </Button>
+      <Modal open={open} onClose={() => setOpen(false)}>
+        <Box
+          sx={{
+            ...modalStyles,
+            maxWidth: 600,
+          }}
+        >
+          <Typography variant="h4" mb={2}>
+            <Trans>You are about to close this campaign.</Trans>
+          </Typography>
+
+          <Typography variant="subtitle1" mb={2}>
+            <Trans>
+              Closing a campaign will immediately stop it from running. Once it
+              has stopped running, any remaining funds will be transferred back
+              to your account in 24-48 hours.
+            </Trans>
+          </Typography>
+
+          <Stack direction="row" mt={2} spacing={2}>
+            <Button
+              variant="outlined"
+              size="medium"
+              onClick={() => {
+                setOpen(false);
+              }}
+            >
+              <Trans>Cancel</Trans>
+            </Button>
+            <Button
+              variant="contained"
+              size="medium"
+              onClick={() => {
+                doMutate();
+              }}
+            >
+              <Trans>Continue</Trans>
+            </Button>
+          </Stack>
+        </Box>
+      </Modal>
+    </>
+  );
+}

src/components/Datagrid/renderers.tsx

@@ -73,7 +73,7 @@ export const StandardRenderers: Record<string, CellValueRenderer> = {
 };
 
 export function renderMonetaryAmount(
-  value: BigNumber | number,
+  value: BigNumber | number | string,
   currency: string,
 ) {
   const val = BigNumber(value);

src/components/Steps/ActionButtons.tsx

@@ -7,6 +7,7 @@ import ArrowBackIcon from "@mui/icons-material/ArrowBack";
 import RemoveIcon from "@mui/icons-material/Remove";
 import { Link as RouterLink } from "react-router-dom";
 import { Trans } from "@lingui/macro";
+import { CloseCampaignSidebar } from "@/components/Steps/CloseCampaignSidebar";
 
 export function ActionButtons() {
   const { values } = useFormikContext<CampaignForm>();
@@ -37,6 +38,8 @@ export function ActionButtons() {
       >
         <Trans>Return to dashboard</Trans>
       </Button>
+
+      <CloseCampaignSidebar />
     </Stack>
   );
 }

src/components/Steps/CloseCampaignSidebar.tsx

@@ -0,0 +1,35 @@
+import { graphql } from "@/graphql-client/index";
+import { useAdvertiser } from "@/auth/hooks/queries/useAdvertiser";
+import { useQuery } from "@apollo/client";
+import { useField } from "formik";
+import { CloseCampaignModal } from "@/components/Campaigns/CloseCampaignModal";
+
+const CampaignTransferStatus = graphql(`
+  query CampaignTransferStatus($id: String!) {
+    campaign(id: $id) {
+      id
+      adsManagerCurrentBalance
+      hasInProcessOrCompleteTransfer
+    }
+  }
+`);
+
+export function CloseCampaignSidebar() {
+  const [, meta] = useField<string | undefined>("id");
+  const { advertiser } = useAdvertiser();
+
+  const { data, loading } = useQuery(CampaignTransferStatus, {
+    variables: { id: meta.value ?? "" },
+    skip:
+      !meta.value ||
+      (!advertiser.selfServiceManageCampaign && advertiser.selfServiceSetPrice),
+    fetchPolicy: "cache-and-network",
+  });
+
+  if (!data || !data?.campaign || loading) return null;
+  const campaign = data.campaign;
+
+  return (
+    <CloseCampaignModal campaign={campaign} type="form" disabled={loading} />
+  );
+}