diff --git a/src/components/MenuItem.js b/src/components/MenuItem.js
index 070b639c2796..c8dc826a316c 100644
--- a/src/components/MenuItem.js
+++ b/src/components/MenuItem.js
@@ -1,6 +1,8 @@
 import _ from 'underscore';
 import React from 'react';
-import {View} from 'react-native';
+import {
+    View, Pressable,
+} from 'react-native';
 import Text from './Text';
 import styles from '../styles/styles';
 import * as StyleUtils from '../styles/StyleUtils';
@@ -16,14 +18,9 @@ import colors from '../styles/colors';
 import variables from '../styles/variables';
 import MultipleAvatars from './MultipleAvatars';
 import * as defaultWorkspaceAvatars from './Icon/WorkspaceDefaultAvatars';
-import PressableWithSecondaryInteraction from './PressableWithSecondaryInteraction';
-import withWindowDimensions, {windowDimensionsPropTypes} from './withWindowDimensions';
-import * as DeviceCapabilities from '../libs/DeviceCapabilities';
-import ControlSelection from '../libs/ControlSelection';
 
 const propTypes = {
     ...menuItemPropTypes,
-    ...windowDimensionsPropTypes,
 };
 
 const defaultProps = {
@@ -49,13 +46,11 @@ const defaultProps = {
     subtitle: undefined,
     iconType: CONST.ICON_TYPE_ICON,
     onPress: () => {},
-    onSecondaryInteraction: undefined,
     interactive: true,
     fallbackIcon: Expensicons.FallbackAvatar,
     brickRoadIndicator: '',
     floatRightAvatars: [],
     shouldStackHorizontally: false,
-    shouldBlockSelection: false,
 };
 
 const MenuItem = (props) => {
@@ -76,7 +71,7 @@ const MenuItem = (props) => {
     ]);
 
     return (
-        <PressableWithSecondaryInteraction
+        <Pressable
             onPress={(e) => {
                 if (props.disabled) {
                     return;
@@ -88,9 +83,6 @@ const MenuItem = (props) => {
 
                 props.onPress(e);
             }}
-            onPressIn={() => props.shouldBlockSelection && props.isSmallScreenWidth && DeviceCapabilities.canUseTouchScreen() && ControlSelection.block()}
-            onPressOut={ControlSelection.unblock}
-            onSecondaryInteraction={props.onSecondaryInteraction}
             style={({hovered, pressed}) => ([
                 props.style,
                 StyleUtils.getButtonBackgroundColorStyle(getButtonState(props.focused || hovered, pressed, props.success, props.disabled, props.interactive), true),
@@ -98,7 +90,6 @@ const MenuItem = (props) => {
                 styles.popoverMaxWidth,
             ])}
             disabled={props.disabled}
-            ref={props.forwardedRef}
         >
             {({hovered, pressed}) => (
                 <>
@@ -221,14 +212,12 @@ const MenuItem = (props) => {
                     </View>
                 </>
             )}
-        </PressableWithSecondaryInteraction>
+        </Pressable>
     );
 };
 
 MenuItem.propTypes = propTypes;
 MenuItem.defaultProps = defaultProps;
 MenuItem.displayName = 'MenuItem';
-export default withWindowDimensions(React.forwardRef((props, ref) => (
-    // eslint-disable-next-line react/jsx-props-no-spreading
-    <MenuItem {...props} forwardedRef={ref} />
-)));
+
+export default MenuItem;
diff --git a/src/components/MenuItemList.js b/src/components/MenuItemList.js
index fe7d40b582f8..e442d3766893 100644
--- a/src/components/MenuItemList.js
+++ b/src/components/MenuItemList.js
@@ -3,8 +3,6 @@ import _ from 'underscore';
 import PropTypes from 'prop-types';
 import MenuItem from './MenuItem';
 import menuItemPropTypes from './menuItemPropTypes';
-import * as ReportActionContextMenu from '../pages/home/report/ContextMenu/ReportActionContextMenu';
-import {CONTEXT_MENU_TYPES} from '../pages/home/report/ContextMenu/ContextMenuActions';
 
 const propTypes = {
     /** An array of props that are pass to individual MenuItem components */
@@ -14,38 +12,17 @@ const defaultProps = {
     menuItems: [],
 };
 
-const MenuItemList = (props) => {
-    let popoverAnchor;
-
-    /**
-     * Handle the secondary interaction for a menu item.
-     *
-     * @param {*} link the menu item link or function to get the link
-     * @param {Event} e the interaction event
-     */
-    const secondaryInteraction = (link, e) => {
-        if (typeof link === 'function') {
-            link().then(url => ReportActionContextMenu.showContextMenu(CONTEXT_MENU_TYPES.LINK, e, url, popoverAnchor));
-        } else if (!_.isEmpty(link)) {
-            ReportActionContextMenu.showContextMenu(CONTEXT_MENU_TYPES.LINK, e, link, popoverAnchor);
-        }
-    };
-
-    return (
-        <>
-            {_.map(props.menuItems, menuItemProps => (
-                <MenuItem
-                    key={menuItemProps.title}
-                    onSecondaryInteraction={!_.isUndefined(menuItemProps.link) ? e => secondaryInteraction(menuItemProps.link, e) : undefined}
-                    ref={el => popoverAnchor = el}
-                    shouldBlockSelection={Boolean(menuItemProps.link)}
-                    // eslint-disable-next-line react/jsx-props-no-spreading
-                    {...menuItemProps}
-                />
-            ))}
-        </>
-    );
-};
+const MenuItemList = props => (
+    <>
+        {_.map(props.menuItems, menuItemProps => (
+            <MenuItem
+                key={menuItemProps.title}
+                // eslint-disable-next-line react/jsx-props-no-spreading
+                {...menuItemProps}
+            />
+        ))}
+    </>
+);
 
 MenuItemList.displayName = 'MenuItemList';
 MenuItemList.propTypes = propTypes;
diff --git a/src/components/PressableWithSecondaryInteraction/index.js b/src/components/PressableWithSecondaryInteraction/index.js
index 412755a4ccef..f3ea25a471fd 100644
--- a/src/components/PressableWithSecondaryInteraction/index.js
+++ b/src/components/PressableWithSecondaryInteraction/index.js
@@ -4,7 +4,6 @@ import {Pressable} from 'react-native';
 import * as pressableWithSecondaryInteractionPropTypes from './pressableWithSecondaryInteractionPropTypes';
 import styles from '../../styles/styles';
 import * as DeviceCapabilities from '../../libs/DeviceCapabilities';
-import * as StyleUtils from '../../styles/StyleUtils';
 
 /**
  * This is a special Pressable that calls onSecondaryInteraction when LongPressed, or right-clicked.
@@ -12,7 +11,6 @@ import * as StyleUtils from '../../styles/StyleUtils';
 class PressableWithSecondaryInteraction extends Component {
     constructor(props) {
         super(props);
-        this.executeSecondaryInteraction = this.executeSecondaryInteraction.bind(this);
         this.executeSecondaryInteractionOnContextMenu = this.executeSecondaryInteractionOnContextMenu.bind(this);
     }
 
@@ -27,28 +25,11 @@ class PressableWithSecondaryInteraction extends Component {
         this.pressableRef.removeEventListener('contextmenu', this.executeSecondaryInteractionOnContextMenu);
     }
 
-    /**
-     * @param {Event} e - the secondary interaction event
-     */
-    executeSecondaryInteraction(e) {
-        if (DeviceCapabilities.hasHoverSupport()) {
-            return;
-        }
-        if (this.props.withoutFocusOnSecondaryInteraction && this.pressableRef) {
-            this.pressableRef.blur();
-        }
-        this.props.onSecondaryInteraction(e);
-    }
-
     /**
      * @param {contextmenu} e - A right-click MouseEvent.
      * https://developer.mozilla.org/en-US/docs/Web/API/Element/contextmenu_event
      */
     executeSecondaryInteractionOnContextMenu(e) {
-        if (!this.props.onSecondaryInteraction) {
-            return;
-        }
-
         e.stopPropagation();
         if (this.props.preventDefaultContentMenu) {
             e.preventDefault();
@@ -73,9 +54,17 @@ class PressableWithSecondaryInteraction extends Component {
         // On Web, Text does not support LongPress events thus manage inline mode with styling instead of using Text.
         return (
             <Pressable
-                style={StyleUtils.combineStyles(this.props.inline ? styles.dInline : this.props.style)}
+                style={this.props.inline && styles.dInline}
                 onPressIn={this.props.onPressIn}
-                onLongPress={this.props.onSecondaryInteraction ? this.executeSecondaryInteraction : undefined}
+                onLongPress={(e) => {
+                    if (DeviceCapabilities.hasHoverSupport()) {
+                        return;
+                    }
+                    if (this.props.withoutFocusOnSecondaryInteraction && this.pressableRef) {
+                        this.pressableRef.blur();
+                    }
+                    this.props.onSecondaryInteraction(e);
+                }}
                 onPressOut={this.props.onPressOut}
                 onPress={this.props.onPress}
                 ref={el => this.pressableRef = el}
diff --git a/src/components/PressableWithSecondaryInteraction/index.native.js b/src/components/PressableWithSecondaryInteraction/index.native.js
index 744c92e4f81b..c51671ba835c 100644
--- a/src/components/PressableWithSecondaryInteraction/index.native.js
+++ b/src/components/PressableWithSecondaryInteraction/index.native.js
@@ -19,9 +19,6 @@ const PressableWithSecondaryInteraction = (props) => {
             ref={props.forwardedRef}
             onPress={props.onPress}
             onLongPress={(e) => {
-                if (!props.onSecondaryInteraction) {
-                    return;
-                }
                 e.preventDefault();
                 HapticFeedback.longPress();
                 props.onSecondaryInteraction(e);
diff --git a/src/components/PressableWithSecondaryInteraction/pressableWithSecondaryInteractionPropTypes.js b/src/components/PressableWithSecondaryInteraction/pressableWithSecondaryInteractionPropTypes.js
index 0964edaa9506..bffe11bc4cd8 100644
--- a/src/components/PressableWithSecondaryInteraction/pressableWithSecondaryInteractionPropTypes.js
+++ b/src/components/PressableWithSecondaryInteraction/pressableWithSecondaryInteractionPropTypes.js
@@ -1,5 +1,4 @@
 import PropTypes from 'prop-types';
-import stylePropTypes from '../../styles/stylePropTypes';
 
 const propTypes = {
     /** The function that should be called when this pressable is pressed */
@@ -12,19 +11,13 @@ const propTypes = {
     onPressOut: PropTypes.func,
 
     /** The function that should be called when this pressable is LongPressed or right-clicked. */
-    onSecondaryInteraction: PropTypes.func,
+    onSecondaryInteraction: PropTypes.func.isRequired,
 
     /** The children which should be contained in this wrapper component. */
-    children: PropTypes.oneOfType([
-        PropTypes.func,
-        PropTypes.node,
-    ]).isRequired,
+    children: PropTypes.node.isRequired,
 
     /** The ref to the search input (may be null on small screen widths) */
-    forwardedRef: PropTypes.oneOfType([
-        PropTypes.func,
-        PropTypes.object,
-    ]),
+    forwardedRef: PropTypes.func,
 
     /** Prevent the default ContextMenu on web/Desktop */
     preventDefaultContentMenu: PropTypes.bool,
@@ -41,9 +34,6 @@ const propTypes = {
 
     /** Disable focus trap for the element on secondary interaction  */
     withoutFocusOnSecondaryInteraction: PropTypes.bool,
-
-    /** Used to apply styles to the Pressable */
-    style: stylePropTypes,
 };
 
 const defaultProps = {
diff --git a/src/components/menuItemPropTypes.js b/src/components/menuItemPropTypes.js
index 78486cb5a848..c1759d127cfe 100644
--- a/src/components/menuItemPropTypes.js
+++ b/src/components/menuItemPropTypes.js
@@ -88,18 +88,6 @@ const propTypes = {
 
     /** Prop to identify if we should load avatars vertically instead of diagonally */
     shouldStackHorizontally: PropTypes.bool,
-
-    /** The function that should be called when this component is LongPressed or right-clicked. */
-    onSecondaryInteraction: PropTypes.func,
-
-    /** Flag to indicate whether or not text selection should be disabled from long-pressing the menu item. */
-    shouldBlockSelection: PropTypes.bool,
-
-    /** The ref to the menu item */
-    forwardedRef: PropTypes.oneOfType([
-        PropTypes.func,
-        PropTypes.object,
-    ]),
 };
 
 export default propTypes;
diff --git a/src/libs/actions/Link.js b/src/libs/actions/Link.js
index 2cccfc447f6b..c38f901bb391 100644
--- a/src/libs/actions/Link.js
+++ b/src/libs/actions/Link.js
@@ -34,35 +34,33 @@ function showGrowlIfOffline() {
 }
 
 /**
- * @param {String} [url] the url path
- * @param {String} [shortLivedAuthToken]
- *
- * @returns {Promise<string>}
+ * @param {String} url
  */
-function buildOldDotURL(url, shortLivedAuthToken) {
-    const hasHashParams = url.indexOf('#') !== -1;
-    const hasURLParams = url.indexOf('?') !== -1;
+function openOldDotLink(url) {
+    /**
+     * @param {String} [shortLivedAuthToken]
+     * @returns {Promise<string>}
+     */
+    function buildOldDotURL(shortLivedAuthToken) {
+        const hasHashParams = url.indexOf('#') !== -1;
+        const hasURLParams = url.indexOf('?') !== -1;
 
-    const authTokenParam = shortLivedAuthToken ? `authToken=${shortLivedAuthToken}` : '';
-    const emailParam = `email=${encodeURIComponent(currentUserEmail)}`;
+        const authTokenParam = shortLivedAuthToken ? `authToken=${shortLivedAuthToken}` : '';
+        const emailParam = `email=${encodeURIComponent(currentUserEmail)}`;
 
-    const params = _.compact([authTokenParam, emailParam]).join('&');
+        const params = _.compact([authTokenParam, emailParam]).join('&');
 
-    return Environment.getOldDotEnvironmentURL()
-        .then((environmentURL) => {
-            const oldDotDomain = Url.addTrailingForwardSlash(environmentURL);
+        return Environment.getOldDotEnvironmentURL()
+            .then((environmentURL) => {
+                const oldDotDomain = Url.addTrailingForwardSlash(environmentURL);
 
-            // If the URL contains # or ?, we can assume they don't need to have the `?` token to start listing url parameters.
-            return `${oldDotDomain}${url}${hasHashParams || hasURLParams ? '&' : '?'}${params}`;
-        });
-}
+                // If the URL contains # or ?, we can assume they don't need to have the `?` token to start listing url parameters.
+                return `${oldDotDomain}${url}${hasHashParams || hasURLParams ? '&' : '?'}${params}`;
+            });
+    }
 
-/**
- * @param {String} url the url path
- */
-function openOldDotLink(url) {
     if (isNetworkOffline) {
-        buildOldDotURL(url).then(oldDotURL => Linking.openURL(oldDotURL));
+        buildOldDotURL().then(oldDotURL => Linking.openURL(oldDotURL));
         return;
     }
 
@@ -71,11 +69,11 @@ function openOldDotLink(url) {
     API.makeRequestWithSideEffects(
         'OpenOldDotLink', {}, {},
     ).then((response) => {
-        buildOldDotURL(url, response.shortLivedAuthToken).then((oldDotUrl) => {
+        buildOldDotURL(response.shortLivedAuthToken).then((oldDotUrl) => {
             Linking.openURL(oldDotUrl);
         });
     }).catch(() => {
-        buildOldDotURL(url).then((oldDotUrl) => {
+        buildOldDotURL().then((oldDotUrl) => {
             Linking.openURL(oldDotUrl);
         });
     });
@@ -94,7 +92,6 @@ function openExternalLink(url, shouldSkipCustomSafariLogic = false) {
 }
 
 export {
-    buildOldDotURL,
     openOldDotLink,
     openExternalLink,
 };
diff --git a/src/pages/GetAssistancePage.js b/src/pages/GetAssistancePage.js
index 89544b25dcfe..e2115c6d7814 100644
--- a/src/pages/GetAssistancePage.js
+++ b/src/pages/GetAssistancePage.js
@@ -57,7 +57,6 @@ const GetAssistancePage = (props) => {
         shouldShowRightIcon: true,
         iconRight: Expensicons.NewWindow,
         wrapperStyle: [styles.cardMenuItem],
-        link: CONST.NEWHELP_URL,
     }];
 
     // If the user is eligible for calls with their Guide, add the 'Schedule a setup call' item at the second position in the list
diff --git a/src/pages/ReimbursementAccount/Enable2FAPrompt.js b/src/pages/ReimbursementAccount/Enable2FAPrompt.js
index cb7bc1f004d3..51c62b8957c1 100644
--- a/src/pages/ReimbursementAccount/Enable2FAPrompt.js
+++ b/src/pages/ReimbursementAccount/Enable2FAPrompt.js
@@ -13,36 +13,31 @@ import themeColors from '../../styles/themes/default';
 const propTypes = {
     ...withLocalizePropTypes,
 };
-const Enable2FAPrompt = (props) => {
-    const secureYourAccountUrl = encodeURI(`settings?param={"section":"account","action":"enableTwoFactorAuth","exitTo":"${ROUTES.getBankAccountRoute()}","isFromNewDot":"true"}`);
-
-    return (
-        <Section
-            title={props.translate('validationStep.enable2FATitle')}
-            icon={Illustrations.ShieldYellow}
-            menuItems={[
-                {
-                    title: props.translate('validationStep.secureYourAccount'),
-                    onPress: () => {
-                        Link.openOldDotLink(secureYourAccountUrl);
-                    },
-                    icon: Expensicons.Shield,
-                    shouldShowRightIcon: true,
-                    iconRight: Expensicons.NewWindow,
-                    iconFill: themeColors.success,
-                    wrapperStyle: [styles.cardMenuItem],
-                    link: () => Link.buildOldDotURL(secureYourAccountUrl),
+const Enable2FAPrompt = props => (
+    <Section
+        title={props.translate('validationStep.enable2FATitle')}
+        icon={Illustrations.ShieldYellow}
+        menuItems={[
+            {
+                title: props.translate('validationStep.secureYourAccount'),
+                onPress: () => {
+                    Link.openOldDotLink(encodeURI(`settings?param={"section":"account","action":"enableTwoFactorAuth","exitTo":"${ROUTES.getBankAccountRoute()}","isFromNewDot":"true"}`));
                 },
-            ]}
-        >
-            <View style={[styles.mv3]}>
-                <Text>
-                    {props.translate('validationStep.enable2FAText')}
-                </Text>
-            </View>
-        </Section>
-    );
-};
+                icon: Expensicons.Shield,
+                shouldShowRightIcon: true,
+                iconRight: Expensicons.NewWindow,
+                iconFill: themeColors.success,
+                wrapperStyle: [styles.cardMenuItem],
+            },
+        ]}
+    >
+        <View style={[styles.mv3]}>
+            <Text>
+                {props.translate('validationStep.enable2FAText')}
+            </Text>
+        </View>
+    </Section>
+);
 
 Enable2FAPrompt.propTypes = propTypes;
 Enable2FAPrompt.displayName = 'Enable2FAPrompt';
diff --git a/src/pages/settings/AboutPage/AboutPage.js b/src/pages/settings/AboutPage/AboutPage.js
index b4a816ea5740..7c7840fdbbdb 100644
--- a/src/pages/settings/AboutPage/AboutPage.js
+++ b/src/pages/settings/AboutPage/AboutPage.js
@@ -19,8 +19,6 @@ import * as Report from '../../../libs/actions/Report';
 import * as Link from '../../../libs/actions/Link';
 import getPlatformSpecificMenuItems from './getPlatformSpecificMenuItems';
 import compose from '../../../libs/compose';
-import * as ReportActionContextMenu from '../../home/report/ContextMenu/ReportActionContextMenu';
-import {CONTEXT_MENU_TYPES} from '../../home/report/ContextMenu/ContextMenuActions';
 
 const propTypes = {
     ...withLocalizePropTypes,
@@ -28,8 +26,6 @@ const propTypes = {
 };
 
 const AboutPage = (props) => {
-    let popoverAnchor;
-
     const platformSpecificMenuItems = getPlatformSpecificMenuItems(props.isSmallScreenWidth);
 
     const menuItems = [
@@ -48,7 +44,6 @@ const AboutPage = (props) => {
             action: () => {
                 Link.openExternalLink(CONST.GITHUB_URL);
             },
-            link: CONST.GITHUB_URL,
         },
         {
             translationKey: 'initialSettingsPage.aboutPage.viewOpenJobs',
@@ -57,7 +52,6 @@ const AboutPage = (props) => {
             action: () => {
                 Link.openExternalLink(CONST.UPWORK_URL);
             },
-            link: CONST.UPWORK_URL,
         },
         {
             translationKey: 'initialSettingsPage.aboutPage.reportABug',
@@ -113,10 +107,6 @@ const AboutPage = (props) => {
                                     icon={item.icon}
                                     iconRight={item.iconRight}
                                     onPress={() => item.action()}
-                                    shouldBlockSelection={Boolean(item.link)}
-                                    onSecondaryInteraction={!_.isEmpty(item.link)
-                                        ? e => ReportActionContextMenu.showContextMenu(CONTEXT_MENU_TYPES.LINK, e, item.link, popoverAnchor) : undefined}
-                                    ref={el => popoverAnchor = el}
                                     shouldShowRightIcon
                                 />
                             ))}
diff --git a/src/pages/settings/AppDownloadLinks.js b/src/pages/settings/AppDownloadLinks.js
index 8acd2e95dafb..9b47bdb644ef 100644
--- a/src/pages/settings/AppDownloadLinks.js
+++ b/src/pages/settings/AppDownloadLinks.js
@@ -11,9 +11,12 @@ import compose from '../../libs/compose';
 import MenuItem from '../../components/MenuItem';
 import styles from '../../styles/styles';
 import * as Link from '../../libs/actions/Link';
+import PressableWithSecondaryInteraction from '../../components/PressableWithSecondaryInteraction';
+import ControlSelection from '../../libs/ControlSelection';
 import withWindowDimensions, {windowDimensionsPropTypes} from '../../components/withWindowDimensions';
+import * as DeviceCapabilities from '../../libs/DeviceCapabilities';
 import * as ReportActionContextMenu from '../home/report/ContextMenu/ReportActionContextMenu';
-import {CONTEXT_MENU_TYPES} from '../home/report/ContextMenu/ContextMenuActions';
+import * as ContextMenuActions from '../home/report/ContextMenu/ContextMenuActions';
 
 const propTypes = {
     ...withLocalizePropTypes,
@@ -53,6 +56,21 @@ const AppDownloadLinksPage = (props) => {
         },
     ];
 
+    /**
+     * Show the ReportActionContextMenu modal popover.
+     *
+     * @param {Object} [event] - A press event.
+     * @param {String} [selection] - Copied content.
+     */
+    const showPopover = (event, selection) => {
+        ReportActionContextMenu.showContextMenu(
+            ContextMenuActions.CONTEXT_MENU_TYPES.LINK,
+            event,
+            selection,
+            popoverAnchor,
+        );
+    };
+
     return (
         <ScreenWrapper>
             <HeaderWithCloseButton
@@ -63,20 +81,24 @@ const AppDownloadLinksPage = (props) => {
             />
             <ScrollView style={[styles.mt5]}>
                 {_.map(menuItems, item => (
-                    <MenuItem
+                    <PressableWithSecondaryInteraction
                         key={item.translationKey}
-                        onPress={() => item.action()}
-                        onSecondaryInteraction={e => ReportActionContextMenu.showContextMenu(CONTEXT_MENU_TYPES.LINK, e, item.link, popoverAnchor)}
+                        onPressIn={() => props.isSmallScreenWidth && DeviceCapabilities.canUseTouchScreen() && ControlSelection.block()}
+                        onPressOut={() => ControlSelection.unblock()}
+                        onSecondaryInteraction={e => showPopover(e, item.link)}
+                        ref={el => popoverAnchor = el}
                         onKeyDown={(event) => {
                             event.target.blur();
                         }}
-                        ref={el => popoverAnchor = el}
-                        title={props.translate(item.translationKey)}
-                        icon={item.icon}
-                        iconRight={item.iconRight}
-                        shouldBlockSelection
-                        shouldShowRightIcon
-                    />
+                    >
+                        <MenuItem
+                            title={props.translate(item.translationKey)}
+                            icon={item.icon}
+                            iconRight={item.iconRight}
+                            onPress={() => item.action()}
+                            shouldShowRightIcon
+                        />
+                    </PressableWithSecondaryInteraction>
                 ))}
             </ScrollView>
         </ScreenWrapper>
diff --git a/src/pages/settings/InitialSettingsPage.js b/src/pages/settings/InitialSettingsPage.js
index ef001593a7c0..71578843b7a3 100755
--- a/src/pages/settings/InitialSettingsPage.js
+++ b/src/pages/settings/InitialSettingsPage.js
@@ -36,8 +36,6 @@ import * as Link from '../../libs/actions/Link';
 import OfflineWithFeedback from '../../components/OfflineWithFeedback';
 import * as UserUtils from '../../libs/UserUtils';
 import policyMemberPropType from '../policyMemberPropType';
-import * as ReportActionContextMenu from '../home/report/ContextMenu/ReportActionContextMenu';
-import {CONTEXT_MENU_TYPES} from '../home/report/ContextMenu/ContextMenuActions';
 
 const propTypes = {
     /* Onyx Props */
@@ -119,8 +117,6 @@ class InitialSettingsPage extends React.Component {
     constructor(props) {
         super(props);
 
-        this.popoverAnchor = React.createRef();
-
         this.getWalletBalance = this.getWalletBalance.bind(this);
         this.getDefaultMenuItems = this.getDefaultMenuItems.bind(this);
         this.getMenuItem = this.getMenuItem.bind(this);
@@ -207,7 +203,6 @@ class InitialSettingsPage extends React.Component {
                 action: () => { Link.openExternalLink(CONST.NEWHELP_URL); },
                 shouldShowRightIcon: true,
                 iconRight: Expensicons.NewWindow,
-                link: CONST.NEWHELP_URL,
             },
             {
                 translationKey: 'initialSettingsPage.about',
@@ -241,9 +236,6 @@ class InitialSettingsPage extends React.Component {
                 brickRoadIndicator={item.brickRoadIndicator}
                 floatRightAvatars={item.floatRightAvatars}
                 shouldStackHorizontally={item.shouldStackHorizontally}
-                ref={this.popoverAnchor}
-                shouldBlockSelection={Boolean(item.link)}
-                onSecondaryInteraction={!_.isEmpty(item.link) ? e => ReportActionContextMenu.showContextMenu(CONTEXT_MENU_TYPES.LINK, e, item.link, this.popoverAnchor.current) : undefined}
             />
         );
     }
diff --git a/src/pages/workspace/bills/WorkspaceBillsFirstSection.js b/src/pages/workspace/bills/WorkspaceBillsFirstSection.js
index 15397ea96776..f97b6ba946ae 100644
--- a/src/pages/workspace/bills/WorkspaceBillsFirstSection.js
+++ b/src/pages/workspace/bills/WorkspaceBillsFirstSection.js
@@ -42,7 +42,6 @@ const defaultProps = {
 
 const WorkspaceBillsFirstSection = (props) => {
     const emailDomain = Str.extractEmailDomain(props.session.email);
-    const manageYourBillsUrl = `reports?policyID=${props.policyID}&from=all&type=bill&showStates=Open,Processing,Approved,Reimbursed,Archived&isAdvancedFilterMode=true`;
     return (
         <Section
             title={props.translate('workspace.bills.manageYourBills')}
@@ -51,13 +50,12 @@ const WorkspaceBillsFirstSection = (props) => {
                 {
                     title: props.translate('workspace.bills.viewAllBills'),
                     onPress: () => (
-                        Link.openOldDotLink(manageYourBillsUrl)
+                        Link.openOldDotLink(`reports?policyID=${props.policyID}&from=all&type=bill&showStates=Open,Processing,Approved,Reimbursed,Archived&isAdvancedFilterMode=true`)
                     ),
                     icon: Expensicons.Bill,
                     shouldShowRightIcon: true,
                     iconRight: Expensicons.NewWindow,
                     wrapperStyle: [styles.cardMenuItem],
-                    link: () => Link.buildOldDotURL(manageYourBillsUrl),
                 },
             ]}
             containerStyles={[styles.cardSection]}
diff --git a/src/pages/workspace/bills/WorkspaceBillsVBAView.js b/src/pages/workspace/bills/WorkspaceBillsVBAView.js
index dcb625777c7d..3731a9cc7b8f 100644
--- a/src/pages/workspace/bills/WorkspaceBillsVBAView.js
+++ b/src/pages/workspace/bills/WorkspaceBillsVBAView.js
@@ -17,35 +17,30 @@ const propTypes = {
     ...withLocalizePropTypes,
 };
 
-const WorkspaceBillsVBAView = (props) => {
-    const reportsUrl = `reports?policyID=${props.policyID}&from=all&type=bill&showStates=Processing,Approved&isAdvancedFilterMode=true`;
+const WorkspaceBillsVBAView = props => (
+    <>
+        <WorkspaceBillsFirstSection policyID={props.policyID} />
 
-    return (
-        <>
-            <WorkspaceBillsFirstSection policyID={props.policyID} />
-
-            <Section
-                title={props.translate('workspace.bills.hassleFreeBills')}
-                icon={Illustrations.MoneyBadge}
-                menuItems={[
-                    {
-                        title: props.translate('workspace.common.bills'),
-                        onPress: () => Link.openOldDotLink(reportsUrl),
-                        icon: Expensicons.Bill,
-                        shouldShowRightIcon: true,
-                        iconRight: Expensicons.NewWindow,
-                        wrapperStyle: [styles.cardMenuItem],
-                        link: () => Link.buildOldDotURL(reportsUrl),
-                    },
-                ]}
-            >
-                <View style={[styles.mv3]}>
-                    <Text>{props.translate('workspace.bills.VBACopy')}</Text>
-                </View>
-            </Section>
-        </>
-    );
-};
+        <Section
+            title={props.translate('workspace.bills.hassleFreeBills')}
+            icon={Illustrations.MoneyBadge}
+            menuItems={[
+                {
+                    title: props.translate('workspace.common.bills'),
+                    onPress: () => Link.openOldDotLink(`reports?policyID=${props.policyID}&from=all&type=bill&showStates=Processing,Approved&isAdvancedFilterMode=true`),
+                    icon: Expensicons.Bill,
+                    shouldShowRightIcon: true,
+                    iconRight: Expensicons.NewWindow,
+                    wrapperStyle: [styles.cardMenuItem],
+                },
+            ]}
+        >
+            <View style={[styles.mv3]}>
+                <Text>{props.translate('workspace.bills.VBACopy')}</Text>
+            </View>
+        </Section>
+    </>
+);
 
 WorkspaceBillsVBAView.propTypes = propTypes;
 WorkspaceBillsVBAView.displayName = 'WorkspaceBillsVBAView';
diff --git a/src/pages/workspace/card/WorkspaceCardVBAWithECardView.js b/src/pages/workspace/card/WorkspaceCardVBAWithECardView.js
index 4c1213800bac..a9a551f23131 100644
--- a/src/pages/workspace/card/WorkspaceCardVBAWithECardView.js
+++ b/src/pages/workspace/card/WorkspaceCardVBAWithECardView.js
@@ -13,40 +13,31 @@ const propTypes = {
     ...withLocalizePropTypes,
 };
 
-const MENU_LINKS = {
-    ISSUE_AND_MANAGE_CARDS: 'domain_companycards',
-    RECONCILE_CARDS: encodeURI('domain_companycards?param={"section":"cardReconciliation"}'),
-    SETTLEMENT_FREQUENCY: encodeURI('domain_companycards?param={"section":"configureSettings"}'),
-};
-
 const WorkspaceCardVBAWithECardView = (props) => {
     const menuItems = [
         {
             title: props.translate('workspace.common.issueAndManageCards'),
-            onPress: () => Link.openOldDotLink(MENU_LINKS.ISSUE_AND_MANAGE_CARDS),
+            onPress: () => Link.openOldDotLink('domain_companycards'),
             icon: Expensicons.ExpensifyCard,
             shouldShowRightIcon: true,
             iconRight: Expensicons.NewWindow,
             wrapperStyle: [styles.cardMenuItem],
-            link: () => Link.buildOldDotURL(MENU_LINKS.ISSUE_AND_MANAGE_CARDS),
         },
         {
             title: props.translate('workspace.common.reconcileCards'),
-            onPress: () => Link.openOldDotLink(MENU_LINKS.RECONCILE_CARDS),
+            onPress: () => Link.openOldDotLink(encodeURI('domain_companycards?param={"section":"cardReconciliation"}')),
             icon: Expensicons.ReceiptSearch,
             shouldShowRightIcon: true,
             iconRight: Expensicons.NewWindow,
             wrapperStyle: [styles.cardMenuItem],
-            link: () => Link.buildOldDotURL(MENU_LINKS.RECONCILE_CARDS),
         },
         {
             title: props.translate('workspace.common.settlementFrequency'),
-            onPress: () => Link.openOldDotLink(MENU_LINKS.SETTLEMENT_FREQUENCY),
+            onPress: () => Link.openOldDotLink(encodeURI('domain_companycards?param={"section":"configureSettings"}')),
             icon: Expensicons.Gear,
             shouldShowRightIcon: true,
             iconRight: Expensicons.NewWindow,
             wrapperStyle: [styles.cardMenuItem],
-            link: () => Link.buildOldDotURL(MENU_LINKS.SETTLEMENT_FREQUENCY),
         },
     ];
 
diff --git a/src/pages/workspace/invoices/WorkspaceInvoicesFirstSection.js b/src/pages/workspace/invoices/WorkspaceInvoicesFirstSection.js
index 9f3c84d28ff1..4d027542b155 100644
--- a/src/pages/workspace/invoices/WorkspaceInvoicesFirstSection.js
+++ b/src/pages/workspace/invoices/WorkspaceInvoicesFirstSection.js
@@ -16,46 +16,39 @@ const propTypes = {
     ...withLocalizePropTypes,
 };
 
-const WorkspaceInvoicesFirstSection = (props) => {
-    const sendInvoiceUrl = encodeURI('reports?param={"createInvoice":true}');
-    const viewAllInvoicesUrl = `reports?policyID=${props.policyID}&from=all&type=invoice&showStates=Open,Processing,Approved,Reimbursed,Archived&isAdvancedFilterMode=true`;
-
-    return (
-        <Section
-            title={props.translate('workspace.invoices.invoiceClientsAndCustomers')}
-            icon={Illustrations.InvoiceBlue}
-            menuItems={[
-                {
-                    title: props.translate('workspace.invoices.sendInvoice'),
-                    onPress: () => Link.openOldDotLink(sendInvoiceUrl),
-                    icon: Expensicons.Send,
-                    shouldShowRightIcon: true,
-                    iconRight: Expensicons.NewWindow,
-                    wrapperStyle: [styles.cardMenuItem],
-                    link: () => Link.buildOldDotURL(sendInvoiceUrl),
-                },
-                {
-                    title: props.translate('workspace.invoices.viewAllInvoices'),
-                    onPress: () => (
-                        Link.openOldDotLink(viewAllInvoicesUrl)
-                    ),
-                    icon: Expensicons.Invoice,
-                    shouldShowRightIcon: true,
-                    iconRight: Expensicons.NewWindow,
-                    wrapperStyle: [styles.cardMenuItem],
-                    link: () => Link.buildOldDotURL(viewAllInvoicesUrl),
-                },
-            ]}
-            containerStyles={[styles.cardSection]}
-        >
-            <View style={[styles.mv3]}>
-                <Text>
-                    {props.translate('workspace.invoices.invoiceFirstSectionCopy')}
-                </Text>
-            </View>
-        </Section>
-    );
-};
+const WorkspaceInvoicesFirstSection = props => (
+    <Section
+        title={props.translate('workspace.invoices.invoiceClientsAndCustomers')}
+        icon={Illustrations.InvoiceBlue}
+        menuItems={[
+            {
+                title: props.translate('workspace.invoices.sendInvoice'),
+                onPress: () => Link.openOldDotLink(encodeURI('reports?param={"createInvoice":true}')),
+                icon: Expensicons.Send,
+                shouldShowRightIcon: true,
+                iconRight: Expensicons.NewWindow,
+                wrapperStyle: [styles.cardMenuItem],
+            },
+            {
+                title: props.translate('workspace.invoices.viewAllInvoices'),
+                onPress: () => (
+                    Link.openOldDotLink(`reports?policyID=${props.policyID}&from=all&type=invoice&showStates=Open,Processing,Approved,Reimbursed,Archived&isAdvancedFilterMode=true`)
+                ),
+                icon: Expensicons.Invoice,
+                shouldShowRightIcon: true,
+                iconRight: Expensicons.NewWindow,
+                wrapperStyle: [styles.cardMenuItem],
+            },
+        ]}
+        containerStyles={[styles.cardSection]}
+    >
+        <View style={[styles.mv3]}>
+            <Text>
+                {props.translate('workspace.invoices.invoiceFirstSectionCopy')}
+            </Text>
+        </View>
+    </Section>
+);
 
 WorkspaceInvoicesFirstSection.propTypes = propTypes;
 WorkspaceInvoicesFirstSection.displayName = 'WorkspaceInvoicesFirstSection';
diff --git a/src/pages/workspace/invoices/WorkspaceInvoicesVBAView.js b/src/pages/workspace/invoices/WorkspaceInvoicesVBAView.js
index c4f50bb9d49d..c88a61eef18b 100644
--- a/src/pages/workspace/invoices/WorkspaceInvoicesVBAView.js
+++ b/src/pages/workspace/invoices/WorkspaceInvoicesVBAView.js
@@ -17,35 +17,30 @@ const propTypes = {
     ...withLocalizePropTypes,
 };
 
-const WorkspaceInvoicesVBAView = (props) => {
-    const viewUnpaidInvoicesUrl = `reports?policyID=${props.policyID}&from=all&type=invoice&showStates=Processing&isAdvancedFilterMode=true`;
+const WorkspaceInvoicesVBAView = props => (
+    <>
+        <WorkspaceInvoicesFirstSection policyID={props.policyID} />
 
-    return (
-        <>
-            <WorkspaceInvoicesFirstSection policyID={props.policyID} />
-
-            <Section
-                title={props.translate('workspace.invoices.moneyBackInAFlash')}
-                icon={Illustrations.MoneyBadge}
-                menuItems={[
-                    {
-                        title: props.translate('workspace.invoices.viewUnpaidInvoices'),
-                        onPress: () => Link.openOldDotLink(viewUnpaidInvoicesUrl),
-                        icon: Expensicons.Hourglass,
-                        shouldShowRightIcon: true,
-                        iconRight: Expensicons.NewWindow,
-                        wrapperStyle: [styles.cardMenuItem],
-                        link: () => Link.buildOldDotURL(viewUnpaidInvoicesUrl),
-                    },
-                ]}
-            >
-                <View style={[styles.mv3]}>
-                    <Text>{props.translate('workspace.invoices.unlockVBACopy')}</Text>
-                </View>
-            </Section>
-        </>
-    );
-};
+        <Section
+            title={props.translate('workspace.invoices.moneyBackInAFlash')}
+            icon={Illustrations.MoneyBadge}
+            menuItems={[
+                {
+                    title: props.translate('workspace.invoices.viewUnpaidInvoices'),
+                    onPress: () => Link.openOldDotLink(`reports?policyID=${props.policyID}&from=all&type=invoice&showStates=Processing&isAdvancedFilterMode=true`),
+                    icon: Expensicons.Hourglass,
+                    shouldShowRightIcon: true,
+                    iconRight: Expensicons.NewWindow,
+                    wrapperStyle: [styles.cardMenuItem],
+                },
+            ]}
+        >
+            <View style={[styles.mv3]}>
+                <Text>{props.translate('workspace.invoices.unlockVBACopy')}</Text>
+            </View>
+        </Section>
+    </>
+);
 
 WorkspaceInvoicesVBAView.propTypes = propTypes;
 WorkspaceInvoicesVBAView.displayName = 'WorkspaceInvoicesVBAView';
diff --git a/src/pages/workspace/reimburse/WorkspaceReimburseSection.js b/src/pages/workspace/reimburse/WorkspaceReimburseSection.js
index 3928816fb686..20f443bf5671 100644
--- a/src/pages/workspace/reimburse/WorkspaceReimburseSection.js
+++ b/src/pages/workspace/reimburse/WorkspaceReimburseSection.js
@@ -57,7 +57,6 @@ class WorkspaceReimburseSection extends React.Component {
     render() {
         const achState = lodashGet(this.props.reimbursementAccount, 'achData.state', '');
         const hasVBA = achState === BankAccount.STATE.OPEN;
-        const reimburseReceiptsUrl = `reports?policyID=${this.props.policy.id}&from=all&type=expense&showStates=Archived&isAdvancedFilterMode=true`;
 
         if (this.props.network.isOffline) {
             return (
@@ -94,12 +93,11 @@ class WorkspaceReimburseSection extends React.Component {
                         menuItems={[
                             {
                                 title: this.props.translate('workspace.reimburse.reimburseReceipts'),
-                                onPress: () => Link.openOldDotLink(reimburseReceiptsUrl),
+                                onPress: () => Link.openOldDotLink(`reports?policyID=${this.props.policy.id}&from=all&type=expense&showStates=Archived&isAdvancedFilterMode=true`),
                                 icon: Expensicons.Bank,
                                 shouldShowRightIcon: true,
                                 iconRight: Expensicons.NewWindow,
                                 wrapperStyle: [styles.cardMenuItem],
-                                link: () => Link.buildOldDotURL(reimburseReceiptsUrl),
                             },
                         ]}
                     >
diff --git a/src/pages/workspace/reimburse/WorkspaceReimburseView.js b/src/pages/workspace/reimburse/WorkspaceReimburseView.js
index ccb40d053e7f..d103121b9e2a 100644
--- a/src/pages/workspace/reimburse/WorkspaceReimburseView.js
+++ b/src/pages/workspace/reimburse/WorkspaceReimburseView.js
@@ -214,8 +214,6 @@ class WorkspaceReimburseView extends React.Component {
     }
 
     render() {
-        const viewAllReceiptsUrl = `expenses?policyIDList=${this.props.policy.id}&billableReimbursable=reimbursable&submitterEmail=%2B%2B`;
-
         return (
             <>
                 <Section
@@ -224,12 +222,11 @@ class WorkspaceReimburseView extends React.Component {
                     menuItems={[
                         {
                             title: this.props.translate('workspace.reimburse.viewAllReceipts'),
-                            onPress: () => Link.openOldDotLink(viewAllReceiptsUrl),
+                            onPress: () => Link.openOldDotLink(`expenses?policyIDList=${this.props.policy.id}&billableReimbursable=reimbursable&submitterEmail=%2B%2B`),
                             icon: Expensicons.Receipt,
                             shouldShowRightIcon: true,
                             iconRight: Expensicons.NewWindow,
                             wrapperStyle: [styles.cardMenuItem],
-                            link: () => Link.buildOldDotURL(viewAllReceiptsUrl),
                         },
                     ]}
                 >
diff --git a/src/pages/workspace/travel/WorkspaceTravelVBAView.js b/src/pages/workspace/travel/WorkspaceTravelVBAView.js
index 79b256136028..9c79b55c90b4 100644
--- a/src/pages/workspace/travel/WorkspaceTravelVBAView.js
+++ b/src/pages/workspace/travel/WorkspaceTravelVBAView.js
@@ -8,7 +8,6 @@ import * as Illustrations from '../../../components/Icon/Illustrations';
 import Section from '../../../components/Section';
 import * as Link from '../../../libs/actions/Link';
 import * as Report from '../../../libs/actions/Report';
-import CONST from '../../../CONST';
 
 const propTypes = {
     ...withLocalizePropTypes,
@@ -26,7 +25,6 @@ const WorkspaceTravelVBAView = props => (
                 shouldShowRightIcon: true,
                 iconRight: Expensicons.NewWindow,
                 wrapperStyle: [styles.cardMenuItem],
-                link: () => Link.buildOldDotURL('domain_companycards'),
             },
             {
                 title: props.translate('workspace.travel.bookTravelWithConcierge'),
@@ -39,12 +37,11 @@ const WorkspaceTravelVBAView = props => (
             },
             {
                 title: props.translate('requestorStep.learnMore'),
-                onPress: () => Link.openExternalLink(CONST.CONCIERGE_TRAVEL_URL),
+                onPress: () => Link.openExternalLink('https://community.expensify.com/discussion/7066/introducing-concierge-travel'),
                 icon: Expensicons.Info,
                 shouldShowRightIcon: true,
                 iconRight: Expensicons.NewWindow,
                 wrapperStyle: [styles.cardMenuItem],
-                link: CONST.CONCIERGE_TRAVEL_URL,
             },
         ]}
     >
diff --git a/src/styles/stylePropTypes.js b/src/styles/stylePropTypes.js
index edc5d0383a75..4c7e825a8848 100644
--- a/src/styles/stylePropTypes.js
+++ b/src/styles/stylePropTypes.js
@@ -3,5 +3,4 @@ import PropTypes from 'prop-types';
 export default PropTypes.oneOfType([
     PropTypes.object,
     PropTypes.arrayOf(PropTypes.object),
-    PropTypes.func,
 ]);