feat(swap-2.x): feature flag

packages/blockchain-wallet-v4-frontend/src/components/IdentityVerification/TierCard/index.tsx

@@ -9,7 +9,6 @@ import { formatFiat } from 'core/exchange/currency'
 import { FormattedMessage } from 'react-intl'
 import { getData } from './selectors'
 import { TIERS } from './model'
-import { UserDataType, UserTiersType } from 'data/types'
 import media from 'services/ResponsiveService'
 import React from 'react'
 import styled from 'styled-components'
@@ -108,13 +107,13 @@ const { TIERS_STATES } = model.profile
 export const TierCard = ({
   column,
   emailVerified,
-  goToSwap,
   mobileVerified,
   tier,
   userData,
   userTiers,
   identityVerificationActions,
-  simpleBuyActions
+  simpleBuyActions,
+  swapActions
 }: Props) => {
   const tierData = userTiers.find(userTier => userTier.index === tier)
   if (!tierData) return null
@@ -224,7 +223,7 @@ export const TierCard = ({
               jumbo
               fullwidth
               nature='primary'
-              onClick={goToSwap}
+              onClick={() => swapActions.showModal('SettingsProfile')}
               data-e2e='swapNowBtn'
             >
               <FormattedMessage
@@ -257,19 +256,17 @@ const mapDispatchToProps = dispatch => ({
     actions.components.identityVerification,
     dispatch
   ),
-  goToSwap: () => dispatch(actions.router.push('/swap')),
+  swapActions: bindActionCreators(actions.components.swap, dispatch),
   simpleBuyActions: bindActionCreators(actions.components.simpleBuy, dispatch)
 })
 
 const connector = connect(getData, mapDispatchToProps)
 
 type OwnProps = {
   column: boolean
-  emailVerified: boolean
-  mobileVerified: boolean
+  emailVerified?: boolean
+  mobileVerified?: boolean
   tier: 1 | 2
-  userData: UserDataType
-  userTiers: UserTiersType
 }
 type Props = OwnProps & ConnectedProps<typeof connector>
 

packages/blockchain-wallet-v4-frontend/src/components/IdentityVerification/TierCard/selectors.js → packages/blockchain-wallet-v4-frontend/src/components/IdentityVerification/TierCard/selectors.ts

@@ -1,8 +1,14 @@
 import { selectors } from 'data'
+import { UserDataType, UserTierType } from 'data/types'
 
 export const getData = state => {
-  const userData = selectors.modules.profile.getUserData(state).getOrElse(null)
-  const userTiers = selectors.modules.profile.getTiers(state).getOrElse(null)
+  const userData = selectors.modules.profile
+    .getUserData(state)
+    .getOrElse({} as UserDataType)
+  // @ts-ignore
+  const userTiers = selectors.modules.profile
+    .getTiers(state)
+    .getOrElse({} as UserTierType)
   const emailVerified = selectors.core.settings
     .getEmailVerified(state)
     .getOrElse(false)

packages/blockchain-wallet-v4-frontend/src/data/components/actionTypes.ts

@@ -13,7 +13,6 @@ import * as layoutWallet from './layoutWallet/actionTypes'
 import * as lockbox from './lockbox/actionTypes'
 import * as manageAddresses from './manageAddresses/actionTypes'
 import * as onboarding from './onboarding/actionTypes'
-import * as onfido from './onfido/actionTypes'
 import * as priceChart from './priceChart/actionTypes'
 import * as priceTicker from './priceTicker/actionTypes'
 import * as recoveryPhrase from './recoveryPhrase/actionTypes'
@@ -54,7 +53,6 @@ export {
   lockbox,
   manageAddresses,
   onboarding,
-  onfido,
   priceChart,
   priceTicker,
   recoveryPhrase,

packages/blockchain-wallet-v4-frontend/src/data/components/actions.ts

@@ -13,7 +13,6 @@ import * as layoutWallet from './layoutWallet/actions'
 import * as lockbox from './lockbox/actions'
 import * as manageAddresses from './manageAddresses/actions'
 import * as onboarding from './onboarding/actions'
-import * as onfido from './onfido/actions'
 import * as priceChart from './priceChart/actions'
 import * as priceTicker from './priceTicker/actions'
 import * as recoveryPhrase from './recoveryPhrase/actions'
@@ -52,7 +51,6 @@ export {
   interest,
   manageAddresses,
   onboarding,
-  onfido,
   layoutWallet,
   lockbox,
   priceChart,

packages/blockchain-wallet-v4-frontend/src/data/components/reducers.ts

@@ -17,7 +17,6 @@ import { withdrawReducer } from './withdraw/reducers'
 import layoutWallet from './layoutWallet/reducers'
 import lockbox from './lockbox/reducers'
 import manageAddresses from './manageAddresses/reducers'
-import onfido from './onfido/reducers'
 import signMessage from './signMessage/reducers'
 import uploadDocuments from './uploadDocuments/reducers'
 import veriff from './veriff/reducers'
@@ -31,7 +30,6 @@ const componentReducer = combineReducers({
   layoutWallet,
   lockbox,
   manageAddresses,
-  onfido,
   priceChart: priceChartReducer,
   recoveryPhrase: recoveryPhraseReducer,
   send: sendReducer,

packages/blockchain-wallet-v4-frontend/src/data/components/sagaRegister.ts

@@ -12,7 +12,6 @@ import importBtcAddress from './importBtcAddress/sagaRegister'
 import interest from './interest/sagaRegister'
 import lockbox from './lockbox/sagaRegister'
 import manageAddresses from './manageAddresses/sagaRegister'
-import onfido from './onfido/sagaRegister'
 import priceChart from './priceChart/sagaRegister'
 import priceTicker from './priceTicker/sagaRegister'
 import refresh from './refresh/sagaRegister'
@@ -50,7 +49,6 @@ export default ({ api, coreSagas, networks }) =>
     yield fork(lockbox({ api, coreSagas }))
     yield fork(importBtcAddress({ api, coreSagas, networks }))
     yield fork(manageAddresses({ api, networks }))
-    yield fork(onfido({ api, coreSagas }))
     yield fork(priceChart())
     yield fork(priceTicker({ coreSagas }))
     yield fork(refresh())

packages/blockchain-wallet-v4-frontend/src/data/components/sagas.ts

@@ -10,7 +10,6 @@ import identityVerification from './identityVerification/sagas'
 import importBtcAddress from './importBtcAddress/sagas'
 import interest from './interest/sagas'
 import manageAddresses from './manageAddresses/sagas'
-import onfido from './onfido/sagas'
 import priceChart from './priceChart/sagas'
 import priceTicker from './priceTicker/sagas'
 import refresh from './refresh/sagas'
@@ -46,7 +45,6 @@ export default ({ api, coreSagas, networks }) => ({
   interest: interest({ api, coreSagas, networks }),
   importBtcAddress: importBtcAddress({ api, coreSagas, networks }),
   manageAddresses: manageAddresses({ api, networks }),
-  onfido: onfido({ api }),
   priceChart: priceChart(),
   priceTicker: priceTicker({ coreSagas }),
   refresh: refresh(),

packages/blockchain-wallet-v4-frontend/src/data/components/selectors.ts

@@ -6,7 +6,6 @@ import * as interest from './interest/selectors'
 import * as layoutWallet from './layoutWallet/selectors'
 import * as lockbox from './lockbox/selectors'
 import * as manageAddresses from './manageAddresses/selectors'
-import * as onfido from './onfido/selectors'
 import * as priceChart from './priceChart/selectors'
 import * as priceTicker from './priceTicker/selectors'
 import * as recoveryPhrase from './recoveryPhrase/selectors'
@@ -32,7 +31,6 @@ export {
   layoutWallet,
   lockbox,
   manageAddresses,
-  onfido,
   priceChart,
   priceTicker,
   recoveryPhrase,

packages/blockchain-wallet-v4-frontend/src/data/components/swap/sagas.ts

@@ -27,7 +27,10 @@ import { MempoolFeeType } from '../exchange/types'
 import { selectReceiveAddress } from '../utils/sagas'
 import BigNumber from 'bignumber.js'
 
-import { INVALID_COIN_TYPE } from 'blockchain-wallet-v4/src/model'
+import {
+  DEFAULT_INVITATIONS,
+  INVALID_COIN_TYPE
+} from 'blockchain-wallet-v4/src/model'
 import profileSagas from '../../../data/modules/profile/sagas'
 import sendSagas from '../send/sagas'
 
@@ -332,6 +335,12 @@ export default ({
   }
 
   const showModal = function * ({ payload }: ReturnType<typeof A.showModal>) {
+    const invitations = selectors.core.settings
+      .getInvitations(yield select())
+      .getOrElse(DEFAULT_INVITATIONS)
+
+    if (!invitations.swap2dot0) return yield put(actions.router.push('/swap'))
+
     const { origin, baseCurrency, counterCurrency } = payload
     yield put(
       actions.modals.showModal('SWAP_MODAL', {

packages/blockchain-wallet-v4-frontend/src/data/modals/types.ts

@@ -27,7 +27,6 @@ export type ModalNamesType =
   | 'KycDocResubmit'
   | 'LinkFromExchangeAccount'
   | 'LinkToExchangeAccount'
-  | 'Onfido'
   | 'PairingCode'
   | 'RECOVERY_PHRASE_MODAL'
   | 'ShowBtcPrivateKey'