Merge pull request #905 from brave/master

Production Release 2023-09-27
brave · Sep 27, 2023 · 75c0b7f · 75c0b7f
2 parents e9bc7cf + 3f190b5
commit 75c0b7f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/src/form/fragmentUtil.ts b/src/form/fragmentUtil.ts
@@ -47,15 +47,14 @@ export function createAdSetFromFragment(
   data: AdSetFragment,
   campaignId?: string,
 ): CreateAdSetInput {
+  const ads = (data.ads ?? []).filter((ad) => ad.state !== "deleted");
+
   return {
     campaignId,
-    ads: (data.ads ?? [])
-      .filter((ad) => ad.state !== "deleted")
-      .map((ad) => ({
-        creativeId: ad.creative.id,
-        price: ad.price,
-        priceType: ad.priceType,
-      })),
+    ads: ads.map((ad) => ({
+      creativeId: ad.creative.id,
+    })),
+    price: ads[0].price,
     bannedKeywords: data.bannedKeywords,
     billingType: data.billingType ?? "cpm",
     conversions: (data.conversions ?? []).map((c) => ({

diff --git a/src/graphql/types.ts b/src/graphql/types.ts
diff --git a/src/user/library/index.test.ts b/src/user/library/index.test.ts
@@ -157,7 +157,7 @@ describe("pricing logic (read)", () => {
       c.adSets = [];
     });
     const formObject = editCampaignValues(campaign, "abc");
-    expect(formObject.price).toEqual("100");
+    expect(formObject.price).toEqual("6");
     expect(formObject.billingType).toEqual("cpm");
   });
 });

diff --git a/src/user/library/index.ts b/src/user/library/index.ts
@@ -94,7 +94,7 @@ export function editCampaignValues(
 
   const billingType = (_.head(campaign.adSets)?.billingType ??
     "cpm") as Billing;
-  const rawPrice = BigNumber(_.head(campaign.adSets)?.price ?? "0.1");
+  const rawPrice = BigNumber(_.head(campaign.adSets)?.price ?? ".006");
   const price = billingType === "cpm" ? rawPrice.multipliedBy(1000) : rawPrice;
 
   return {