Merge pull request #1897 from blockchain/fix/pit-test

fix(Pit Test): fix first login pit link

Author: Andrew Schneider

packages/blockchain-wallet-v4-frontend/src/layouts/Wallet/MenuLeft/ThePitLink/index.js

@@ -50,8 +50,17 @@ const PitLink = props => {
 }
 
 const PitLinkContent = props => {
-  const { firstLogin, handlePitTourCallbacks, showThePitPulse } = props
-  const runJoyride = showThePitPulse && !firstLogin
+  const {
+    firstLogin,
+    handlePitTourCallbacks,
+    hasRunWalletTour,
+    hasSkippedTour,
+    showThePitPulse
+  } = props
+  const isTourFinished = hasRunWalletTour || hasSkippedTour
+  const runJoyride = firstLogin
+    ? isTourFinished && showThePitPulse
+    : showThePitPulse
 
   return (
     <div style={{ position: 'relative', width: '100%' }}>

packages/blockchain-wallet-v4-frontend/src/layouts/Wallet/MenuLeft/selectors.js

@@ -10,10 +10,12 @@ export const getData = createDeepEqualSelector(
     selectors.preferences.getShowThePitPulse,
     selectors.components.layoutWallet.getMenuOpened,
     selectors.components.layoutWallet.getLockboxOpened,
+    selectors.components.onboarding.getWalletTourVisibility,
     selectors.auth.getFirstLogin,
     selectors.exchange.getCanTrade,
     selectors.router.getPathname,
     selectors.core.kvStore.lockbox.getDevices,
+    selectors.core.kvStore.whatsNew.getHasSkippedTour,
     selectors.core.settings.getCountryCode,
     selectors.core.walletOptions.getAdsBlacklist,
     selectors.core.walletOptions.getAdsUrl,
@@ -24,10 +26,12 @@ export const getData = createDeepEqualSelector(
     showThePitPulse,
     menuOpened,
     lockboxOpened,
+    walletTourVisibility,
     firstLogin,
     canTradeR,
     pathname,
     lockboxDevicesR,
+    hasSkippedTourR,
     countryCodeR,
     adsBlacklistR,
     adsUrlR,
@@ -45,6 +49,8 @@ export const getData = createDeepEqualSelector(
         adsUrl: adsUrlR.getOrElse(''),
         canTrade,
         countryCode,
+        hasRunWalletTour: walletTourVisibility,
+        hasSkippedTour: hasSkippedTourR.getOrElse(false),
         firstLogin,
         lockboxDevices,
         lockboxOpened,

packages/blockchain-wallet-v4/src/redux/kvStore/whatsNew/selectors.js

@@ -9,3 +9,6 @@ export const getState = state => getMetadata(state).map(prop('value'))
 
 export const getLastViewed = state =>
   getMetadata(state).map(path(['value', 'lastViewed']))
+
+export const getHasSkippedTour = state =>
+  getMetadata(state).map(path(['value', 'hasSkippedWalletTour']))