Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Clipboard icon to Copy icon #17008

Merged
merged 2 commits into from
Apr 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions assets/images/clipboard.svg

This file was deleted.

7 changes: 7 additions & 0 deletions assets/images/copy.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/components/CommunicationsLink.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ const CommunicationsLink = props => (
{props.children}
</View>
<ContextMenuItem
icon={Expensicons.Clipboard}
icon={Expensicons.Copy}
text={props.translate('reportActionContextMenu.copyToClipboard')}
successIcon={Expensicons.Checkmark}
successText={props.translate('reportActionContextMenu.copied')}
Expand Down
2 changes: 1 addition & 1 deletion src/components/CopyTextToClipboard.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class CopyTextToClipboard extends React.Component {
<Text style={this.props.textStyles}>{this.props.text}</Text>
<Tooltip text={this.props.translate(`reportActionContextMenu.${this.state.showCheckmark ? 'copied' : 'copyToClipboard'}`)}>
<Icon
src={this.state.showCheckmark ? Expensicons.Checkmark : Expensicons.Clipboard}
src={this.state.showCheckmark ? Expensicons.Checkmark : Expensicons.Copy}
fill={this.state.showCheckmark ? themeColors.iconSuccessFill : themeColors.icon}
width={variables.iconSizeSmall}
height={variables.iconSizeSmall}
Expand Down
4 changes: 2 additions & 2 deletions src/components/Icon/Expensicons.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ import Cash from '../../../assets/images/cash.svg';
import ChatBubble from '../../../assets/images/chatbubble.svg';
import Checkmark from '../../../assets/images/checkmark.svg';
import Chair from '../../../assets/images/chair.svg';
import Clipboard from '../../../assets/images/clipboard.svg';
import Close from '../../../assets/images/close.svg';
import ClosedSign from '../../../assets/images/closed-sign.svg';
import Collapse from '../../../assets/images/collapse.svg';
import Concierge from '../../../assets/images/concierge.svg';
import ConciergeAvatar from '../../../assets/images/avatars/concierge-avatar.svg';
import Connect from '../../../assets/images/connect.svg';
import Copy from '../../../assets/images/copy.svg';
import CreditCard from '../../../assets/images/creditcard.svg';
import Document from '../../../assets/images/document.svg';
import DeletedRoomAvatar from '../../../assets/images/avatars/deleted-room.svg';
Expand Down Expand Up @@ -133,13 +133,13 @@ export {
ChatBubble,
Checkmark,
Chair,
Clipboard,
Close,
ClosedSign,
Collapse,
Concierge,
ConciergeAvatar,
Connect,
Copy,
CreditCard,
DeletedRoomAvatar,
Document,
Expand Down
6 changes: 3 additions & 3 deletions src/pages/home/report/ContextMenu/ContextMenuActions.js
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ export default [
},
{
textTranslateKey: 'reportActionContextMenu.copyURLToClipboard',
icon: Expensicons.Clipboard,
icon: Expensicons.Copy,
successTextTranslateKey: 'reportActionContextMenu.copied',
successIcon: Expensicons.Checkmark,
shouldShow: type => type === CONTEXT_MENU_TYPES.LINK,
Expand All @@ -123,7 +123,7 @@ export default [
},
{
textTranslateKey: 'reportActionContextMenu.copyEmailToClipboard',
icon: Expensicons.Clipboard,
icon: Expensicons.Copy,
successTextTranslateKey: 'reportActionContextMenu.copied',
successIcon: Expensicons.Checkmark,
shouldShow: type => type === CONTEXT_MENU_TYPES.EMAIL,
Expand All @@ -135,7 +135,7 @@ export default [
},
{
textTranslateKey: 'reportActionContextMenu.copyToClipboard',
icon: Expensicons.Clipboard,
icon: Expensicons.Copy,
successTextTranslateKey: 'reportActionContextMenu.copied',
successIcon: Expensicons.Checkmark,
shouldShow: (type, reportAction) => (type === CONTEXT_MENU_TYPES.REPORT_ACTION
Expand Down