fix events

packages/yoroi-extension/app/components/wallet/send/WalletSendFormSteps/WalletSendPreviewStepContainer.js

@@ -70,8 +70,10 @@ export default class WalletSendPreviewStepContainer extends Component<Props> {
 
     if (signRequest == null) throw new Error('Unexpected missing active signing request');
 
+    const amount = signRequest.totalInput();
+    const { numberOfDecimals } = this.props.getTokenInfo(amount.getDefaultEntry()).Metadata;
     ampli.sendSummarySubmitted({
-      ada_amount: signRequest.totalInput().getDefault().toNumber(),
+      ada_amount: amount.getDefault().shiftedBy(-numberOfDecimals).toNumber(),
       asset_count: signRequest.totalInput().nonDefaultEntries().length,
     });
 

packages/yoroi-extension/app/containers/wallet/AddWalletPage.js

@@ -25,7 +25,7 @@ import SidebarContainer from '../SidebarContainer';
 import AddWalletPageRevamp from './AddWalletPageRevamp';
 import type { RestoreModeType } from '../../stores/toplevel/WalletRestoreStore';
 import type { StoresProps } from '../../stores';
-import { ampli } from '../../../ampli/index'
+import { ampli } from '../../../ampli/index';
 
 @observer
 export default class AddWalletPage extends Component<StoresProps> {
@@ -64,6 +64,7 @@ export default class AddWalletPage extends Component<StoresProps> {
       });
       // <TODO:HW_REFACTOR>
       stores.substores.ada.trezorConnect.init();
+      ampli.connectWalletCheckPageViewed();
     };
     const openLedgerConnectDialog = () => {
       if (selectedNetwork === undefined) {
@@ -74,6 +75,7 @@ export default class AddWalletPage extends Component<StoresProps> {
       });
       // <TODO:HW_REFACTOR>
       stores.substores.ada.ledgerConnect.init();
+      ampli.connectWalletCheckPageViewed();
     };
 
     let activeDialog = null;
@@ -173,7 +175,6 @@ export default class AddWalletPage extends Component<StoresProps> {
         <AddWalletPageRevamp
           onHardwareConnect={() => {
             this.openDialogWrapper(WalletConnectHWOptionDialog);
-            ampli.connectWalletCheckPageViewed();
           }}
           onCreate={() => goToRoute({ route: ROUTES.WALLETS.CREATE_NEW_WALLET })}
           onRestore={() => goToRoute({ route: ROUTES.WALLETS.RESTORE_WALLET })}

packages/yoroi-extension/app/containers/wallet/dialogs/WalletLedgerConnectDialogContainer.js

@@ -23,7 +23,6 @@ type LocalProps = {|
 
 @observer
 export default class WalletLedgerConnectDialogContainer extends Component<{| ...StoresProps, ...LocalProps |}> {
-
   getSelectedNetwork: void => $ReadOnly<NetworkRow> = () => {
     const { selectedNetwork } = this.props.stores.profile;
     if (selectedNetwork === undefined) {
@@ -66,7 +65,10 @@ export default class WalletLedgerConnectDialogContainer extends Component<{| ...
             isActionProcessing={ledgerConnectStore.isActionProcessing}
             error={ledgerConnectStore.error}
             onExternalLinkClick={handleExternalLinkClick}
-            goBack={ledgerConnectStore.goBackToCheck}
+            goBack={()=> {
+              ledgerConnectStore.goBackToCheck();
+              ampli.connectWalletCheckPageViewed();
+            }}
             submit={ledgerConnectStore.submitConnect}
             cancel={this.cancel}
           />);

packages/yoroi-extension/app/containers/wallet/dialogs/WalletTrezorConnectDialogContainer.js

@@ -64,7 +64,10 @@ export default class WalletTrezorConnectDialogContainer extends Component<{| ...
             isActionProcessing={trezorConnectStore.isActionProcessing}
             error={trezorConnectStore.error}
             onExternalLinkClick={handleExternalLinkClick}
-            goBack={trezorConnectStore.goBackToCheck}
+            goBack={()=>{
+              trezorConnectStore.goBackToCheck();
+              ampli.connectWalletCheckPageViewed();
+            }}
             submit={trezorConnectStore.submitConnect}
             cancel={this.cancel}
           />);

packages/yoroi-extension/app/containers/wallet/staking/CardanoStakingPage.js

@@ -378,6 +378,11 @@ export default class CardanoStakingPage extends Component<AllProps, State> {
     if (delegationTx != null && selectedPoolId != null && showSignDialog) {
       // may happen for a split second before backend query starts
       if (selectedPoolInfo == null) return null;
+
+      const { numberOfDecimals } = genLookupOrFail(this.props.stores.tokenInfoStore.tokenInfo)(
+        delegationTx.totalAmountToDelegate.getDefaultEntry()
+      ).Metadata;
+
       return (
         <DelegationTxDialog
           staleTx={delegationTransaction.isStale}
@@ -401,7 +406,8 @@ export default class CardanoStakingPage extends Component<AllProps, State> {
               dialog: DelegationSuccessDialog,
             });
             ampli.stakingCenterDelegationSubmitted({
-              ada_amount: delegationTx.totalAmountToDelegate.getDefault().toNumber(),
+              ada_amount:
+                delegationTx.totalAmountToDelegate.getDefault().shiftedBy(-numberOfDecimals).toNumber(),
               staking_pool: selectedPoolId,
             });
           }}

packages/yoroi-extension/app/containers/wallet/staking/WithdrawRewardsDialog.js

@@ -113,8 +113,15 @@ export default class WithdrawRewardsDialog extends Component<{| ...StoresProps,
         onError: () => {},
       });
     }
+
+    const { numberOfDecimals } = genLookupOrFail(stores.tokenInfoStore.tokenInfo)({
+      identifier: selected.defaultTokenId,
+      networkId: selected.networkId,
+    }).Metadata;
+
     ampli.claimAdaTransactionSubmitted({
-      reward_amount: signRequest.withdrawals()[0]?.amount.getDefaultEntry().amount.toNumber()
+      reward_amount: signRequest.withdrawals()[0]?.amount.getDefaultEntry().amount
+        .shiftedBy(-numberOfDecimals).toNumber()
     });
   };