Merge pull request #169 from oasisprotocol/ml/wrap/fix-analytics-events-values

move: Send tracking event values in cent amount

Author: lubej

move/src/useDeposit.ts

@@ -3,9 +3,15 @@ import { useAccount, useBalance } from 'wagmi'
 import { depositToSapphireStep1, depositToSapphireStep2 } from './deposit/depositToSapphire'
 import { ConsensusAccount, useGenerateConsensusAccount } from './deposit/useGenerateConsensusAccount'
 import { usePrevious } from './hooks/usePrevious.ts'
-import { getSapphireBalance, waitForConsensusBalance, waitForSapphireBalance } from './utils/getBalances'
+import {
+  fromBaseUnitsToTrackEventCents,
+  getSapphireBalance,
+  waitForConsensusBalance,
+  waitForSapphireBalance,
+} from './utils/getBalances'
 import { useBlockNavigatingAway } from './utils/useBlockNavigatingAway'
 import { trackEvent } from 'fathom-client'
+import { consensusConfig } from './utils/oasisConfig.ts'
 
 /** any consensus -> generatedConsensusAccount -> sapphireAddress */
 export function useDeposit() {
@@ -36,7 +42,7 @@ export function useDeposit() {
       const amountToDeposit = await waitForConsensusBalance(consensusAccount.address, 0n)
 
       trackEvent('deposit flow started', {
-        _value: Number(amountToDeposit.formatted),
+        _value: fromBaseUnitsToTrackEventCents(amountToDeposit.raw, consensusConfig.decimals),
       })
 
       setProgress({ percentage: 0.25, message: 'ROSE transfer initiated' })
@@ -65,7 +71,7 @@ export function useDeposit() {
       })
 
       trackEvent('deposit flow finished', {
-        _value: Number(amountToDeposit.formatted),
+        _value: fromBaseUnitsToTrackEventCents(amountToDeposit.raw, consensusConfig.decimals),
       })
 
       allowNavigatingAway() // Stop blocking unless new transfer comes in

move/src/useWithdraw.ts

@@ -1,12 +1,18 @@
 import { useState } from 'react'
 import { useAccount, useBalance, useSendTransaction } from 'wagmi'
 import { usePrevious } from './hooks/usePrevious.ts'
-import { getConsensusBalance, waitForConsensusBalance, waitForSapphireBalance } from './utils/getBalances'
+import {
+  fromBaseUnitsToTrackEventCents,
+  getConsensusBalance,
+  waitForConsensusBalance,
+  waitForSapphireBalance,
+} from './utils/getBalances'
 import { useBlockNavigatingAway } from './utils/useBlockNavigatingAway'
 import { transferToConsensus } from './withdraw/transferToConsensus'
 import { useGenerateSapphireAccount } from './withdraw/useGenerateSapphireAccount'
 import { minimalWithdrawableAmount, withdrawToConsensus } from './withdraw/withdrawToConsensus'
 import { trackEvent } from 'fathom-client'
+import { consensusConfig } from './utils/oasisConfig.ts'
 
 // Use global variable here, due to step4 using different context(not in sync with react hooks)
 let isInputModeGlobal = true
@@ -82,7 +88,7 @@ export function useWithdraw() {
       const amountToWithdraw2 = await waitForConsensusBalance(generatedConsensusAccount.address, 0n)
 
       trackEvent('withdrawal flow started', {
-        _value: Number(amountToWithdraw2.formatted),
+        _value: fromBaseUnitsToTrackEventCents(amountToWithdraw2.raw, consensusConfig.decimals),
       })
 
       const preWithdrawConsensusBalance = await getConsensusBalance(consensusAddress)
@@ -99,7 +105,7 @@ export function useWithdraw() {
       })
 
       trackEvent('withdrawal flow finished', {
-        _value: Number(amountToWithdraw2.formatted),
+        _value: fromBaseUnitsToTrackEventCents(amountToWithdraw2.raw, consensusConfig.decimals),
       })
 
       allowNavigatingAway() // Stop blocking unless new transfer comes in

move/src/utils/getBalances.ts

@@ -81,6 +81,11 @@ function fromBaseUnits(valueInBaseUnits: bigint, decimals: number): string {
   return value.toFixed()
 }
 
+export function fromBaseUnitsToTrackEventCents(valueInBaseUnits: bigint, decimals: number): number {
+  const value = fromBaseUnits(valueInBaseUnits, decimals)
+  return BigNumber(value).multipliedBy(100).integerValue().toNumber()
+}
+
 export function getValidOasisAddress(addr: string): `oasis1${string}` | null {
   try {
     staking.addressFromBech32(addr)