Skip to content

Commit

Permalink
fix(analytics): adding correct types for swap
Browse files Browse the repository at this point in the history
  • Loading branch information
@pedroapfilho
pedroapfilho committed Jun 8, 2021
1 parent 867e51e commit 034d3ec
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 25 deletions.
49 changes: 25 additions & 24 deletions packages/blockchain-wallet-v4-frontend/src/middleware/analyticsMiddleware/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ import {
AnalyticsType,
CoinType,
DepositMethodType,
OrderType
OrderType,
SendReceiveType
} from 'middleware/analyticsMiddleware/types'
import {
getNetworkFee,
Expand All @@ -17,7 +18,7 @@ import {

import { actionTypes as AT } from 'data'
import { convertBaseToStandard } from 'data/components/exchange/services'
import { BankDWStepType, ModalNamesType } from 'data/types'
import { BankDWStepType, ModalNamesType, SwapBaseCounterTypes } from 'data/types'

const analyticsMiddleware = () => (store) => (next) => (action) => {
try {
Expand Down Expand Up @@ -140,15 +141,15 @@ const analyticsMiddleware = () => (store) => (next) => (action) => {
nabuId,
origin: 'NAVIGATION',
originalTimestamp: getOriginalTimestamp(),
type: 'RECEIVE'
type: SendReceiveType.RECEIVE
})

analytics.push(AnalyticsKey.SEND_RECEIVE_VIEWED, {
analyticsType: AnalyticsType.EVENT,
id,
nabuId,
originalTimestamp: getOriginalTimestamp(),
type: 'RECEIVE'
type: SendReceiveType.RECEIVE
})

break
Expand Down Expand Up @@ -362,12 +363,12 @@ const analyticsMiddleware = () => (store) => (next) => (action) => {
case 'ENTER_AMOUNT': {
const inputCurrency = state.form.initSwap.values.BASE.coin
const inputType =
state.form.initSwap.values.BASE.type === 'CUSTODIAL' // TODO add SwapBaseCounterTypes to it
state.form.initSwap.values.BASE.type === SwapBaseCounterTypes.CUSTODIAL // TODO add SwapBaseCounterTypes to it
? AccountType.TRADING
: AccountType.USERKEY
const outputCurrency = state.form.initSwap.values.COUNTER.coin
const outputType =
state.form.initSwap.values.COUNTER.type === 'CUSTODIAL' // TODO add SwapBaseCounterTypes to it
state.form.initSwap.values.COUNTER.type === SwapBaseCounterTypes.CUSTODIAL // TODO add SwapBaseCounterTypes to it
? AccountType.TRADING
: AccountType.USERKEY

Expand All @@ -389,13 +390,13 @@ const analyticsMiddleware = () => (store) => (next) => (action) => {
const inputAmount = Number(state.form.swapAmount.values.cryptoAmount)
const inputCurrency = state.form.initSwap.values.BASE.coin
const inputType =
state.form.initSwap.values.BASE.type === 'CUSTODIAL' // TODO add SwapBaseCounterTypes to it
state.form.initSwap.values.BASE.type === SwapBaseCounterTypes.CUSTODIAL // TODO add SwapBaseCounterTypes to it
? AccountType.TRADING
: AccountType.USERKEY
const outputAmount = inputAmount * exchangeRate
const outputCurrency = state.form.initSwap.values.COUNTER.coin
const outputType =
state.form.initSwap.values.COUNTER.type === 'CUSTODIAL' // TODO add SwapBaseCounterTypes to it
state.form.initSwap.values.COUNTER.type === SwapBaseCounterTypes.CUSTODIAL // TODO add SwapBaseCounterTypes to it
? AccountType.TRADING
: AccountType.USERKEY

Expand Down Expand Up @@ -426,12 +427,12 @@ const analyticsMiddleware = () => (store) => (next) => (action) => {
const id = state.walletPath.wallet.guid
const inputCurrency = state.form.initSwap.values.BASE.coin
const inputType =
state.form.initSwap.values.BASE.type === 'CUSTODIAL' // TODO add SwapBaseCounterTypes to it
state.form.initSwap.values.BASE.type === SwapBaseCounterTypes.CUSTODIAL // TODO add SwapBaseCounterTypes to it
? AccountType.TRADING
: AccountType.USERKEY
const outputCurrency = state.form.initSwap.values.COUNTER.coin
const outputType =
state.form.initSwap.values.COUNTER.type === 'CUSTODIAL' // TODO add SwapBaseCounterTypes to it
state.form.initSwap.values.COUNTER.type === SwapBaseCounterTypes.CUSTODIAL // TODO add SwapBaseCounterTypes to it
? AccountType.TRADING
: AccountType.USERKEY

Expand All @@ -454,12 +455,12 @@ const analyticsMiddleware = () => (store) => (next) => (action) => {
const id = state.walletPath.wallet.guid
const inputCurrency = state.form.initSwap.values.BASE.coin
const inputType =
state.form.initSwap.values.BASE.type === 'CUSTODIAL' // TODO add SwapBaseCounterTypes to it
state.form.initSwap.values.BASE.type === SwapBaseCounterTypes.CUSTODIAL // TODO add SwapBaseCounterTypes to it
? AccountType.TRADING
: AccountType.USERKEY
const outputCurrency = state.form.initSwap.values.COUNTER.coin
const outputType =
state.form.initSwap.values.COUNTER.type === 'CUSTODIAL' // TODO add SwapBaseCounterTypes to it
state.form.initSwap.values.COUNTER.type === SwapBaseCounterTypes.CUSTODIAL // TODO add SwapBaseCounterTypes to it
? AccountType.TRADING
: AccountType.USERKEY

Expand All @@ -481,7 +482,7 @@ const analyticsMiddleware = () => (store) => (next) => (action) => {
const id = state.walletPath.wallet.guid
const inputCurrency = action.payload.account.coin
const inputType =
action.payload.account.type === 'CUSTODIAL' // TODO add SwapBaseCounterTypes to it
action.payload.account.type === SwapBaseCounterTypes.CUSTODIAL // TODO add SwapBaseCounterTypes to it
? AccountType.TRADING
: AccountType.USERKEY

Expand All @@ -501,7 +502,7 @@ const analyticsMiddleware = () => (store) => (next) => (action) => {
const id = state.walletPath.wallet.guid
const inputCurrency = action.payload.account.coin
const inputType =
action.payload.account.type === 'CUSTODIAL' // TODO add SwapBaseCounterTypes to it
action.payload.account.type === SwapBaseCounterTypes.CUSTODIAL // TODO add SwapBaseCounterTypes to it
? AccountType.TRADING
: AccountType.USERKEY

Expand All @@ -523,17 +524,17 @@ const analyticsMiddleware = () => (store) => (next) => (action) => {
const inputAmount = Number(state.form.swapAmount.values.cryptoAmount)
const inputCurrency = state.form.initSwap.values.BASE.coin
const inputType =
state.form.initSwap.values.BASE.type === 'CUSTODIAL' // TODO add SwapBaseCounterTypes to it
state.form.initSwap.values.BASE.type === SwapBaseCounterTypes.CUSTODIAL // TODO add SwapBaseCounterTypes to it
? AccountType.TRADING
: AccountType.USERKEY
const outputAmount = inputAmount * exchangeRate
const outputCurrency = state.form.initSwap.values.COUNTER.coin
const outputType =
state.form.initSwap.values.COUNTER.type === 'CUSTODIAL' // TODO add SwapBaseCounterTypes to it
state.form.initSwap.values.COUNTER.type === SwapBaseCounterTypes.CUSTODIAL // TODO add SwapBaseCounterTypes to it
? AccountType.TRADING
: AccountType.USERKEY
const networkFeeInputAmount =
state.form.initSwap.values.BASE.type === 'CUSTODIAL' // TODO add SwapBaseCounterTypes to it
state.form.initSwap.values.BASE.type === SwapBaseCounterTypes.CUSTODIAL // TODO add SwapBaseCounterTypes to it
? 0
: Number(
convertBaseToStandard(
Expand All @@ -542,7 +543,7 @@ const analyticsMiddleware = () => (store) => (next) => (action) => {
)
)
const networkFeeOutputAmount =
state.form.initSwap.values.COUNTER.type === 'CUSTODIAL' // TODO add SwapBaseCounterTypes to it
state.form.initSwap.values.COUNTER.type === SwapBaseCounterTypes.CUSTODIAL // TODO add SwapBaseCounterTypes to it
? 0
: state.components.swap.quote.getOrElse({})?.quote.networkFee || 0

Expand Down Expand Up @@ -572,7 +573,7 @@ const analyticsMiddleware = () => (store) => (next) => (action) => {
const nabuId = state.profile.userData.getOrElse({})?.id
const id = state.walletPath.wallet.guid
const accountType =
state.form.requestCrypto.values.selectedAccount.type === 'CUSTODIAL' // TODO add SwapBaseCounterTypes to it
state.form.requestCrypto.values.selectedAccount.type === SwapBaseCounterTypes.CUSTODIAL // TODO add SwapBaseCounterTypes to it
? AccountType.TRADING
: AccountType.USERKEY
const currency = state.form.requestCrypto.values.selectedAccount.coin
Expand All @@ -593,7 +594,7 @@ const analyticsMiddleware = () => (store) => (next) => (action) => {
const nabuId = state.profile.userData.getOrElse({})?.id
const id = state.walletPath.wallet.guid
const accountType =
state.form.requestCrypto.values.selectedAccount.type === 'CUSTODIAL' // TODO add SwapBaseCounterTypes to it
state.form.requestCrypto.values.selectedAccount.type === SwapBaseCounterTypes.CUSTODIAL // TODO add SwapBaseCounterTypes to it
? AccountType.TRADING
: AccountType.USERKEY
const currency = state.form.requestCrypto.values.selectedAccount.coin
Expand Down Expand Up @@ -690,7 +691,7 @@ const analyticsMiddleware = () => (store) => (next) => (action) => {
}

const accountType =
action.payload.swapAccount.type === 'CUSTODIAL' // TODO add SwapBaseCounterTypes to it
action.payload.swapAccount.type === SwapBaseCounterTypes.CUSTODIAL // TODO add SwapBaseCounterTypes to it
? AccountType.TRADING
: AccountType.USERKEY
const inputCurrency = state.components.simpleBuy.fiatCurrency
Expand All @@ -709,7 +710,7 @@ const analyticsMiddleware = () => (store) => (next) => (action) => {

case 'PREVIEW_SELL': {
const accountType =
state.components.simpleBuy.swapAccount.type === 'CUSTODIAL' // TODO add SwapBaseCounterTypes to it
state.components.simpleBuy.swapAccount.type === SwapBaseCounterTypes.CUSTODIAL // TODO add SwapBaseCounterTypes to it
? AccountType.TRADING
: AccountType.USERKEY
const inputCurrency = state.components.simpleBuy.fiatCurrency
Expand Down Expand Up @@ -739,7 +740,7 @@ const analyticsMiddleware = () => (store) => (next) => (action) => {
const nabuId = state.profile.userData.getOrElse({})?.id
const id = state.walletPath.wallet.guid
const accountType =
state.components.simpleBuy.swapAccount.type === 'CUSTODIAL' // TODO add SwapBaseCounterTypes to it
state.components.simpleBuy.swapAccount.type === SwapBaseCounterTypes.CUSTODIAL // TODO add SwapBaseCounterTypes to it
? AccountType.TRADING
: AccountType.USERKEY
const inputCurrency = state.components.simpleBuy.fiatCurrency
Expand All @@ -761,7 +762,7 @@ const analyticsMiddleware = () => (store) => (next) => (action) => {
const nabuId = state.profile.userData.getOrElse({})?.id
const id = state.walletPath.wallet.guid
const accountType =
state.components.simpleBuy.swapAccount.type === 'CUSTODIAL' // TODO add SwapBaseCounterTypes to it
state.components.simpleBuy.swapAccount.type === SwapBaseCounterTypes.CUSTODIAL // TODO add SwapBaseCounterTypes to it
? AccountType.TRADING
: AccountType.USERKEY
const inputCurrency = state.components.simpleBuy.fiatCurrency
Expand Down
8 changes: 7 additions & 1 deletion packages/blockchain-wallet-v4-frontend/src/middleware/analyticsMiddleware/types.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,11 @@ enum DepositMethodType {
BANK_TRANSFER = 'BANK_TRANSFER'
}

enum SendReceiveType {
RECEIVE = 'RECEIVE',
SEND = 'SEND'
}

type BasePayload = {
analyticsType: AnalyticsType
id: string
Expand Down Expand Up @@ -357,5 +362,6 @@ export {
DepositMethodType,
FeeRateType,
OrderType,
PaymentType
PaymentType,
SendReceiveType
}

0 comments on commit 034d3ec

Please sign in to comment.