diff --git a/src/components/ChallengeEditor/ChallengeTotal-Field/index.js b/src/components/ChallengeEditor/ChallengeTotal-Field/index.js index 0b1f0def..d968d00c 100644 --- a/src/components/ChallengeEditor/ChallengeTotal-Field/index.js +++ b/src/components/ChallengeEditor/ChallengeTotal-Field/index.js @@ -11,7 +11,6 @@ const ChallengeTotalField = ({ challenge }) => { challengeTotal = _.flatten(challenge.prizeSets.map(p => p.prizes)) .map(p => p.value) .map(v => convertDollarToInteger(v, '$')) - .map(v => +v) .reduce((prev, next) => prev + next, 0) } return ( diff --git a/src/components/ChallengeEditor/ChallengeView/index.js b/src/components/ChallengeEditor/ChallengeView/index.js index b9d14f53..37c26c79 100644 --- a/src/components/ChallengeEditor/ChallengeView/index.js +++ b/src/components/ChallengeEditor/ChallengeView/index.js @@ -189,16 +189,14 @@ const ChallengeView = ({ Groups: {groups} - {isBetaMode() && ( -
-
- - Billing Account Id: - {projectDetail.billingAccountId} - -
+
+
+ + Billing Account Id: + {projectDetail.billingAccountId} +
- )} +
{isBetaMode() && ( )} diff --git a/src/components/ChallengeEditor/index.js b/src/components/ChallengeEditor/index.js index a5f7013e..9a3c91d5 100644 --- a/src/components/ChallengeEditor/index.js +++ b/src/components/ChallengeEditor/index.js @@ -851,7 +851,7 @@ class ChallengeEditor extends Component { groups: [] // prizeSets: this.getDefaultPrizeSets() } - if (isBetaMode() && projectDetail.terms) { + if (projectDetail.terms) { const currTerms = new Set(newChallenge.terms.map(term => term.id)) newChallenge.terms.push( ...projectDetail.terms @@ -859,7 +859,7 @@ class ChallengeEditor extends Component { .map(term => ({ id: term, roleId: SUBMITTER_ROLE_UUID })) ) } - if (isBetaMode() && projectDetail.groups) { + if (projectDetail.groups) { newChallenge.groups.push(...projectDetail.groups) } const discussions = this.getDiscussionsConfig(newChallenge) @@ -1419,16 +1419,14 @@ class ChallengeEditor extends Component { {/* remove terms field and use default term */} {false && ()} - {isBetaMode() && ( -
-
- - Billing Account Id: - {projectDetail.billingAccountId} - -
+
+
+ + Billing Account Id: + {projectDetail.billingAccountId} +
- )} +
{isBetaMode() && ( )} diff --git a/src/util/input-check.js b/src/util/input-check.js index d69acd48..5515289d 100644 --- a/src/util/input-check.js +++ b/src/util/input-check.js @@ -44,7 +44,7 @@ export const validateValue = (value, checkType = '', prefix = '') => { */ export const convertDollarToInteger = (value, prefix = '') => { if (value) { - return parseInt(('' + value).replace(prefix, '').replace(' ', '').replace(/[^0-9]/g, '')) + return parseInt(('' + value).replace(prefix, '').replace(' ', '').replace(/[^0-9.,]/g, '')) } return 0 }