Merge pull request #1311 from brave/master

Production Release 2024-08-08
brave · Aug 8, 2024 · c4ee276 · c4ee276
2 parents 861f04e + 5643346
commit c4ee276
Show file tree

Hide file tree

Showing 7 changed files with 305 additions and 323 deletions.
diff --git a/package.json b/package.json
@@ -4,10 +4,10 @@
   "private": true,
   "type": "module",
   "dependencies": {
-    "@apollo/client": "3.11.1",
+    "@apollo/client": "3.11.2",
     "@emotion/react": "11.13.0",
     "@emotion/styled": "11.13.0",
-    "@fontsource/inter": "5.0.19",
+    "@fontsource/inter": "5.0.20",
     "@fontsource/mulish": "5.0.18",
     "@fontsource/poppins": "5.0.14",
     "@graphql-typed-document-node/core": "3.2.0",
@@ -18,11 +18,11 @@
     "@lingui/format-po": "4.11.2",
     "@lingui/macro": "4.11.2",
     "@lingui/react": "4.11.2",
-    "@mui/icons-material": "5.16.5",
+    "@mui/icons-material": "5.16.6",
     "@mui/lab": "5.0.0-alpha.173",
-    "@mui/material": "5.16.5",
-    "@mui/x-data-grid": "7.11.1",
-    "@mui/x-date-pickers": "7.11.1",
+    "@mui/material": "5.16.6",
+    "@mui/x-data-grid": "7.12.0",
+    "@mui/x-date-pickers": "7.12.0",
     "bignumber.js": "9.1.2",
     "dayjs": "1.11.12",
     "formik": "2.4.6",
@@ -62,7 +62,7 @@
   "devDependencies": {
     "@eslint/js": "8.57.0",
     "@graphql-codegen/cli": "5.0.2",
-    "@graphql-codegen/client-preset": "4.3.2",
+    "@graphql-codegen/client-preset": "4.3.3",
     "@graphql-codegen/introspection": "4.0.3",
     "@graphql-eslint/eslint-plugin": "3.20.1",
     "@lingui/cli": "4.11.2",
@@ -82,17 +82,17 @@
     "eslint-plugin-lingui": "0.3.0",
     "eslint-plugin-react": "7.35.0",
     "eslint-plugin-react-hooks": "4.6.2",
-    "husky": "9.1.3",
+    "husky": "9.1.4",
     "knip": "5.27.0",
-    "lint-staged": "15.2.7",
+    "lint-staged": "15.2.8",
     "npm-run-all2": "6.2.2",
     "prettier": "3.3.3",
     "typescript": "5.5.4",
-    "typescript-eslint": "7.17.0",
+    "typescript-eslint": "8.0.0",
     "vite": "5.3.5",
     "vite-plugin-checker": "0.7.2",
     "vite-tsconfig-paths": "4.3.2",
-    "vitest": "2.0.4"
+    "vitest": "2.0.5"
   },
   "engines": {
     "node": ">=20",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/renovate.json b/renovate.json
@@ -10,7 +10,7 @@
     "schedule:weekends"
   ],
   "labels": ["dependencies"],
-  "postUpdateOptions": ["npmDedupe"],
+  "postUpdateOptions": ["pnpmDedupe"],
   "packageRules": [
     {
       "matchUpdateTypes": ["major"],

diff --git a/src/checkout/hooks/useValidatePaymentSession.ts b/src/checkout/hooks/useValidatePaymentSession.ts
@@ -1,5 +1,5 @@
 import { useEffect, useState } from "react";
-import { fetchPaymentSession } from "@/checkout/lib";
+import { validatePaymentSession } from "@/checkout/lib";
 
 interface Props {
   sessionId: string | null;
@@ -13,7 +13,7 @@ export function useValidatePaymentSession(props: Props) {
   useEffect(() => {
     if (props.campaignId) {
       setLoading(true);
-      fetchPaymentSession(props.campaignId, props.sessionId)
+      validatePaymentSession(props.campaignId, props.sessionId)
         .catch((e) => {
           setError(e.message);
         })

diff --git a/src/checkout/lib/index.ts b/src/checkout/lib/index.ts
@@ -27,19 +27,25 @@ export async function createPaymentSession(
   }
 }
 
-export async function fetchPaymentSession(
+export async function validatePaymentSession(
   campaignId: string,
   sessionId: string | null,
 ): Promise<void> {
-  let baseUrl = `/payments/checkout-session?referenceId=${campaignId}`;
+  const body: { referenceId: string; sessionId?: string } = {
+    referenceId: campaignId,
+  };
   if (sessionId) {
-    baseUrl = `${baseUrl}&sessionId=${sessionId}`;
+    body.sessionId = sessionId;
   }
 
-  const res = await fetch(buildAdServerEndpoint(baseUrl), {
+  const res = await fetch(buildAdServerEndpoint("/payments/checkout-session"), {
     method: "PUT",
     mode: "cors",
     credentials: "include",
+    headers: {
+      "Content-Type": "application/json",
+    },
+    body: JSON.stringify(body),
   });
 
   if (res.status !== 200) {

diff --git a/src/components/Assets/hooks/useGetImagePreviewUrl.ts b/src/components/Assets/hooks/useGetImagePreviewUrl.ts
@@ -76,7 +76,7 @@ async function fetchResource(url: string): Promise<Response> {
       cache: "no-cache",
     });
     return response;
-  } catch (e) {
+  } catch {
     return new Response(null, { status: 502 });
   }
 }

diff --git a/src/components/Creatives/hooks/useSubmitCreative.tsx b/src/components/Creatives/hooks/useSubmitCreative.tsx
@@ -78,6 +78,7 @@ export function useSubmitCreative(props: { id: string }) {
             variables: {
               input: {
                 id: props.id,
+                name: input.name,
                 payloadNotification: input.payloadNotification,
                 payloadInlineContent: _.omit(
                   input.payloadInlineContent,