feat(intro-tour): changed modal to only show up when first time loggi…

…ng in, changed spotlight to cover the whole button, and removed unused images
blockchain · Aug 30, 2019 · 8930d2a · 8930d2a
1 parent bbd1fe3
commit 8930d2a
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 21 deletions.
diff --git a/packages/blockchain-info-components/src/Buttons/IconButton.js b/packages/blockchain-info-components/src/Buttons/IconButton.js
@@ -46,12 +46,12 @@ const selectColor = (nature, disabled) => {
 }
 
 const IconButton = props => {
-  const { name, children, nature, customClass, ...rest } = props
+  const { name, children, nature, ...rest } = props
   const color = selectColor(nature)
 
   return (
     <BaseIconButton {...rest}>
-      <Icon name={name} color={color} className={customClass} />
+      <Icon name={name} color={color} />
       {children}
     </BaseIconButton>
   )

diff --git a/packages/blockchain-info-components/src/Images/Images.js b/packages/blockchain-info-components/src/Images/Images.js
@@ -45,13 +45,11 @@ import halfBitcoin from './img/half-bitcoin.svg'
 import halfBitcoincash from './img/half-bitcoincash.svg'
 import halfEther from './img/half-ether.svg'
 import identityVerification from './img/identity-verification.svg'
-import introBank from './img/intro-bank.png'
 import introBankGif from './img/intro-bank.gif'
 import introCart from './img/intro-cart.png'
 import introCartGif from './img/intro-cart.gif'
 import introHand from './img/intro-hand.png'
 import introLock from './img/intro-lock.png'
-import introReceive from './img/intro-receive.png'
 import introReceiveGif from './img/intro-receive.gif'
 import introSend from './img/intro-send.png'
 import introSendGif from './img/intro-send.gif'
@@ -176,13 +174,11 @@ export default {
   'half-bitcoincash': halfBitcoincash,
   'half-ether': halfEther,
   'identity-verification': identityVerification,
-  'intro-bank': introBank,
   'intro-bank-gif': introBankGif,
   'intro-cart': introCart,
   'intro-cart-gif': introCartGif,
   'intro-hand': introHand,
   'intro-lock': introLock,
-  'intro-receive': introReceive,
   'intro-receive-gif': introReceiveGif,
   'intro-send': introSend,
   'intro-send-gif': introSendGif,

diff --git a/packages/blockchain-info-components/src/Images/img/intro-bank.png b/packages/blockchain-info-components/src/Images/img/intro-bank.png
diff --git a/packages/blockchain-info-components/src/Images/img/intro-receive.png b/packages/blockchain-info-components/src/Images/img/intro-receive.png
diff --git a/packages/blockchain-wallet-v4-frontend/src/data/auth/sagas.js b/packages/blockchain-wallet-v4-frontend/src/data/auth/sagas.js
@@ -149,7 +149,7 @@ export default ({ api, coreSagas }) => {
       yield put(actions.modules.settings.updateLanguage(language))
       yield put(actions.analytics.initUserSession())
       yield fork(transferEthSaga)
-      yield call(saveGoals, true) // Change this back to firstLogin after push
+      yield call(saveGoals, firstLogin)
       yield put(actions.goals.runGoals())
       yield fork(checkDataErrors)
       yield fork(logoutRoutine, yield call(setLogoutEventListener))

diff --git a/packages/blockchain-wallet-v4-frontend/src/layouts/Wallet/MenuLeft/Navigation/template.js b/packages/blockchain-wallet-v4-frontend/src/layouts/Wallet/MenuLeft/Navigation/template.js
@@ -85,13 +85,13 @@ const Navigation = props => {
           </Destination>
         </MenuItem>
       </LinkContainer>
-      <LinkContainer to='/buy-sell' activeClassName='active'>
+      <LinkContainer
+        to='/buy-sell'
+        activeClassName='active'
+        className='wallet-intro-tour-step-5'
+      >
         <MenuItem data-e2e='buyAndSellLink'>
-          <MenuIcon
-            className='wallet-intro-tour-step-5'
-            name='cart-filled'
-            size='24px'
-          />
+          <MenuIcon name='cart-filled' size='24px' />
           <Destination>
             <FormattedMessage
               id='layouts.wallet.menuleft.navigation.buysell'
@@ -101,13 +101,13 @@ const Navigation = props => {
           </Destination>
         </MenuItem>
       </LinkContainer>
-      <LinkContainer to='/swap' activeClassName='active'>
+      <LinkContainer
+        to='/swap'
+        activeClassName='active'
+        className='wallet-intro-tour-step-4'
+      >
         <MenuItem data-e2e='exchangeLink'>
-          <MenuIcon
-            className='wallet-intro-tour-step-4'
-            name='thick-arrow-switch'
-            size='24px'
-          />
+          <MenuIcon name='thick-arrow-switch' size='24px' />
           {/* SwapOrTradeTest */}
           <Destination>
             {swapOrTrade !== 'trade' ? (

diff --git a/packages/blockchain-wallet-v4-frontend/src/layouts/Wallet/MenuTop/Actions/template.js b/packages/blockchain-wallet-v4-frontend/src/layouts/Wallet/MenuTop/Actions/template.js
@@ -43,7 +43,7 @@ const Actions = ({ showModal, sendAvailable, requestAvailable }) => (
       min='100px'
       data-e2e='sendButton'
       height='48px'
-      customClass='wallet-intro-tour-step-3'
+      className='wallet-intro-tour-step-3'
     >
       <ButtonText size='16px' weight={600} color='brand-primary'>
         <FormattedMessage
@@ -60,7 +60,7 @@ const Actions = ({ showModal, sendAvailable, requestAvailable }) => (
       min='100px'
       data-e2e='requestButton'
       height='48px'
-      customClass='wallet-intro-tour-step-2'
+      className='wallet-intro-tour-step-2'
     >
       <ButtonText size='16px' weight={600} color='brand-primary'>
         <FormattedMessage