Skip to content

Commit

Permalink
Merge pull request #29662 from hungvu193/fix-28535
Browse files Browse the repository at this point in the history
fix hovering header menu
  • Loading branch information
Beamanator authored Oct 16, 2023
2 parents ebf8306 + a28d56c commit f4a3fb4
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 10 deletions.
3 changes: 0 additions & 3 deletions src/libs/HeaderUtils.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import * as Localize from './Localize';
import themeColors from '../styles/themes/default';
import * as Session from './actions/Session';
import * as Report from './actions/Report';
import * as Expensicons from '../components/Icon/Expensicons';
Expand All @@ -12,14 +11,12 @@ function getPinMenuItem(report) {
if (!report.isPinned) {
return {
icon: Expensicons.Pin,
iconFill: themeColors.icon,
text: Localize.translateLocal('common.pin'),
onSelected: Session.checkIfActionIsAllowed(() => Report.togglePinnedState(report.reportID, report.isPinned)),
};
}
return {
icon: Expensicons.Pin,
iconFill: themeColors.icon,
text: Localize.translateLocal('common.unPin'),
onSelected: Session.checkIfActionIsAllowed(() => Report.togglePinnedState(report.reportID, report.isPinned)),
};
Expand Down
7 changes: 0 additions & 7 deletions src/pages/home/HeaderView.js
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ function HeaderView(props) {
if (ReportUtils.isCompletedTaskReport(props.report) && canModifyTask) {
threeDotMenuItems.push({
icon: Expensicons.Checkmark,
iconFill: themeColors.icon,
text: props.translate('task.markAsIncomplete'),
onSelected: () => Task.reopenTask(props.report),
});
Expand All @@ -110,7 +109,6 @@ function HeaderView(props) {
if (props.report.stateNum !== CONST.REPORT.STATE_NUM.SUBMITTED && props.report.statusNum !== CONST.REPORT.STATUS.CLOSED && canModifyTask) {
threeDotMenuItems.push({
icon: Expensicons.Trashcan,
iconFill: themeColors.icon,
text: props.translate('common.cancel'),
onSelected: () => Task.cancelTask(props.report.reportID, props.report.reportName, props.report.stateNum, props.report.statusNum),
});
Expand All @@ -121,14 +119,12 @@ function HeaderView(props) {
if (props.report.notificationPreference === CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN) {
threeDotMenuItems.push({
icon: Expensicons.ChatBubbles,
iconFill: themeColors.icon,
text: props.translate('common.joinThread'),
onSelected: () => Report.updateNotificationPreference(props.report.reportID, props.report.notificationPreference, CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS, false),
});
} else if (props.report.notificationPreference.length) {
threeDotMenuItems.push({
icon: Expensicons.ChatBubbles,
iconFill: themeColors.icon,
text: props.translate('common.leaveThread'),
onSelected: () => Report.leaveRoom(props.report.reportID),
});
Expand All @@ -140,7 +136,6 @@ function HeaderView(props) {
if (isConcierge && props.guideCalendarLink) {
threeDotMenuItems.push({
icon: Expensicons.Phone,
iconFill: themeColors.icon,
text: props.translate('videoChatButtonAndMenu.tooltip'),
onSelected: () => {
Link.openExternalLink(props.guideCalendarLink);
Expand All @@ -149,15 +144,13 @@ function HeaderView(props) {
} else if (!isAutomatedExpensifyAccount && !isTaskReport && !isArchivedRoom) {
threeDotMenuItems.push({
icon: ZoomIcon,
iconFill: themeColors.icon,
text: props.translate('videoChatButtonAndMenu.zoom'),
onSelected: () => {
Link.openExternalLink(CONST.NEW_ZOOM_MEETING_URL);
},
});
threeDotMenuItems.push({
icon: GoogleMeetIcon,
iconFill: themeColors.icon,
text: props.translate('videoChatButtonAndMenu.googleMeet'),
onSelected: () => {
Link.openExternalLink(CONST.NEW_GOOGLE_MEET_MEETING_URL);
Expand Down

0 comments on commit f4a3fb4

Please sign in to comment.