Remove unused code (#9564)

A number of unused parameters and `propTypes` have been merged, along
with an unused function.

app/scripts/metamask-controller.js

@@ -204,7 +204,6 @@ export default class MetamaskController extends EventEmitter {
     this.keyringController = new KeyringController({
       keyringTypes: additionalKeyrings,
       initState: initState.KeyringController,
-      getNetwork: this.networkController.getNetworkState.bind(this.networkController),
       encryptor: opts.encryptor || undefined,
     })
     this.keyringController.memStore.subscribe((s) => this._onKeyringControllerUpdate(s))
@@ -297,7 +296,6 @@ export default class MetamaskController extends EventEmitter {
     this.swapsController = new SwapsController({
       getBufferedGasLimit: this.txController.txGasUtil.getBufferedGasLimit.bind(this.txController.txGasUtil),
       provider: this.provider,
-      getNetwork: this.networkController.getNetworkState.bind(this.networkController),
       getProviderConfig: this.networkController.getProviderConfig.bind(this.networkController),
       tokenRatesStore: this.tokenRatesController.store,
     })

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

@@ -52,7 +52,6 @@ export default class AccountDetailsModal extends Component {
         <QrView
           Qr={{
             data: address,
-            network,
           }}
         />
 

ui/app/components/app/modals/export-private-key-modal/export-private-key-modal.container.js

@@ -14,7 +14,6 @@ function mapStateToPropsFactory () {
     return {
       warning: state.appState.warning,
       privateKey: state.appState.accountDetail.privateKey,
-      network: state.metamask.network,
       selectedIdentity,
       previousModalState: state.appState.modal.previousModalState.name,
     }

ui/app/components/app/modals/hide-token-confirmation-modal/hide-token-confirmation-modal.js

@@ -7,7 +7,6 @@ import Button from '../../../ui/button'
 
 function mapStateToProps (state) {
   return {
-    network: state.metamask.network,
     token: state.appState.modal.modalState.props.token,
     assetImages: state.metamask.assetImages,
   }

ui/app/pages/confirm-transaction/conf-tx.js

@@ -33,7 +33,6 @@ function mapStateToProps (state) {
     index: txId,
     warning: state.appState.warning,
     network: state.metamask.network,
-    provider: state.metamask.provider,
     currentCurrency: state.metamask.currentCurrency,
     blockGasLimit: state.metamask.currentBlockGasLimit,
     unapprovedMsgCount,

ui/app/pages/create-account/new-account.container.js

@@ -4,13 +4,11 @@ import { getMostRecentOverviewPage } from '../../ducks/history/history'
 import NewAccountCreateForm from './new-account.component'
 
 const mapStateToProps = (state) => {
-  const { metamask: { network, selectedAddress, identities = {} } } = state
+  const { metamask: { identities = {} } } = state
   const numberOfExistingAccounts = Object.keys(identities).length
   const newAccountNumber = numberOfExistingAccounts + 1
 
   return {
-    network,
-    address: selectedAddress,
     newAccountNumber,
     mostRecentOverviewPage: getMostRecentOverviewPage(state),
   }

ui/app/pages/send/send-content/add-recipient/add-recipient.js

@@ -15,7 +15,7 @@ export function getToErrorObject (to, hasHexData = false, network) {
     if (!hasHexData) {
       toError = REQUIRED_ERROR
     }
-  } else if (!isValidAddress(to, network) && !toError) {
+  } else if (!isValidAddress(to) && !toError) {
     toError = isEthNetwork(network) ? INVALID_RECIPIENT_ADDRESS_ERROR : INVALID_RECIPIENT_ADDRESS_NOT_ETH_NETWORK_ERROR
   }
 

ui/app/selectors/selectors.js

@@ -326,7 +326,3 @@ export function getOriginOfCurrentTab (state) {
 export function getIpfsGateway (state) {
   return state.metamask.ipfsGateway
 }
-
-export function getCustomNetworkId (state) {
-  return state.metamask.settings?.network
-}