Connections settings tab (#7013)

* Nix notification for Share Address

* Add Connections settings tab in place of privacy mode toggle

* Split ProviderApprovalController into two stores

* Remove privacyMode feature flag altogether

* Add migration to remove privacyMode feature flag

2 files changed, 1 insertions, 50 deletions

diff --git a/ui/app/pages/home/home.component.js b/ui/app/pages/home/home.component.js
index 66d962ff1..ff7428eff 100644
--- a/ui/app/pages/home/home.component.js
+++ b/ui/app/pages/home/home.component.js
@@ -21,18 +21,10 @@ export default class Home extends PureComponent {
   }
 
   static defaultProps = {
-    activeTab: {},
     unsetMigratedPrivacyMode: null,
-    forceApproveProviderRequestByOrigin: null,
   }
 
   static propTypes = {
-    activeTab: PropTypes.shape({
-      origin: PropTypes.string,
-      protocol: PropTypes.string,
-      title: PropTypes.string,
-      url: PropTypes.string,
-    }),
     history: PropTypes.object,
     forgottenPassword: PropTypes.bool,
     suggestedTokens: PropTypes.object,
@@ -40,10 +32,7 @@ export default class Home extends PureComponent {
     providerRequests: PropTypes.array,
     showPrivacyModeNotification: PropTypes.bool.isRequired,
     unsetMigratedPrivacyMode: PropTypes.func,
-    viewingUnconnectedDapp: PropTypes.bool.isRequired,
-    forceApproveProviderRequestByOrigin: PropTypes.func,
     shouldShowSeedPhraseReminder: PropTypes.bool,
-    rejectProviderRequestByOrigin: PropTypes.func,
     isPopup: PropTypes.bool,
   }
 
@@ -73,16 +62,12 @@ export default class Home extends PureComponent {
   render () {
     const { t } = this.context
     const {
-      activeTab,
       forgottenPassword,
       providerRequests,
       history,
       showPrivacyModeNotification,
       unsetMigratedPrivacyMode,
-      viewingUnconnectedDapp,
-      forceApproveProviderRequestByOrigin,
       shouldShowSeedPhraseReminder,
-      rejectProviderRequestByOrigin,
       isPopup,
     } = this.props
 
@@ -121,20 +106,6 @@ export default class Home extends PureComponent {
                       />,
                     },
                     {
-                      shouldBeRendered: viewingUnconnectedDapp,
-                      component: <HomeNotification
-                        descriptionText={t('shareAddressToConnect', [activeTab.origin])}
-                        acceptText={t('shareAddress')}
-                        onAccept={() => {
-                          forceApproveProviderRequestByOrigin(activeTab.origin)
-                        }}
-                        ignoreText={t('dismiss')}
-                        onIgnore={() => rejectProviderRequestByOrigin(activeTab.origin)}
-                        infoText={t('shareAddressInfo', [activeTab.origin])}
-                        key="home-shareAddressToConnect"
-                      />,
-                    },
-                    {
                       shouldBeRendered: shouldShowSeedPhraseReminder,
                       component: <HomeNotification
                         descriptionText={t('backupApprovalNotice')}
diff --git a/ui/app/pages/home/home.container.js b/ui/app/pages/home/home.container.js
index fdcb3ded4..4de51ee50 100644
--- a/ui/app/pages/home/home.container.js
+++ b/ui/app/pages/home/home.container.js
@@ -5,39 +5,23 @@ import { withRouter } from 'react-router-dom'
 import { unconfirmedTransactionsCountSelector } from '../../selectors/confirm-transaction'
 import { getCurrentEthBalance } from '../../selectors/selectors'
 import {
-  forceApproveProviderRequestByOrigin,
   unsetMigratedPrivacyMode,
-  rejectProviderRequestByOrigin,
 } from '../../store/actions'
 import { getEnvironmentType } from '../../../../app/scripts/lib/util'
 import { ENVIRONMENT_TYPE_POPUP } from '../../../../app/scripts/lib/enums'
 
-const activeTabDappProtocols = ['http:', 'https:', 'dweb:', 'ipfs:', 'ipns:', 'ssb:']
-
 const mapStateToProps = state => {
-  const { activeTab, metamask, appState } = state
+  const { metamask, appState } = state
   const {
-    approvedOrigins,
-    dismissedOrigins,
     suggestedTokens,
     providerRequests,
     migratedPrivacyMode,
-    featureFlags: {
-      privacyMode,
-    } = {},
     seedPhraseBackedUp,
     tokens,
   } = metamask
   const accountBalance = getCurrentEthBalance(state)
   const { forgottenPassword } = appState
 
-  const isUnconnected = Boolean(
-    activeTab &&
-    activeTabDappProtocols.includes(activeTab.protocol) &&
-    privacyMode &&
-    !approvedOrigins[activeTab.origin] &&
-    !dismissedOrigins[activeTab.origin]
-  )
   const isPopup = getEnvironmentType(window.location.href) === ENVIRONMENT_TYPE_POPUP
 
   return {
@@ -46,8 +30,6 @@ const mapStateToProps = state => {
     unconfirmedTransactionsCount: unconfirmedTransactionsCountSelector(state),
     providerRequests,
     showPrivacyModeNotification: migratedPrivacyMode,
-    activeTab,
-    viewingUnconnectedDapp: isUnconnected && isPopup,
     shouldShowSeedPhraseReminder: !seedPhraseBackedUp && (parseInt(accountBalance, 16) > 0 || tokens.length > 0),
     isPopup,
   }
@@ -55,8 +37,6 @@ const mapStateToProps = state => {
 
 const mapDispatchToProps = (dispatch) => ({
   unsetMigratedPrivacyMode: () => dispatch(unsetMigratedPrivacyMode()),
-  forceApproveProviderRequestByOrigin: (origin) => dispatch(forceApproveProviderRequestByOrigin(origin)),
-  rejectProviderRequestByOrigin: origin => dispatch(rejectProviderRequestByOrigin(origin)),
 })
 
 export default compose(