diff --git a/src/config/constants.js b/src/config/constants.js index 496114aa4..0b27005a0 100644 --- a/src/config/constants.js +++ b/src/config/constants.js @@ -655,7 +655,7 @@ export const PHASE_STATUS_OPTIONS = [ { label: 'Active', value: PHASE_STATUS_ACTIVE }, { label: 'Completed', value: PHASE_STATUS_COMPLETED }, { label: 'Cancelled', value: PHASE_STATUS_CANCELLED }, - { label: 'Phased', value: PHASE_STATUS_PAUSED }, + { label: 'Paused', value: PHASE_STATUS_PAUSED }, ] // this defines default criteria to filter projects for projects list diff --git a/src/projects/detail/components/SimplePlan/components/AddCopilotsSidebar/AddCopilotsSidebar.jsx b/src/projects/detail/components/SimplePlan/components/AddCopilotsSidebar/AddCopilotsSidebar.jsx index 1b12cf1f7..733933f3f 100644 --- a/src/projects/detail/components/SimplePlan/components/AddCopilotsSidebar/AddCopilotsSidebar.jsx +++ b/src/projects/detail/components/SimplePlan/components/AddCopilotsSidebar/AddCopilotsSidebar.jsx @@ -31,11 +31,11 @@ class AddCopilotsSidebar extends React.Component { } componentDidMount() { - document.addEventListener('click', this.onClickOutside) + document.addEventListener('mousedown', this.onClickOutside) } componentWillUnmount() { - document.removeEventListener('click', this.onClickOutside) + document.removeEventListener('mousedown', this.onClickOutside) } render() { diff --git a/src/projects/detail/components/SimplePlan/components/MilestonesApprovalNotification/MilestonesApprovalNotification.jsx b/src/projects/detail/components/SimplePlan/components/MilestonesApprovalNotification/MilestonesApprovalNotification.jsx index 8582868ea..509a74319 100644 --- a/src/projects/detail/components/SimplePlan/components/MilestonesApprovalNotification/MilestonesApprovalNotification.jsx +++ b/src/projects/detail/components/SimplePlan/components/MilestonesApprovalNotification/MilestonesApprovalNotification.jsx @@ -28,6 +28,8 @@ class MilestonesApprovalNotification extends React.Component { } findLatest(approvals) { + if(!approvals) return {} + let d = null let maxIndex = 0 for(let index = 0; index < approvals.length; index ++) { @@ -118,7 +120,7 @@ class MilestonesApprovalNotification extends React.Component { type="approve" global /> - All the milestone(s) has been approved by the customer + The following milestone(s) has been approved: {renderDismissButton(() => { this.setState({ show: false })