merge develop

Author: SleepyZenitsu

src/components/ChallengeEditor/ChallengeView/index.js

@@ -37,7 +37,9 @@ const ChallengeView = ({
   assignedMemberDetails,
   enableEdit,
   onLaunchChallenge,
-  onCloseTask }) => {
+  onCloseTask,
+  location }) => {
+  const params = new URLSearchParams(location.search)
   const selectedType = _.find(metadata.challengeTypes, { id: challenge.typeId })
   const challengeTrack = _.find(metadata.challengeTracks, { id: challenge.trackId })
 
@@ -186,6 +188,16 @@ const ChallengeView = ({
                     <span><span className={styles.fieldTitle}>Groups:</span> {groups}</span>
                   </div>
                 </div>
+                {params.get('beta') && (
+                  <div className={styles.row}>
+                    <div className={styles.col}>
+                      <span>
+                        <span className={styles.fieldTitle}>Billing Account Id:</span>
+                        {projectDetail.billingAccountId}
+                      </span>
+                    </div>
+                  </div>
+                )}
               </>
             )}
             {
@@ -271,7 +283,8 @@ ChallengeView.propTypes = {
   assignedMemberDetails: PropTypes.shape(),
   enableEdit: PropTypes.bool,
   onLaunchChallenge: PropTypes.func,
-  onCloseTask: PropTypes.func
+  onCloseTask: PropTypes.func,
+  location: PropTypes.object
 }
 
 export default withRouter(ChallengeView)

src/components/ChallengeEditor/index.js

@@ -1125,6 +1125,8 @@ class ChallengeEditor extends Component {
   }
 
   render () {
+    const params = new URLSearchParams(this.props.location.search)
+
     const {
       isLaunch,
       isConfirm,
@@ -1404,6 +1406,16 @@ 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} />
+                {params.get('beta') && (
+                  <div className={styles.row}>
+                    <div className={styles.col}>
+                      <span>
+                        <span className={styles.fieldTitle}>Billing Account Id:</span>
+                        {projectDetail.billingAccountId}
+                      </span>
+                    </div>
+                  </div>
+                )}
               </React.Fragment>
             )}
             {!isTask && (
@@ -1535,7 +1547,8 @@ ChallengeEditor.propTypes = {
   replaceResourceInRole: PropTypes.func,
   partiallyUpdateChallengeDetails: PropTypes.func.isRequired,
   deleteChallenge: PropTypes.func.isRequired,
-  loggedInUser: PropTypes.shape().isRequired
+  loggedInUser: PropTypes.shape().isRequired,
+  location: PropTypes.object
 }
 
 export default withRouter(ChallengeEditor)