Merge pull request #94 from protofire/hotfix/earning-decimals

(Hotfix) Earning decimals
protofire · Jul 16, 2019 · a99d282 · a99d282
2 parents 1056af7 + dddbb35
commit a99d282
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 9 deletions.
diff --git a/.env.example b/.env.example
@@ -25,3 +25,4 @@ UNSUBSCRIBE_EMAIL_URL=http://livepeer.tools/account
 APOLLO_API_URL=https://api.thegraph.com/subgraphs/name/graphprotocol/livepeer
 MINUTES_TO_WAIT_AFTER_LAST_SENT_EMAIL=500
 MINUTES_TO_WAIT_AFTER_LAST_SENT_TELEGRAM=500
+EARNING_DECIMALS=6
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.2.2] - 2019-07-16
+### Fixes
+- Change displayed decimals of earnings to 6
+
 ## [1.2.1] - 2019-07-11
 ### Fixes
 - Unsubscribe link in notifications

diff --git a/config/config.js b/config/config.js
@@ -87,7 +87,10 @@ const envVarsSchema = Joi.object({
     .required(),
   MINUTES_TO_WAIT_AFTER_LAST_SENT_TELEGRAM: Joi.string()
     .description('Minutes to wait after last sent telegram')
-    .required()
+    .required(),
+  EARNING_DECIMALS: Joi.number()
+    .description('Amount of decimals to display in the earnings')
+    .default(6)
 })
   .unknown()
   .required()
@@ -132,7 +135,8 @@ const config = {
   thresholdSendNotification: envVars.THRESHOLD_SEND_NOTIFICATION,
   apolloApiUrl: envVars.APOLLO_API_URL,
   minutesToWaitAfterLastSentEmail: envVars.MINUTES_TO_WAIT_AFTER_LAST_SENT_EMAIL,
-  minutesToWaitAfterLastSentTelegram: envVars.MINUTES_TO_WAIT_AFTER_LAST_SENT_TELEGRAM
+  minutesToWaitAfterLastSentTelegram: envVars.MINUTES_TO_WAIT_AFTER_LAST_SENT_TELEGRAM,
+  earningDecimals: envVars.EARNING_DECIMALS
 }
 
 module.exports = config
diff --git a/server/helpers/sendDelegateEmail.js b/server/helpers/sendDelegateEmail.js
@@ -32,7 +32,7 @@ const sendEmail = async data => {
   if (!['test'].includes(config.env)) {
     try {
       await sgMail.send(msg)
-      console.log(`Email sended to ${email} successfully`)
+      console.log(`Email sent to ${email} successfully`)
     } catch (err) {
       console.error('error on email')
       console.error(err)

diff --git a/server/helpers/sendDelegatorEmail.js b/server/helpers/sendDelegatorEmail.js
@@ -18,7 +18,8 @@ const {
   sendgridTemplateIdClaimRewardCallPayAttention,
   sendgridTemplateIdClaimRewardUnbondedState,
   sendgridTemplateIdClaimRewardUnbondingState,
-  sendgridTemplateIdNotificationDelegateChangeRules
+  sendgridTemplateIdNotificationDelegateChangeRules,
+  earningDecimals
 } = config
 
 const sendEmail = async data => {
@@ -83,7 +84,7 @@ const sendEmail = async data => {
     try {
       console.log(`Trying to send email to ${email}`)
       await sgMail.send(msg)
-      console.log(`Email sended to ${email} successfully`)
+      console.log(`Email sent to ${email} successfully`)
     } catch (err) {
       console.error(`There was an error trying to send email to ${email}`)
       console.error(err)
@@ -114,7 +115,7 @@ const sendDelegatorNotificationEmail = async (
           : sendgridTemplateIdClaimRewardCallPayAttention
 
         // Calculate lpt earned tokens
-        const lptEarned = formatBalance(delegatorNextReward, 2, 'wei')
+        const lptEarned = formatBalance(delegatorNextReward, earningDecimals, 'wei')
 
         const dateYesterday = moment()
           .subtract(1, 'days')

diff --git a/server/helpers/sendTelegramClaimRewardCall.js b/server/helpers/sendTelegramClaimRewardCall.js
@@ -33,7 +33,7 @@ const sendTelegramClaimRewardCall = async data => {
         parse_mode: 'HTML'
       })
       console.log(
-        `[Telegram bot] - Telegram sended to chatId ${chatId} successfully. Body of the message: ${body}`
+        `[Telegram bot] - Telegram sent to chatId ${chatId} successfully. Body of the message: ${body}`
       )
     } catch (err) {
       console.error(err)
@@ -43,6 +43,7 @@ const sendTelegramClaimRewardCall = async data => {
 }
 
 const getTelegramClaimRewardCallBody = async subscriber => {
+  const { earningDecimals } = config
   const delegatorService = getDelegatorService()
   const protocolService = getProtocolService()
 
@@ -73,7 +74,7 @@ const getTelegramClaimRewardCallBody = async subscriber => {
       const earningNextReturn = await delegatorService.getDelegatorNextReward(delegator.address)
 
       // Calculate earned lpt
-      const lptEarned = formatBalance(earningNextReturn, 2, 'wei')
+      const lptEarned = formatBalance(earningNextReturn, earningDecimals, 'wei')
 
       const dateYesterday = moment()
         .subtract(1, 'days')

diff --git a/server/helpers/sendTelegramDidRewardCall.js b/server/helpers/sendTelegramDidRewardCall.js
@@ -22,7 +22,7 @@ const sendTelegramClaimRewardCall = async data => {
       })
 
       console.log(
-        `[Telegram bot] - Telegram sended to chatId ${chatId} successfully. Body of the message: ${body}`
+        `[Telegram bot] - Telegram sent to chatId ${chatId} successfully. Body of the message: ${body}`
       )
       bot = null
     } catch (err) {