diff --git a/.circleci/config.yml b/.circleci/config.yml index b78db1519..bf7374129 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -188,7 +188,7 @@ workflows: - build-dev filters: &filters-dev branches: - only: ['dev', 'feature/billing_account_protection'] + only: ['dev', 'feature/copilot-feedback'] - deployTest01: context : org-global diff --git a/config/constants/dev.js b/config/constants/dev.js index 5776dd80a..e2f2ba1d6 100644 --- a/config/constants/dev.js +++ b/config/constants/dev.js @@ -32,6 +32,7 @@ module.exports = { ACCOUNTS_APP_URL : 'https://accounts-auth0.topcoder-dev.com', ACCOUNTS_APP_CONNECTOR_URL : 'https://accounts-auth0.topcoder-dev.com', + TYPEFORM_URL : 'https://topcoder.typeform.com/to/vgqiBXdk', FILE_PICKER_API_KEY: process.env.FILE_PICKER_API_KEY_DEV, FILE_PICKER_SUBMISSION_CONTAINER_NAME: 'submission-staging-dev', diff --git a/config/constants/master.js b/config/constants/master.js index a594a3545..ec979e937 100644 --- a/config/constants/master.js +++ b/config/constants/master.js @@ -33,6 +33,7 @@ module.exports = { ACCOUNTS_APP_URL : 'https://accounts-auth0.topcoder.com', ACCOUNTS_APP_CONNECTOR_URL : 'https://accounts-auth0.topcoder.com', + TYPEFORM_URL : 'https://topcoder.typeform.com/to/vgqiBXdk', FILE_PICKER_API_KEY: process.env.FILE_PICKER_API_KEY_PROD, FILE_PICKER_SUBMISSION_CONTAINER_NAME: 'submission-staging-prod', diff --git a/config/constants/qa.js b/config/constants/qa.js index 31d32cce2..d23d07bbb 100644 --- a/config/constants/qa.js +++ b/config/constants/qa.js @@ -32,6 +32,7 @@ module.exports = { ACCOUNTS_APP_URL : 'https://accounts.topcoder-qa.com/#!/member', ACCOUNTS_APP_CONNECTOR_URL : 'https://accounts.topcoder-qa.com/connector.html', + TYPEFORM_URL : 'https://topcoder.typeform.com/to/vgqiBXdk', FILE_PICKER_API_KEY: process.env.FILE_PICKER_API_KEY_QA, FILE_PICKER_SUBMISSION_CONTAINER_NAME: 'submission-staging-qa', diff --git a/src/components/TeamManagement/MemberItem.jsx b/src/components/TeamManagement/MemberItem.jsx index 036a9d26f..978b63699 100644 --- a/src/components/TeamManagement/MemberItem.jsx +++ b/src/components/TeamManagement/MemberItem.jsx @@ -5,12 +5,13 @@ require('moment-timezone') import UserTooltip from '../User/UserTooltip' import SunIcon from '../../assets/icons/daylight.svg' import MoonIcon from '../../assets/icons/moon.svg' +import FAQIcon from '../../assets/icons/faq.svg' import { getFullNameWithFallback } from '../../helpers/tcHelpers' import './MemberItem.scss' const MemberItem = (props) => { - const {usr, showEmailOnly} = props + const {usr, showEmailOnly, feedback} = props const userFullName = getFullNameWithFallback(usr) const workingHourStart = _.get(usr, 'workingHourStart') @@ -64,6 +65,7 @@ const MemberItem = (props) => { return (