Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(analytics): swap remainder events #2696

Merged
merged 20 commits into from
Sep 25, 2023
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
8d47fc2
feat(analytics): swap remainder events
banklesss Sep 20, 2023
0672b38
CR: update
banklesss Sep 20, 2023
65dd990
CR: update
banklesss Sep 22, 2023
1e74c91
merge base branch
banklesss Sep 22, 2023
cd009a4
Merge branch 'feat/swap-cancel' into feat/swap-remainder-events
banklesss Sep 22, 2023
2aa0a9f
Update apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/…
stackchain Sep 23, 2023
062a465
Update apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/…
stackchain Sep 23, 2023
98ff10b
Update apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/…
stackchain Sep 23, 2023
5f2aed6
Update apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/…
stackchain Sep 23, 2023
0b69614
Update apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/…
stackchain Sep 23, 2023
fffe681
Update apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/…
stackchain Sep 23, 2023
5d1df22
Update apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/…
stackchain Sep 23, 2023
5ec2a45
Update apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/…
stackchain Sep 23, 2023
d65d800
CR: update
banklesss Sep 23, 2023
bc52f6d
CR: update
banklesss Sep 23, 2023
e8317d5
CR: update
banklesss Sep 23, 2023
b62e2d4
Update apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/…
stackchain Sep 24, 2023
609745a
Update apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/…
stackchain Sep 24, 2023
8be7a4d
Merge branch 'feat/swap-cancel' into feat/swap-remainder-events
stackchain Sep 24, 2023
50fdc3b
CR:update
banklesss Sep 25, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions apps/wallet-mobile/src/features/Swap/SwapNavigator.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import {ListOrders} from './useCases/StartSwapScreen/ListOrders/ListOrders'
const Tab = createMaterialTopTabNavigator<SwapTabRoutes>()
export const SwapTabNavigator = () => {
const strings = useStrings()

useHideBottomTabBar()

return (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@ import {SafeAreaView} from 'react-native-safe-area-context'

import {BottomSheet, BottomSheetRef, Button, Spacer} from '../../../../components'
import {LoadingOverlay} from '../../../../components/LoadingOverlay'
import {useMetrics} from '../../../../metrics/metricsManager'
import {useWalletNavigation} from '../../../../navigation'
import {useSelectedWallet} from '../../../../SelectedWallet'
import {COLORS} from '../../../../theme'
import {useAuthOsWithEasyConfirmation} from '../../../../yoroi-wallets/auth'
import {useSignAndSubmitTx} from '../../../../yoroi-wallets/hooks'
import {useSignAndSubmitTx, useTokenInfo} from '../../../../yoroi-wallets/hooks'
import {useNavigateTo} from '../../common/navigation'
import {useStrings} from '../../common/strings'
import {ConfirmTx} from './ConfirmTx'
Expand All @@ -29,11 +30,21 @@ export const ConfirmTxScreen = () => {
const strings = useStrings()
const wallet = useSelectedWallet()
const navigate = useNavigateTo()
const {track} = useMetrics()

const {unsignedTx, createOrder} = useSwap()

const {resetToTxHistory} = useWalletNavigation()

const sellTokenInfo = useTokenInfo({
wallet,
tokenId: createOrder.amounts.sell.tokenId,
})
const buyTokenInfo = useTokenInfo({
wallet,
tokenId: createOrder.amounts.buy.tokenId,
})

const {authWithOs, isLoading: authenticating} = useAuthOsWithEasyConfirmation(
{id: wallet.id},
{onSuccess: (rootKey) => signAndSubmitTx({unsignedTx, rootKey})},
Expand All @@ -45,6 +56,21 @@ export const ConfirmTxScreen = () => {
signTx: {useErrorBoundary: true},
submitTx: {
onSuccess: () => {
track.swapOrderSubmitted({
from_asset: [
{asset_name: sellTokenInfo.name, asset_ticker: sellTokenInfo.ticker, policy_id: sellTokenInfo.group},
],
to_asset: [
{asset_name: buyTokenInfo.name, asset_ticker: buyTokenInfo.ticker, policy_id: buyTokenInfo.group},
],
order_type: createOrder.type,
slippage_tolerance: createOrder.slippage,
from_amount: createOrder.amounts.sell.quantity,
to_amount: createOrder.amounts.buy.quantity,
pool_source: createOrder.selectedPool.provider,
swap_fees: Number(createOrder.selectedPool.fee),
})

navigate.startSwap()
},
useErrorBoundary: true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {LoadingOverlay} from '../../../../../components/LoadingOverlay'
import {useMetrics} from '../../../../../metrics/metricsManager'
import {useSelectedWallet} from '../../../../../SelectedWallet'
import {COLORS} from '../../../../../theme'
import {useTokenInfos} from '../../../../../yoroi-wallets/hooks'
import {useTokenInfo} from '../../../../../yoroi-wallets/hooks'
import {Quantities} from '../../../../../yoroi-wallets/utils'
import {createYoroiEntry} from '../../../common/helpers'
import {useNavigateTo} from '../../../common/navigation'
Expand All @@ -35,9 +35,13 @@ export const CreateOrder = () => {
const wallet = useSelectedWallet()
const {track} = useMetrics()

const tokenInfos = useTokenInfos({
const sellTokenInfo = useTokenInfo({
wallet,
tokenIds: [createOrder.amounts.buy.tokenId, createOrder.amounts.sell.tokenId],
tokenId: createOrder.amounts.sell.tokenId,
})
const buyTokenInfo = useTokenInfo({
wallet,
tokenId: createOrder.amounts.buy.tokenId,
})
const [showLimitPriceWarning, setShowLimitPriceWarning] = useState(false)
const {isBuyTouched, isSellTouched, poolDefaulted} = useSwapTouched()
Expand Down Expand Up @@ -87,9 +91,6 @@ export const CreateOrder = () => {
(createOrder.type === 'limit' && createOrder.limitPrice !== undefined && Quantities.isZero(createOrder.limitPrice))

const swap = () => {
const sellTokenInfo = tokenInfos.filter((tokenInfo) => tokenInfo.id === createOrder.amounts.sell.tokenId)[0]
const buyTokenInfo = tokenInfos.filter((tokenInfo) => tokenInfo.id === createOrder.amounts.buy.tokenId)[0]

track.swapOrderSelected({
from_asset: [
{asset_name: sellTokenInfo.name, asset_ticker: sellTokenInfo.ticker, policy_id: sellTokenInfo.group},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import {useFocusEffect} from '@react-navigation/native'
import {useSwapOrdersByStatusCompleted} from '@yoroi/swap'
import _ from 'lodash'
import React from 'react'
Expand All @@ -15,6 +16,7 @@ import {
TokenIcon,
} from '../../../../../components'
import {useLanguage} from '../../../../../i18n'
import {useMetrics} from '../../../../../metrics/metricsManager'
import {useSearch} from '../../../../../Search/SearchContext'
import {useSelectedWallet} from '../../../../../SelectedWallet'
import {COLORS} from '../../../../../theme'
Expand All @@ -35,6 +37,14 @@ export const CompletedOrders = () => {

const orders = useSwapOrdersByStatusCompleted()

const {track} = useMetrics()

useFocusEffect(
React.useCallback(() => {
track.swapConfirmedPageViewed({swap_tab: 'Completed Orders'})
}, [track]),
)

const tokenIds = React.useMemo(() => _.uniq(orders.flatMap((o) => [o.from.tokenId, o.to.tokenId])), [orders])
const tokenInfos = useTokenInfos({wallet, tokenIds})
const normalizedOrders = React.useMemo(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import {PrivateKey} from '@emurgo/csl-mobile-bridge'
import {useFocusEffect} from '@react-navigation/native'
import {useSwap, useSwapOrdersByStatusOpen} from '@yoroi/swap'
import {BalanceQuantity} from '@yoroi/types/src/balance/token'
import {Buffer} from 'buffer'
Expand All @@ -24,6 +25,7 @@ import {
TokenIcon,
} from '../../../../../components'
import {useLanguage} from '../../../../../i18n'
import {useMetrics} from '../../../../../metrics/metricsManager'
import {useSearch} from '../../../../../Search/SearchContext'
import {useSelectedWallet} from '../../../../../SelectedWallet'
import {COLORS} from '../../../../../theme'
Expand Down Expand Up @@ -75,12 +77,40 @@ export const OpenOrders = () => {
[normalizedOrders, search],
)

const {track} = useMetrics()

useFocusEffect(
React.useCallback(() => {
track.swapConfirmedPageViewed({swap_tab: 'Open Orders'})
}, [track]),
)

const handlePasswordConfirm = async (password: string) => {
const order = normalizedOrders.find((o) => o.id === orderId)
if (!order || order.owner === undefined || order.utxo === undefined) return
const tx = await createCancellationTxAnsSign(order.id, password)
if (!tx) return
await wallet.submitTransaction(tx.txBase64)

track.swapCancelationSubmitted({
from_amount: Number(order?.from.quantity) ?? 0,
to_amount: Number(order?.to.quantity) ?? 0,
from_asset: [
{
asset_name: order?.fromTokenInfo?.name,
asset_ticker: order?.fromTokenInfo?.ticker,
policy_id: order?.fromTokenInfo?.group,
},
],
to_asset: [
{
asset_name: order?.toTokenInfo?.name,
asset_ticker: order?.toTokenInfo?.ticker,
policy_id: order?.toTokenInfo?.group,
},
],
pool_source: order?.provider ?? '',
})
closeBottomSheet()
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
import {isString} from '@yoroi/common'
import {getPoolUrlByProvider} from '@yoroi/swap'
import {Balance} from '@yoroi/types'
import {BalanceAmount, BalanceCardanoMetadatas} from '@yoroi/types/lib/balance/token'
stackchain marked this conversation as resolved.
Show resolved Hide resolved
import {SwapCompletedOrder, SwapOpenOrder} from '@yoroi/types/lib/swap/order'
stackchain marked this conversation as resolved.
Show resolved Hide resolved
import {SwapPoolProvider} from '@yoroi/types/lib/swap/pool'
import {BalanceTokenInfo} from '@yoroi/types/src/balance/token'
stackchain marked this conversation as resolved.
Show resolved Hide resolved
import {isString} from '@yoroi/wallets'
import BigNumber from 'bignumber.js'

import {NumberLocale} from '../../../../../i18n/languages'
Expand All @@ -10,15 +14,36 @@ import {Quantities} from '../../../../../yoroi-wallets/utils'

const MAX_DECIMALS = 10

export type MappedOrder = {
owner: unknown
utxo: string | undefined
tokenPrice: string
tokenAmount: string
id: string
assetFromLabel: string
assetToLabel: string
date: string
txId: string
total: string
txLink: string
toTokenInfo: BalanceTokenInfo<BalanceCardanoMetadatas> | undefined
stackchain marked this conversation as resolved.
Show resolved Hide resolved
provider: SwapPoolProvider | undefined
stackchain marked this conversation as resolved.
Show resolved Hide resolved
poolUrl: string | undefined
fromTokenInfo: BalanceTokenInfo<BalanceCardanoMetadatas> | undefined
stackchain marked this conversation as resolved.
Show resolved Hide resolved
fromTokenAmount: string
from: BalanceAmount
stackchain marked this conversation as resolved.
Show resolved Hide resolved
to: BalanceAmount
stackchain marked this conversation as resolved.
Show resolved Hide resolved
}

export const mapOrders = (
orders: Array<SwapOpenOrder | SwapCompletedOrder>,
stackchain marked this conversation as resolved.
Show resolved Hide resolved
tokenInfos: Balance.TokenInfo[],
numberLocale: NumberLocale,
transactionInfos: TransactionInfo[],
) => {
): Array<MappedOrder> => {
if (orders.length === 0) return []

return orders.map((order) => {
return orders.map((order: SwapOpenOrder | SwapCompletedOrder) => {
stackchain marked this conversation as resolved.
Show resolved Hide resolved
const {from, to} = order
const [txIdOpen] = 'utxo' in order ? order.utxo.split('#', 1) : [undefined]
const txIdComplete = 'txHash' in order ? order.txHash : undefined
Expand Down Expand Up @@ -69,6 +94,8 @@ export const mapOrders = (
fromTokenAmount: BigNumber(Quantities.denominated(order.from.quantity, fromTokenInfo?.decimals ?? 0)).toFormat(
numberLocale,
),
from,
to,
}
})
}
Loading