fixup! Refactor tracking props to be explicit, use CryptoAmount We call everything pluginId, making things ambiguous and confusing when we pass pluginId around. In this case it was causing problems with the logging when treating a provider's pluginId as a wallet pluginId.

Author: Jon-edge

src/components/scenes/Fio/FioAddressSettingsScene.tsx

@@ -108,7 +108,7 @@ export class FioAddressSettingsComponent extends React.Component<Props, LocalSta
     onLogEvent('Fio_Handle_Bundled_Tx', {
       conversionValues: {
         conversionType: 'crypto',
-        cryptoAmount: new CryptoAmount({ nativeAmount: String(fee), currencyConfig: fioWallet.currencyConfig })
+        cryptoAmount: new CryptoAmount({ nativeAmount: String(fee), currencyConfig: fioWallet.currencyConfig, tokenId: null })
       }
     })
   }

src/components/scenes/Fio/FioDomainSettingsScene.tsx

@@ -122,7 +122,7 @@ export class FioDomainSettingsComponent extends React.Component<Props, State> {
     onLogEvent('Fio_Domain_Renew', {
       conversionValues: {
         conversionType: 'crypto',
-        cryptoAmount: new CryptoAmount({ nativeAmount: String(renewalFee), currencyConfig: fioWallet.currencyConfig })
+        cryptoAmount: new CryptoAmount({ nativeAmount: String(renewalFee), currencyConfig: fioWallet.currencyConfig, tokenId: null })
       }
     })
   }

src/components/scenes/Fio/FioNameConfirmScene.tsx

@@ -121,8 +121,9 @@ class FioNameConfirm extends React.PureComponent<Props> {
             conversionValues: {
               conversionType: 'crypto',
               cryptoAmount: new CryptoAmount({
+                currencyConfig: paymentWallet.currencyConfig,
                 nativeAmount: edgeTx.nativeAmount,
-                currencyConfig: paymentWallet.currencyConfig
+                tokenId: null
               })
             }
           })
@@ -143,8 +144,9 @@ class FioNameConfirm extends React.PureComponent<Props> {
             conversionValues: {
               conversionType: 'crypto',
               cryptoAmount: new CryptoAmount({
+                currencyConfig: paymentWallet.currencyConfig,
                 nativeAmount: edgeTx.nativeAmount,
-                currencyConfig: paymentWallet.currencyConfig
+                tokenId: null
               })
             }
           })

src/plugins/gui/providers/banxaProvider.ts

@@ -650,8 +650,7 @@ export const banxaProvider: FiatProviderFactory = {
                                 conversionType: 'sell',
                                 destFiatCurrencyCode: fiatCurrencyCode,
                                 destFiatAmount: priceQuote.fiat_amount,
-                                sourceAmount: CryptoAmount({
-                                  pluginId: coreWallet.currencyInfo.pluginId,
+                                sourceAmount: new CryptoAmount({
                                   currencyConfig: coreWallet.currencyConfig,
                                   currencyCode: displayCurrencyCode,
                                   exchangeAmount: coinAmount

src/plugins/gui/providers/kadoProvider.ts

@@ -768,8 +768,7 @@ export const kadoProvider: FiatProviderFactory = {
                           conversionType: 'sell',
                           destFiatCurrencyCode: 'USD',
                           destFiatAmount: fiatAmount,
-                          sourceAmount: CryptoAmount({
-                            pluginId: coreWallet.currencyInfo.pluginId,
+                          sourceAmount: new CryptoAmount({
                             currencyConfig: coreWallet.currencyConfig,
                             currencyCode: displayCurrencyCode,
                             exchangeAmount: paymentExchangeAmount

src/plugins/gui/providers/paybisProvider.ts

@@ -614,8 +614,7 @@ export const paybisProvider: FiatProviderFactory = {
                           conversionType: 'sell',
                           destFiatCurrencyCode: fiatCurrencyCode,
                           destFiatAmount: fiatAmount,
-                          sourceAmount: CryptoAmount({
-                            pluginId: coreWallet.currencyInfo.pluginId,
+                          sourceAmount: new CryptoAmount({
                             currencyConfig: coreWallet.currencyConfig,
                             currencyCode: displayCurrencyCode,
                             exchangeAmount: amount

src/util/tracking.ts

@@ -56,13 +56,18 @@ export type TrackingEventName =
 
 export type OnLogEvent = (event: TrackingEventName, values?: TrackingValues) => void
 
-// Known dollar amount revenue
+/**
+ * Analytics: Known dollar amount revenue
+ */
 export interface DollarConversionValues {
   conversionType: 'dollar'
   dollarConversionValue: number
 }
 
-// Some unknown revenue based on a send (e.g. FIO handle/domain fees) or swap
+/**
+ * Analytics: Some unknown revenue based on a send (e.g. FIO handle/domain fees)
+ * or swap
+ */
 export interface CryptoConversionValues {
   conversionType: 'crypto'
   cryptoAmount: CryptoAmount
@@ -71,7 +76,9 @@ export interface CryptoConversionValues {
   orderId?: string
 }
 
-// Sell to fiat
+/**
+ * Analytics: Sell to fiat
+ */
 export interface SellConversionValues {
   conversionType: 'sell'
 
@@ -85,6 +92,10 @@ export interface SellConversionValues {
   orderId?: string // Unique order identifier provided by fiat provider
 }
 
+/**
+ * Culmination of defined tracking value types, including those defined in
+ * LoginUi.
+ */
 export interface TrackingValues extends LoginTrackingValues {
   error?: unknown | string // Any error