resolved merge conflicts

Author: jjBlockchain

packages/blockchain-info-components/src/Colors/DarkMode.js

@@ -48,6 +48,7 @@ export default {
   greyFade800: 'rgba(28,28,28,28.8)',
   greyFade200: 'rgba(28,28,28,28.1)',
   grey100: '#333333',
+  grey400: '#747474',
   grey600: '#797979',
   blue000: '#ECF5FE',
   blue100: '#D8EBFD',

packages/blockchain-info-components/src/Colors/Default.js

@@ -141,6 +141,7 @@ export default {
   greyFade200: 'rgba(5, 24, 61, 0.2)',
   grey000: '#F0F2F7',
   grey100: '#DFE3EB',
+  grey400: '#98A1B2',
   grey600: '#677185',
   grey800: '#353F52',
   blue000: '#ECF5FE',

packages/blockchain-wallet-v4-frontend/src/data/auth/sagas.js

@@ -109,7 +109,6 @@ export default ({ api, coreSagas }) => {
     )).getOrElse(false)
     if (userFlowSupported) yield put(actions.modules.profile.signIn())
   }
-
   const loginRoutineSaga = function * (mobileLogin, firstLogin) {
     try {
       // If needed, the user should upgrade its wallet before being able to open the wallet

packages/blockchain-wallet-v4-frontend/src/data/modules/profile/sagas.js

@@ -98,7 +98,6 @@ export default ({ api, coreSagas, networks }) => {
     try {
       yield delay(renewIn)
       yield call(setSession, userId, lifetimeToken, email, guid)
-      yield fork(syncUserWithWallet)
     } catch (e) {
       yield put(A.setApiTokenFailure(e))
       yield spawn(

packages/blockchain-wallet-v4-frontend/src/scenes/Home/index.js

@@ -56,7 +56,7 @@ const ColumnRight = styled(Column)`
   }
 `
 
-function Pulse ({ theme }) {
+const Pulse = ({ theme }) => {
   return keyframes`
     0% {
       box-shadow: 0 0 0 0 ${theme['deep-blue']};
@@ -82,8 +82,10 @@ const GlobalJoyrideStyles = createGlobalStyle`
     width: 16px !important;
     margin: 19px 0 0 19px;
   }
+
   .__floater__open {
-    transition: opacity 0.6s ease-in-out, transform 0.6s ease-in-out !important
+    transition: none !important;
+    filter: none !important;
   }
 `
 

packages/blockchain-wallet-v4-frontend/src/scenes/Home/model.js

@@ -2,21 +2,35 @@ import { bindActionCreators } from 'redux'
 import { connect } from 'react-redux'
 import React, { useEffect } from 'react'
 import { FormattedMessage } from 'react-intl'
-import styled from 'styled-components'
+import styled, { keyframes } from 'styled-components'
 
 import { Button, Icon, Image, Text } from 'blockchain-info-components'
 import { actions, model } from 'data'
 
 const { GENERAL_EVENTS } = model.analytics
 
+const Scale = () => {
+  return keyframes`
+    0% {
+      opacity: 0;
+      transform: scale(0);
+    }
+    100% {
+      transform: scale(1);
+      opacity: 1;
+    }
+  `
+}
+
 const TooltipBody = styled.div`
   position: relative;
   width: 100%;
   max-width: 256px;
   background-color: ${props => props.theme['white']};
   border-radius: 8px;
-  box-shadow: 0 0 15px ${({ theme }) => theme['gray-3']};
+  box-shadow: 0 4px 32px rgba(5, 24, 61, 0.4);
   padding: 32px;
+  animation: ${Scale} 0.3s ease-in-out;
 
   > span:first-child {
     position: absolute;
@@ -58,6 +72,16 @@ const StepContent = styled(Text)`
   line-height: 24px;
 `
 
+const CloseTourIcon = styled(Icon)`
+  &:hover {
+    color: ${({ theme }) => theme['grey600']};
+  }
+
+  &:active {
+    color: ${({ theme }) => theme['grey800']};
+  }
+`
+
 const TourTooltipComponent = ({
   analyticsActions,
   index,
@@ -90,8 +114,8 @@ const TourTooltipComponent = ({
 
   return (
     <TooltipBody {...tooltipProps}>
-      <Icon
-        color='grey-600'
+      <CloseTourIcon
+        color='grey400'
         name='close'
         size='16px'
         weight={600}