Code cleanup for wyre changes

app/scripts/metamask-controller.js

@@ -1091,7 +1091,6 @@ module.exports = class MetamaskController extends EventEmitter {
     } else {
       return Promise.resolve(this.keyringController.signPersonalMessage(msgParams))
     }
-    return promise
   }
 
   /**

test/unit/app/controllers/metamask-controller-test.js

@@ -704,7 +704,7 @@ describe('MetaMaskController', function () {
         'data': data,
       }
 
-      const promise = metamaskController.newUnsignedPersonalMessage(msgParams)
+      const promise = metamaskController.newUnsignedPersonalMessage(msgParams, {})
       // handle the promise so it doesn't throw an unhandledRejection
       promise.then(noop).catch(noop)
 
@@ -719,7 +719,7 @@ describe('MetaMaskController', function () {
         'data': data,
       }
       try {
-        await metamaskController.newUnsignedPersonalMessage(msgParams)
+        await metamaskController.newUnsignedPersonalMessage(msgParams, {})
         assert.fail('should have thrown')
       } catch (error) {
         assert.equal(error.message, 'MetaMask Message Signature: from field is required.')

ui/app/components/app/modals/signature-request-modal/signature-request-modal.component.js

@@ -46,12 +46,6 @@ export default class SignatureRequestModal extends Component {
   }
 
   renderAccountDropdown () {
-    const { selectedAccount } = this.state
-
-    const {
-      accounts,
-    } = this.props
-
     return <div className="request-signature__account">
 
       <div className="request-signature__account-text">
@@ -160,8 +154,8 @@ export default class SignatureRequestModal extends Component {
         >
           { this.context.t('learnMore') }
         </span>,
-    ]
-   }
+      ]
+    }
 
     return <div className="request-signature__body">
       { this.renderAccountInfo() }
@@ -172,7 +166,7 @@ export default class SignatureRequestModal extends Component {
           'request-signature__warning': type === 'eth_sign',
         })}
       >
-       { notice }
+        { notice }
       </div>
       <div className="request-signature__rows">
         {type === 'eth_signTypedData' && version === 'V3'

ui/app/helpers/constants/routes.js

@@ -25,7 +25,6 @@ const NEW_ACCOUNT_ROUTE = '/new-account'
 const IMPORT_ACCOUNT_ROUTE = '/new-account/import'
 const CONNECT_HARDWARE_ROUTE = '/new-account/connect'
 const SEND_ROUTE = '/send'
-const WELCOME_ROUTE = '/welcome'
 const DEPOSIT_ROUTE = '/deposit'
 
 const INITIALIZE_ROUTE = '/initialize'

ui/app/pages/routes/index.js

@@ -117,7 +117,7 @@ class Routes extends Component {
     }
   }
 
-  componentDidUpdate (prevProps) {
+  componentDidUpdate () {
     const {
       waitingForWyreSigRequest,
       unapprovedPersonalMsgs,
@@ -387,6 +387,7 @@ Routes.propTypes = {
   showDepositModal: PropTypes.func,
   waitForWyreSigRequest: PropTypes.func,
   modal: PropTypes.object,
+  selectedAddress: PropTypes.string,
 }
 
 function mapStateToProps (state) {
@@ -397,8 +398,6 @@ function mapStateToProps (state) {
     alertMessage,
     isLoading,
     loadingMessage,
-    waitingForWyreSigRequest,
-    modal,
   } = appState
 
   const { autoLogoutTimeLimit = 0 } = preferencesSelector(state)
@@ -408,7 +407,6 @@ function mapStateToProps (state) {
     unapprovedMsgCount,
     unapprovedPersonalMsgCount,
     unapprovedTypedMessagesCount,
-    providerRequests,
     unapprovedPersonalMsgs,
   } = metamask