diff --git a/src/containers/ActionMenu/ActionMenu.js b/src/containers/ActionMenu/ActionMenu.js index eb514591fee60c3d548bfe576f2be6a07b61fbc5..22f24c2655df7b520f4c93e18cbc146bef510a9e 100644 --- a/src/containers/ActionMenu/ActionMenu.js +++ b/src/containers/ActionMenu/ActionMenu.js @@ -162,7 +162,7 @@ class LeftMenu extends Component { const { openConciergeModal, openCalendarModal, openInvite } = this.state; return ( -
+
renderThumbScrollbarWithColor(props, theme.palette.themeColors.colors.scrollColor)} @@ -171,43 +171,53 @@ class LeftMenu extends Component { renderTrackHorizontal={() =>
} renderThumbHorizontal={() =>
} > - - - - - - - - + + + + + + + + {/* */} {/* */} {/* */} {/* */} - - {/**/} - - - + + + - - - + + + - - - - + + + + - - - + + + {callData && !callData.conferenceId && - + } {/* */} {/* */} @@ -220,10 +230,11 @@ class LeftMenu extends Component { */} {/* Calls */} - + {/*/!**!/*/} {/*/!**!/*/} - + {/* @@ -242,27 +253,35 @@ class LeftMenu extends Component { */} - - - - - - - - + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + {/* */}
@@ -282,29 +301,29 @@ class LeftMenu extends Component { {t('calendarModal.modalContent')} - - - - this.handleModalItemClick('addByEmail')}> + this.handleModalItemClick('addByEmail')}>  {t('addByEmail')} - this.handleModalItemClick('copyInviteLink')}> + this.handleModalItemClick('copyInviteLink')}>  {t('copyInviteLink')} - this.handleModalItemClick('/contacts/addbynumber')}> + this.handleModalItemClick('/contacts/addbynumber')}>  {t('addContactByNumber')} - this.handleModalItemClick('/contacts/addbyusername')}> + this.handleModalItemClick('/contacts/addbyusername')}>  {t('addContactByUserName')} diff --git a/src/containers/ActionsItem/ActionsItem.js b/src/containers/ActionsItem/ActionsItem.js index 37bd0eb996492b11a26b798a4063c7fe755bb431..466fb7c02e5e442eb2dbd9b4736d24f232a2f1ea 100644 --- a/src/containers/ActionsItem/ActionsItem.js +++ b/src/containers/ActionsItem/ActionsItem.js @@ -50,7 +50,7 @@ class ActionsItem extends Component { } render() { - const { classes, icon, title, to, t, action, router, isEnabled, nonSubItem, redIcon, requestsCount } = this.props; + const { classes, icon, title, to, t, action, router, isEnabled, nonSubItem, redIcon, requestsCount, id } = this.props; let { subItemLevel } = this.props; let isActive = router.location.pathname.includes(to) && to !== '' ? classes.activeItem : ''; @@ -71,7 +71,7 @@ class ActionsItem extends Component { } return ( - +