Tidy up getAccountLink (#9223)

ui/app/components/app/menu-bar/account-options-menu.js

@@ -6,7 +6,7 @@ import { useDispatch, useSelector } from 'react-redux'
 import { showModal } from '../../../store/actions'
 import { CONNECTED_ROUTE } from '../../../helpers/constants/routes'
 import { Menu, MenuItem } from '../../ui/menu'
-import genAccountLink from '../../../../lib/account-link'
+import getAccountLink from '../../../../lib/account-link'
 import { getCurrentKeyring, getCurrentNetwork, getRpcPrefsForCurrentProvider, getSelectedIdentity } from '../../../selectors'
 import { useI18nContext } from '../../../hooks/useI18nContext'
 import { useMetricEvent } from '../../../hooks/useMetricEvent'
@@ -90,7 +90,7 @@ export default function AccountOptionsMenu ({ anchorElement, onClose }) {
       <MenuItem
         onClick={() => {
           viewOnEtherscanEvent()
-          global.platform.openTab({ url: genAccountLink(address, network, rpcPrefs) })
+          global.platform.openTab({ url: getAccountLink(address, network, rpcPrefs) })
           onClose()
         }}
         subtitle={

ui/app/components/app/modals/account-details-modal/account-details-modal.component.js

@@ -1,7 +1,7 @@
 import React, { Component } from 'react'
 import PropTypes from 'prop-types'
 import AccountModalContainer from '../account-modal-container'
-import genAccountLink from '../../../../../lib/account-link'
+import getAccountLink from '../../../../../lib/account-link'
 import QrView from '../../../ui/qr-code'
 import EditableLabel from '../../../ui/editable-label'
 import Button from '../../../ui/button'
@@ -62,7 +62,7 @@ export default class AccountDetailsModal extends Component {
           type="secondary"
           className="account-details-modal__button"
           onClick={() => {
-            global.platform.openTab({ url: genAccountLink(address, network, rpcPrefs) })
+            global.platform.openTab({ url: getAccountLink(address, network, rpcPrefs) })
           }}
         >
           {rpcPrefs.blockExplorerUrl

ui/app/components/app/modals/confirm-remove-account/confirm-remove-account.component.js

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types'
 import Modal from '../../modal'
 import { addressSummary } from '../../../../helpers/utils/util'
 import Identicon from '../../../ui/identicon'
-import genAccountLink from '../../../../../lib/account-link'
+import getAccountLink from '../../../../../lib/account-link'
 
 export default class ConfirmRemoveAccount extends Component {
   static propTypes = {
@@ -47,7 +47,7 @@ export default class ConfirmRemoveAccount extends Component {
         <div className="confirm-remove-account__account__link">
           <a
             className=""
-            href={genAccountLink(identity.address, this.props.network)}
+            href={getAccountLink(identity.address, this.props.network)}
             target="_blank"
             rel="noopener noreferrer"
             title={this.context.t('etherscanView')}

ui/app/pages/create-account/connect-hardware/account-list.js

@@ -1,7 +1,7 @@
 import PropTypes from 'prop-types'
 import React, { Component } from 'react'
 import Select from 'react-select'
-import genAccountLink from '../../../../lib/account-link'
+import getAccountLink from '../../../../lib/account-link'
 import Button from '../../../components/ui/button'
 
 class AccountList extends Component {
@@ -101,7 +101,7 @@ class AccountList extends Component {
               </div>
               <a
                 className="hw-account-list__item__link"
-                href={genAccountLink(account.address, this.props.network)}
+                href={getAccountLink(account.address, this.props.network)}
                 target="_blank"
                 rel="noopener noreferrer"
                 title={this.context.t('etherscanView')}

ui/lib/account-link.js

@@ -4,30 +4,20 @@ export default function getAccountLink (address, network, rpcPrefs) {
   }
 
   const net = parseInt(network)
-  let link
   switch (net) {
     case 1: // main net
-      link = `https://etherscan.io/address/${address}`
+      return `https://etherscan.io/address/${address}`
-      break
     case 2: // morden test net
-      link = `https://morden.etherscan.io/address/${address}`
+      return `https://morden.etherscan.io/address/${address}`
-      break
     case 3: // ropsten test net
-      link = `https://ropsten.etherscan.io/address/${address}`
+      return `https://ropsten.etherscan.io/address/${address}`
-      break
     case 4: // rinkeby test net
-      link = `https://rinkeby.etherscan.io/address/${address}`
+      return `https://rinkeby.etherscan.io/address/${address}`
-      break
     case 42: // kovan test net
-      link = `https://kovan.etherscan.io/address/${address}`
+      return `https://kovan.etherscan.io/address/${address}`
-      break
     case 5: // goerli test net
-      link = `https://goerli.etherscan.io/address/${address}`
+      return `https://goerli.etherscan.io/address/${address}`
-      break
     default:
-      link = ''
+      return ''
-      break
   }
-
-  return link
 }