From 8313930c707602d67b99c21db6adde10ea1f1220 Mon Sep 17 00:00:00 2001
From: mantikoros <sgrugett@gmail.com>
Date: Tue, 10 May 2022 11:23:32 -0400
Subject: [PATCH] show correct commission in market close emails

---
 functions/src/email-templates/market-close.html |  8 ++++----
 functions/src/emails.ts                         | 15 +++++++++------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/functions/src/email-templates/market-close.html b/functions/src/email-templates/market-close.html
index a602f527..00e8b439 100644
--- a/functions/src/email-templates/market-close.html
+++ b/functions/src/email-templates/market-close.html
@@ -419,8 +419,8 @@
                                 "
                               />
                               A market you created has closed. It's attracted
-                              <span style="font-weight: bold">{{pool}}</span> in
-                              bets — congrats!
+                              <span style="font-weight: bold">{{volume}}</span>
+                              in bets — congrats!
                               <br
                                 style="
                                   font-family: 'Helvetica Neue', Helvetica,
@@ -439,8 +439,8 @@
                                   margin: 0;
                                 "
                               />
-                              Resolve your market to earn {{creatorFee}}% of the
-                              profits as the creator commission.
+                              Resolve your market to earn {{creatorFee}} as the
+                              creator commission.
                               <br
                                 style="
                                   font-family: 'Helvetica Neue', Helvetica,
diff --git a/functions/src/emails.ts b/functions/src/emails.ts
index fb084d56..abad6096 100644
--- a/functions/src/emails.ts
+++ b/functions/src/emails.ts
@@ -6,7 +6,7 @@ import { Bet } from '../../common/bet'
 import { getProbability } from '../../common/calculate'
 import { Comment } from '../../common/comment'
 import { Contract, FreeResponseContract } from '../../common/contract'
-import { CREATOR_FEE } from '../../common/fees'
+import { DPM_CREATOR_FEE } from '../../common/fees'
 import { PrivateUser, User } from '../../common/user'
 import { formatMoney, formatPercent } from '../../common/util/format'
 import { sendTemplateEmail, sendTextEmail } from './send-email'
@@ -149,8 +149,8 @@ export const sendMarketCloseEmail = async (
   const { username, name, id: userId } = user
   const firstName = name.split(' ')[0]
 
-  const { question, pool: pools, slug } = contract
-  const pool = formatMoney(_.sum(_.values(pools)))
+  const { question, slug, volume, mechanism, collectedFees } = contract
+
   const url = `https://${DOMAIN}/${username}/${slug}`
 
   await sendTemplateEmail(
@@ -158,12 +158,15 @@ export const sendMarketCloseEmail = async (
     'Your market has closed',
     'market-close',
     {
-      name: firstName,
       question,
-      pool,
       url,
       userId,
-      creatorFee: (CREATOR_FEE * 100).toString(),
+      name: firstName,
+      volume: formatMoney(volume),
+      creatorFee:
+        mechanism === 'dpm-2'
+          ? `${DPM_CREATOR_FEE * 100}% of the profits`
+          : formatMoney(collectedFees.creatorFee),
     }
   )
 }