Merge pull request #1075 from topcoder-platform/develop

Prod Release - 0.5.2

Author: vikasrohit

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 (

src/components/ChallengeEditor/ChallengeView/index.js

@@ -189,16 +189,14 @@ const ChallengeView = ({
                     <span><span className={styles.fieldTitle}>Groups:</span> {groups}</span>
                   </div>
                 </div>
-                {isBetaMode() && (
-                  <div className={styles.row}>
-                    <div className={styles.col}>
-                      <span>
-                        <span className={styles.fieldTitle}>Billing Account Id:</span>
-                        {projectDetail.billingAccountId}
-                      </span>
-                    </div>
+                <div className={styles.row}>
+                  <div className={styles.col}>
+                    <span>
+                      <span className={styles.fieldTitle}>Billing Account Id:</span>
+                      {projectDetail.billingAccountId}
+                    </span>
                   </div>
-                )}
+                </div>
                 {isBetaMode() && (
                   <UseSchedulingAPIField challenge={challenge} readOnly />
                 )}

src/components/ChallengeEditor/index.js

@@ -851,15 +851,15 @@ 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
           .filter(term => !currTerms.has(term))
           .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 && (<TermsField terms={metadata.challengeTerms} challenge={challenge} onUpdateMultiSelect={this.onUpdateMultiSelect} />)}
                 <GroupsField onUpdateMultiSelect={this.onUpdateMultiSelect} challenge={challenge} />
-                {isBetaMode() && (
-                  <div className={styles.row}>
-                    <div className={styles.col}>
-                      <span>
-                        <span className={styles.fieldTitle}>Billing Account Id:</span>
-                        {projectDetail.billingAccountId}
-                      </span>
-                    </div>
+                <div className={styles.row}>
+                  <div className={styles.col}>
+                    <span>
+                      <span className={styles.fieldTitle}>Billing Account Id:</span>
+                      {projectDetail.billingAccountId}
+                    </span>
                   </div>
-                )}
+                </div>
                 {isBetaMode() && (
                   <UseSchedulingAPIField challenge={challenge} toggleUseSchedulingAPI={this.toggleUseSchedulingAPI} />
                 )}

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
 }