Skip to content

Commit d21856b

Browse files
committed
Merge branch 'dev' into CORE-40
2 parents 6be90cf + 5c8cdc7 commit d21856b

File tree

2 files changed

+16
-11
lines changed

2 files changed

+16
-11
lines changed

src/common/challenge-helper.js

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -375,8 +375,13 @@ class ChallengeHelper {
375375
}
376376

377377
if (data.prizeSets != null) {
378+
const type = data.prizeSets[0]?.prizes[0]?.type;
379+
if (type === constants.prizeTypes.USD) {
380+
ChallengeHelper.convertPSValuesToCents(data.prizeSets)
381+
}
382+
378383
data.prizeSetUpdate = {
379-
prizeSets: data.prizeSets,
384+
prizeSets: [...data.prizeSets],
380385
};
381386
delete data.prizeSets;
382387
}
@@ -484,12 +489,7 @@ class ChallengeHelper {
484489
}
485490
}
486491

487-
convertToISOString(startDate) {
488-
return ChallengeHelper.convertDateToISOString(startDate);
489-
}
490-
491-
// TODO: Deprecate this method
492-
convertPrizeSetValuesToCents(prizeSets) {
492+
static convertPSValuesToCents(prizeSets){
493493
prizeSets.forEach((prizeSet) => {
494494
prizeSet.prizes.forEach((prize) => {
495495
prize.amountInCents = new Decimal(prize.value).mul(100).toNumber();
@@ -498,7 +498,14 @@ class ChallengeHelper {
498498
});
499499
}
500500

501-
// TODO: Deprecate this method
501+
convertToISOString(startDate) {
502+
return ChallengeHelper.convertDateToISOString(startDate);
503+
}
504+
505+
convertPrizeSetValuesToCents(prizeSets) {
506+
return ChallengeHelper.convertPSValuesToCents(prizeSets);
507+
}
508+
502509
convertPrizeSetValuesToDollars(prizeSets, overview) {
503510
prizeSets.forEach((prizeSet) => {
504511
prizeSet.prizes.forEach((prize) => {

src/services/ChallengeService.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1909,9 +1909,7 @@ async function updateChallenge(currentUser, challengeId, data) {
19091909
`Cannot change prize type from ${existingPrizeType} to ${newPrizeType}`
19101910
);
19111911
}
1912-
if (updateInput.prizeSetUpdate != null && newPrizeType === constants.prizeTypes.USD) {
1913-
convertPrizeSetValuesToCents(updateInput.prizeSetUpdate.prizeSets);
1914-
}
1912+
19151913
await challengeDomain.update(
19161914
{
19171915
filterCriteria: getScanCriteria({ id: challengeId }),

0 commit comments

Comments
 (0)