fix merge conflicts

1 files changed, 10 insertions, 2 deletions

diff --git a/old-ui/app/app.js b/old-ui/app/app.js
index 9be21ebad..2d364ef6f 100644
--- a/old-ui/app/app.js
+++ b/old-ui/app/app.js
@@ -33,6 +33,7 @@ const BuyView = require('./components/buy-button-subview')
 const HDCreateVaultComplete = require('./keychains/hd/create-vault-complete')
 const HDRestoreVaultScreen = require('./keychains/hd/restore-vault')
 const RevealSeedConfirmation = require('./keychains/hd/recover-seed/confirmation')
+const ProviderApproval = require('./provider-approval')
 
 module.exports = connect(mapStateToProps)(App)
 
@@ -49,6 +50,7 @@ function mapStateToProps (state) {
     noActiveNotices,
     seedWords,
     featureFlags,
+    providerRequests,
   } = state.metamask
   const selected = address || Object.keys(accounts)[0]
 
@@ -73,8 +75,9 @@ function mapStateToProps (state) {
     forgottenPassword: state.appState.forgottenPassword,
     nextUnreadNotice: state.metamask.nextUnreadNotice,
     lostAccounts: state.metamask.lostAccounts,
-    frequentRpcList: state.metamask.frequentRpcList || [],
+    frequentRpcListDetail: state.metamask.frequentRpcListDetail || [],
     featureFlags,
+    providerRequests,
     suggestedTokens: state.metamask.suggestedTokens,
 
     // state needed to get account dropdown temporarily rendering from app bar
@@ -147,7 +150,7 @@ App.prototype.renderLoadingIndicator = function ({ isLoading, isLoadingNetwork,
 App.prototype.renderPrimary = function () {
   log.debug('rendering primary')
   var props = this.props
-  const {isMascara, isOnboarding} = props
+  const {isMascara, isOnboarding, providerRequests} = props
 
   if (isMascara && isOnboarding) {
     return h(MascaraFirstTime)
@@ -215,6 +218,11 @@ App.prototype.renderPrimary = function () {
     return h(HDCreateVaultComplete, {key: 'HDCreateVaultComplete'})
   }
 
+  if (providerRequests && providerRequests.length > 0) {
+    log.debug('rendering provider API approval screen')
+    return h(ProviderApproval, { origin: providerRequests[0].origin })
+  }
+
   // show current view
   switch (props.currentView.name) {