refactor

Expensify · Jul 9, 2021 · 7a34f08 · 7a34f08
1 parent 42e8a12
commit 7a34f08
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 17 deletions.
diff --git a/src/components/TappableCopy.js → src/components/CommunicationsLink.js b/src/components/TappableCopy.js → src/components/CommunicationsLink.js
@@ -11,7 +11,7 @@ import withWindowDimensions, {windowDimensionsPropTypes} from './withWindowDimen
 import CONST from '../CONST';
 
 const propTypes = {
-    /** Children to wrap in TappableCopy. */
+    /** Children to wrap in CommunicationsLink. */
     children: PropTypes.node.isRequired,
 
     /** Styles to be assigned to Container */
@@ -32,7 +32,7 @@ const defaultProps = {
     type: undefined,
 };
 
-const TappableCopy = props => (
+const CommunicationsLink = props => (
     <View style={[styles.flexRow, styles.pRelative, ...props.style]}>
         {props.type && props.isSmallScreenWidth
             ? (
@@ -53,13 +53,13 @@ const TappableCopy = props => (
                     styles.pAbsolute,
                     styles.alignItemsCenter,
                     styles.justifyContentCenter,
-                    {right: -36, top: 0, bottom: 0}]}
+                    styles.communicationsLinkIcon]}
                 >
                     <ContextMenuItem
                         icon={ClipboardIcon}
-                        text={props.translate('reportActionContextMenu.copyToClipboard')}
+                        text={props.translate('contextMenuItem.copyToClipboard')}
                         successIcon={Checkmark}
-                        successText={props.translate('reportActionContextMenu.copied')}
+                        successText={props.translate('contextMenuItem.copied')}
                         isMini
                         autoReset
                         onPress={() => Clipboard.setString(props.value)}
@@ -69,11 +69,11 @@ const TappableCopy = props => (
     </View>
 );
 
-TappableCopy.propTypes = propTypes;
-TappableCopy.defaultProps = defaultProps;
-TappableCopy.displayName = 'TappableCopy';
+CommunicationsLink.propTypes = propTypes;
+CommunicationsLink.defaultProps = defaultProps;
+CommunicationsLink.displayName = 'CommunicationsLink';
 
 export default compose(
     withWindowDimensions,
     withLocalize,
-)(TappableCopy);
+)(CommunicationsLink);
diff --git a/src/languages/en.js b/src/languages/en.js
@@ -106,9 +106,11 @@ export default {
         youAppearToBeOffline: 'You appear to be offline.',
         fileUploadFailed: 'Upload Failed. File is not supported.',
     },
-    reportActionContextMenu: {
+    contextMenuItem: {
         copyToClipboard: 'Copy to Clipboard',
         copied: 'Copied!',
+    },
+    reportActionContextMenu: {
         copyLink: 'Copy Link',
         markAsUnread: 'Mark as Unread',
         editComment: 'Edit Comment',

diff --git a/src/pages/DetailsPage.js b/src/pages/DetailsPage.js
@@ -14,7 +14,7 @@ import ScreenWrapper from '../components/ScreenWrapper';
 import personalDetailsPropType from './personalDetailsPropType';
 import withLocalize, {withLocalizePropTypes} from '../components/withLocalize';
 import compose from '../libs/compose';
-import TappableCopy from '../components/TappableCopy';
+import CommunicationsLink from '../components/CommunicationsLink';
 import CONST from '../CONST';
 
 const matchType = PropTypes.shape({
@@ -92,7 +92,7 @@ const DetailsPage = ({
                                 imageStyles={[styles.avatarLarge]}
                                 source={details.avatar}
                             />
-                            <TappableCopy
+                            <CommunicationsLink
                                 style={[styles.mt1, styles.mb6]}
                                 type={details.displayName && isSMSLogin ? CONST.LOGIN_TYPE.PHONE : undefined}
                                 value={getPhoneNumber(details)}
@@ -102,15 +102,15 @@ const DetailsPage = ({
                                         ? toLocalPhone(details.displayName)
                                         : (details.displayName || null)}
                                 </Text>
-                            </TappableCopy>
+                            </CommunicationsLink>
                             {details.login ? (
                                 <View style={[styles.mb6, styles.detailsPageSectionContainer]}>
                                     <Text style={[styles.formLabel, styles.mb2]} numberOfLines={1}>
                                         {translate(isSMSLogin
                                             ? 'common.phoneNumber'
                                             : 'common.email')}
                                     </Text>
-                                    <TappableCopy
+                                    <CommunicationsLink
                                         type={isSMSLogin ? CONST.LOGIN_TYPE.PHONE : CONST.LOGIN_TYPE.EMAIL}
                                         value={isSMSLogin ? getPhoneNumber(details) : details.login}
                                     >
@@ -119,7 +119,7 @@ const DetailsPage = ({
                                                 ? toLocalPhone(getPhoneNumber(details))
                                                 : details.login}
                                         </Text>
-                                    </TappableCopy>
+                                    </CommunicationsLink>
                                 </View>
                             ) : null}
                             {details.pronouns ? (

diff --git a/src/pages/home/report/ReportActionContextMenu.js b/src/pages/home/report/ReportActionContextMenu.js
@@ -67,9 +67,9 @@ class ReportActionContextMenu extends React.Component {
         this.contextActions = [
             // Copy to clipboard
             {
-                text: this.props.translate('reportActionContextMenu.copyToClipboard'),
+                text: this.props.translate('contextMenuItem.copyToClipboard'),
                 icon: ClipboardIcon,
-                successText: this.props.translate('reportActionContextMenu.copied'),
+                successText: this.props.translate('contextMenuItem.copied'),
                 successIcon: Checkmark,
                 shouldShow: true,
 

diff --git a/src/styles/styles.js b/src/styles/styles.js
@@ -1747,6 +1747,12 @@ const styles = {
         lineHeight: 16,
         ...whiteSpace.noWrap,
     },
+
+    communicationsLinkIcon: {
+        right: -36,
+        top: 0,
+        bottom: 0,
+    },
 };
 
 const baseCodeTagStyles = {