Merge pull request #6969 from MetaMask/developv7.0.0

Master Version Bump

1 files changed, 42 insertions, 5 deletions

diff --git a/ui/app/pages/home/home.container.js b/ui/app/pages/home/home.container.js
index d0a5d7b47..f03ffdc02 100644
--- a/ui/app/pages/home/home.container.js
+++ b/ui/app/pages/home/home.container.js
@@ -3,28 +3,65 @@ import { compose } from 'recompose'
 import { connect } from 'react-redux'
 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 { metamask, appState } = state
+  const { activeTab, metamask, appState } = state
   const {
+    approvedOrigins,
+    dismissedOrigins,
     lostAccounts,
-    seedWords,
     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 {
     lostAccounts,
     forgottenPassword,
-    seedWords,
     suggestedTokens,
     unconfirmedTransactionsCount: unconfirmedTransactionsCountSelector(state),
     providerRequests,
+    showPrivacyModeNotification: migratedPrivacyMode,
+    activeTab,
+    viewingUnconnectedDapp: isUnconnected && isPopup,
+    shouldShowSeedPhraseReminder: !seedPhraseBackedUp && (parseInt(accountBalance, 16) > 0 || tokens.length > 0),
+    isPopup,
   }
 }
 
+const mapDispatchToProps = (dispatch) => ({
+  unsetMigratedPrivacyMode: () => dispatch(unsetMigratedPrivacyMode()),
+  forceApproveProviderRequestByOrigin: (origin) => dispatch(forceApproveProviderRequestByOrigin(origin)),
+  rejectProviderRequestByOrigin: origin => dispatch(rejectProviderRequestByOrigin(origin)),
+})
+
 export default compose(
   withRouter,
-  connect(mapStateToProps)
+  connect(mapStateToProps, mapDispatchToProps)
 )(Home)