fix(extension): conway-era tx activities line items (#860)

* fix(extension): conway-era tx activiries line items

* fix(extension): adjust tests

* fix(extension): resolve pr comments

Author: vetalcore

apps/browser-extension-wallet/src/lib/translations/en.json

@@ -24,18 +24,26 @@
           "outgoing": "Sent",
           "sending": "Sending",
           "self": "Self Transaction",
+          "vote": "Vote Signing",
+          "HardForkInitiationAction": "Hard Fork Initiation Action",
+          "NewConstitution": "New Constitution Action",
+          "NoConfidence": "No Confidence Action",
+          "ParameterChangeAction": "Parameter Change Action",
+          "TreasuryWithdrawalsAction": "Treasury Withdrawals Action",
+          "UpdateCommittee": "Update Committee Action",
+          "InfoAction": "Info Action",
+          "UpdateDelegateRepresentativeCertificate": "Update DRep",
+          "StakeVoteDelegationCertificate": "Stake Vote Delegation Certificate",
+          "StakeRegistrationDelegationCertificate": "Stake Registration Delegation Certificate",
+          "VoteRegistrationDelegationCertificate": "Vote Registration Delegation Certificate",
+          "StakeVoteRegistrationDelegationCertificate": "Stake Vote Registration Delegation Certificate",
+          "ResignCommitteeColdCertificate": "Resign Committee",
+          "AuthorizeCommitteeHotCertificate": "Authorise Committee",
           "RegisterDelegateRepresentativeCertificate": "DRep Registration",
           "UnregisterDelegateRepresentativeCertificate": "DRep De-Registration",
-          "UpdateDelegateRepresentativeCertificate": "DRep Update",
-          "ResignCommitteeColdCertificate": "Resign Committee",
-          "StakeRegistrationDelegationCertificate": "Stake Key Registration & Delgation",
-          "StakeVoteDelegationCertificate": "Stake Key Registration & DRep Delegation",
-          "StakeVoteRegistrationDelegationCertificate": "Stake Key Registration, Delegation, & DRep Delegation",
-          "VoteRegistrationDelegationCertificate": "Stake Key Registration & DRep Delegation",
-          "AuthorizeCommitteeHotCertificate": "Authorize Committee",
           "VoteDelegationCertificate": "Vote Delegation",
-          "vote": "Vote Signing",
-          "submitProposal": "Governance Proposal"
+
+          "submitProposal": "Confirm Vote"
         },
         "certificates": {
           "headings": {

apps/browser-extension-wallet/src/stores/slices/activity-detail-slice.ts

@@ -17,7 +17,7 @@ import { inspectTxValues } from '@src/utils/tx-inspection';
 import { firstValueFrom } from 'rxjs';
 import { getAssetsInformation } from '@src/utils/get-assets-information';
 import { MAX_POOLS_COUNT } from '@lace/staking';
-import { ActivityStatus, DelegationTransactionType, TransactionActivityType } from '@lace/core';
+import { ActivityStatus, DelegationActivityType, TransactionActivityType } from '@lace/core';
 import type { ActivityType } from '@lace/core';
 import { formatDate, formatTime } from '@src/utils/format-date';
 import {
@@ -65,11 +65,11 @@ const shouldIncludeFee = (
   delegationInfo: Wallet.Cardano.StakeDelegationCertificate[] | undefined
 ) =>
   !(
-    type === DelegationTransactionType.delegationRegistration ||
+    type === DelegationActivityType.delegationRegistration ||
     // Existence of any (new) delegationInfo means that this "de-registration"
     // activity is accompanied by a "delegation" activity, which carries the fees.
     // However, fees should be shown if de-registration activity is standalone.
-    (type === DelegationTransactionType.delegationDeregistration && !!delegationInfo?.length)
+    (type === DelegationActivityType.delegationDeregistration && !!delegationInfo?.length)
   );
 
 const getPoolInfos = async (poolIds: Wallet.Cardano.PoolId[], stakePoolProvider: Wallet.StakePoolProvider) => {
@@ -191,14 +191,14 @@ const buildGetActivityDetail =
     const deposit =
       // since one tx can be split into two (delegation, registration) actions,
       // ensure only the registration tx carries the deposit
-      implicitCoin.deposit && type === DelegationTransactionType.delegationRegistration
+      implicitCoin.deposit && type === DelegationActivityType.delegationRegistration
         ? Wallet.util.lovelacesToAdaString(implicitCoin.deposit.toString())
         : undefined;
     const depositReclaimValue = Wallet.util.calculateDepositReclaim(implicitCoin);
     const depositReclaim =
       // since one tx can be split into two (delegation, de-registration) actions,
       // ensure only the de-registration tx carries the reclaimed deposit
-      depositReclaimValue && type === DelegationTransactionType.delegationDeregistration
+      depositReclaimValue && type === DelegationActivityType.delegationDeregistration
         ? Wallet.util.lovelacesToAdaString(depositReclaimValue.toString())
         : undefined;
     const feeInAda = Wallet.util.lovelacesToAdaString(tx.body.fee.toString());
@@ -226,7 +226,7 @@ const buildGetActivityDetail =
       certificates: certificateTransformer(cardanoCoin, tx.body.certificates)
     };
 
-    if (type === DelegationTransactionType.delegation && delegationInfo) {
+    if (type === DelegationActivityType.delegation && delegationInfo) {
       const pools = await getPoolInfos(
         delegationInfo.map(({ poolId }) => poolId),
         stakePoolProvider

apps/browser-extension-wallet/src/stores/slices/wallet-activities-slice.ts

@@ -20,7 +20,7 @@ import {
   ActivityStatus,
   AssetActivityItemProps,
   AssetActivityListProps,
-  DelegationTransactionType,
+  DelegationActivityType,
   TransactionActivityType
 } from '@lace/core';
 import { CurrencyInfo, TxDirections } from '@src/types';
@@ -66,20 +66,20 @@ type MappedActivityListProps = Omit<AssetActivityListProps, 'items'> & {
 export type FetchWalletActivitiesReturn = Observable<Promise<MappedActivityListProps[]>>;
 
 type DelegationActivityItemProps = Omit<ExtendedActivityProps, 'type'> & {
-  type: DelegationTransactionType;
+  type: DelegationActivityType;
 };
 
 const isDelegationActivity = (activity: ExtendedActivityProps): activity is DelegationActivityItemProps =>
-  activity.type in DelegationTransactionType;
+  activity.type in DelegationActivityType;
 
 const getDelegationAmount = (activity: DelegationActivityItemProps) => {
   const fee = new BigNumber(Number.parseFloat(activity.fee));
 
-  if (activity.type === DelegationTransactionType.delegationRegistration) {
+  if (activity.type === DelegationActivityType.delegationRegistration) {
     return fee.plus(activity.deposit);
   }
 
-  if (activity.type === DelegationTransactionType.delegationDeregistration) {
+  if (activity.type === DelegationActivityType.delegationDeregistration) {
     return new BigNumber(activity.depositReclaim).minus(fee);
   }
 

apps/browser-extension-wallet/src/utils/__tests__/inspectTxType.test.ts

@@ -428,7 +428,9 @@ describe('testing tx-inspection utils', () => {
                     rewardAccount: REWARD_ACCOUNT,
                     // eslint-disable-next-line unicorn/no-null
                     anchor: null,
-                    governanceAction: {} as Wallet.Cardano.GovernanceAction,
+                    governanceAction: {
+                      __typename: Wallet.Cardano.GovernanceActionType.parameter_change_action
+                    } as Wallet.Cardano.GovernanceAction,
                     deposit: BigInt(1)
                   }
                 ]
@@ -438,7 +440,7 @@ describe('testing tx-inspection utils', () => {
               { address: ADDRESS_1, rewardAccount: REWARD_ACCOUNT }
             ] as Wallet.KeyManagement.GroupedAddress[]
           });
-          expect(result).toEqual('submitProposal');
+          expect(result).toEqual('ParameterChangeAction');
         });
       });
     });

apps/browser-extension-wallet/src/utils/mocks/certificates.ts

@@ -30,11 +30,6 @@ export const mockConwayCertificates: Partial<
     dRepCredential: CREDENTIAL,
     anchor: null
   },
-  [ConwayEraCertificatesTypes.VoteDelegation]: {
-    __typename: Wallet.Cardano.CertificateType.VoteDelegation,
-    dRep: CREDENTIAL,
-    stakeCredential: CREDENTIAL
-  },
   [ConwayEraCertificatesTypes.StakeVoteDelegation]: {
     __typename: Wallet.Cardano.CertificateType.StakeVoteDelegation,
     stakeCredential: CREDENTIAL,

apps/browser-extension-wallet/src/utils/mocks/raw-transactions.ts

@@ -71,11 +71,3 @@ export const drepRetirementTx: Wallet.Cardano.HydratedTx = {
     certificates: [mockConwayCertificates[ConwayEraCertificatesTypes.UnregisterDelegateRepresentative]]
   }
 };
-
-export const voteDelegationTx: Wallet.Cardano.HydratedTx = {
-  ...tx,
-  body: {
-    ...tx.body,
-    certificates: [mockConwayCertificates[ConwayEraCertificatesTypes.VoteDelegation]]
-  }
-};

apps/browser-extension-wallet/src/utils/tx-inspection.ts

@@ -12,10 +12,11 @@ import {
 import { Wallet } from '@lace/cardano';
 import {
   ActivityType,
-  DelegationTransactionType,
+  DelegationActivityType,
   TransactionActivityType,
   ConwayEraGovernanceActions,
-  ConwayEraCertificatesTypes
+  ConwayEraCertificatesTypes,
+  Cip1694GovernanceActivityType
 } from '@lace/core';
 import { TxDirection, TxDirections } from '@src/types';
 
@@ -60,8 +61,6 @@ const governanceCertificateInspection = (
       return ConwayEraCertificatesTypes.UnregisterDelegateRepresentative;
     case signedCertificateTypenames.includes(CertificateType.UpdateDelegateRepresentative):
       return ConwayEraCertificatesTypes.UpdateDelegateRepresentative;
-    case signedCertificateTypenames.includes(CertificateType.VoteDelegation):
-      return ConwayEraCertificatesTypes.VoteDelegation;
     case signedCertificateTypenames.includes(CertificateType.StakeVoteDelegation):
       return ConwayEraCertificatesTypes.StakeVoteDelegation;
     case signedCertificateTypenames.includes(CertificateType.StakeRegistrationDelegation):
@@ -77,6 +76,28 @@ const governanceCertificateInspection = (
   }
 };
 
+// Assumes single procedure only
+export const cip1694GovernanceActionsInspection = (
+  procedure: Wallet.Cardano.ProposalProcedure
+): Cip1694GovernanceActivityType => {
+  switch (procedure.governanceAction.__typename) {
+    case Wallet.Cardano.GovernanceActionType.parameter_change_action:
+      return Cip1694GovernanceActivityType.ParameterChangeAction;
+    case Wallet.Cardano.GovernanceActionType.hard_fork_initiation_action:
+      return Cip1694GovernanceActivityType.HardForkInitiationAction;
+    case Wallet.Cardano.GovernanceActionType.treasury_withdrawals_action:
+      return Cip1694GovernanceActivityType.TreasuryWithdrawalsAction;
+    case Wallet.Cardano.GovernanceActionType.no_confidence:
+      return Cip1694GovernanceActivityType.NoConfidence;
+    case Wallet.Cardano.GovernanceActionType.update_committee:
+      return Cip1694GovernanceActivityType.UpdateCommittee;
+    case Wallet.Cardano.GovernanceActionType.new_constitution:
+      return Cip1694GovernanceActivityType.NewConstitution;
+    case Wallet.Cardano.GovernanceActionType.info_action:
+      return Cip1694GovernanceActivityType.InfoAction;
+  }
+};
+
 const getWalletAccounts = (walletAddresses: Wallet.KeyManagement.GroupedAddress[]) =>
   walletAddresses.reduce(
     (acc, curr) => ({
@@ -145,17 +166,17 @@ export const inspectTxType = ({
   if (inspectionProperties.sent.inputs.length > 0 || withRewardsWithdrawal) {
     switch (true) {
       case !!inspectionProperties.delegation[0]?.poolId:
-        return DelegationTransactionType.delegation;
+        return DelegationActivityType.delegation;
       case inspectionProperties.stakeKeyRegistration.length > 0:
-        return DelegationTransactionType.delegationRegistration;
+        return DelegationActivityType.delegationRegistration;
       case inspectionProperties.stakeKeyDeregistration.length > 0:
-        return DelegationTransactionType.delegationDeregistration;
+        return DelegationActivityType.delegationDeregistration;
       // Voting procedures take priority over proposals
       // TODO: use proper inspector when available on sdk side (LW-9569)
       case tx.body.votingProcedures?.length > 0:
         return ConwayEraGovernanceActions.vote;
       case tx.body.proposalProcedures?.length > 0:
-        return ConwayEraGovernanceActions.submitProposal;
+        return cip1694GovernanceActionsInspection(tx.body.proposalProcedures[0]);
       case inspectionProperties.selfTransaction:
         return TransactionActivityType.self;
       default:

apps/browser-extension-wallet/src/views/browser-view/features/activity/components/ActivityDetail.tsx

@@ -11,7 +11,7 @@ import {
   useTranslate,
   RewardsDetails,
   TransactionActivityType,
-  DelegationTransactionType
+  DelegationActivityType
 } from '@lace/core';
 import type { ActivityType } from '@lace/core';
 import { PriceResult } from '@hooks';
@@ -80,9 +80,8 @@ interface ActivityDetailProps {
 }
 
 const getTypeLabel = (type: ActivityType, t: ReturnType<typeof useTranslate>['t']) => {
-  if (type === DelegationTransactionType.delegationRegistration) return t('package.core.activityDetails.registration');
-  if (type === DelegationTransactionType.delegationDeregistration)
-    return t('package.core.activityDetails.deregistration');
+  if (type === DelegationActivityType.delegationRegistration) return t('package.core.activityDetails.registration');
+  if (type === DelegationActivityType.delegationDeregistration) return t('package.core.activityDetails.deregistration');
   if (type === TransactionActivityType.incoming) return t('package.core.activityDetails.received');
   if (type === TransactionActivityType.outgoing) return t('package.core.activityDetails.sent');
   return t(`package.core.activityDetails.${type}`);

apps/browser-extension-wallet/src/views/browser-view/features/activity/components/TransactionDetailsProxy.tsx

@@ -1,5 +1,5 @@
 import React, { ReactElement, useMemo } from 'react';
-import { ActivityStatus, DelegationTransactionType, TransactionDetails } from '@lace/core';
+import { ActivityStatus, DelegationActivityType, TransactionDetails } from '@lace/core';
 import { AddressListType, getTransactionData } from './ActivityDetail';
 import { useWalletStore } from '@src/stores';
 import { useAnalyticsContext, useExternalLinkOpener } from '@providers';
@@ -37,7 +37,7 @@ export const TransactionDetailsProxy = withAddressBookContext(
       return `${CEXPLORER_BASE_URL[environmentName]}/${CEXPLORER_URL_PATHS.Tx}`;
     }, [CEXPLORER_BASE_URL, CEXPLORER_URL_PATHS.Tx, environmentName]);
     const getHeaderDescription = () => {
-      if (activityInfo.type === DelegationTransactionType.delegation) return '1 token';
+      if (activityInfo.type === DelegationActivityType.delegation) return '1 token';
       return ` (${activityInfo?.assetAmount})`;
     };
     const isIncomingTransaction = direction === TxDirections.Incoming;

apps/browser-extension-wallet/src/views/browser-view/features/activity/helpers/common-tx-transformer.ts

@@ -7,7 +7,7 @@ import { getTransactionTotalAmount } from '@src/utils/get-transaction-total-amou
 import type { TransformedActivity, TransformedTransactionActivity } from './types';
 import {
   ActivityStatus,
-  DelegationTransactionType,
+  DelegationActivityType,
   TxDetails,
   TxDetailsCertificateTitles,
   TxDetailsVotingProceduresTitles,
@@ -54,13 +54,13 @@ const splitDelegationTx = (tx: TransformedActivity): TransformedTransactionActiv
     return [
       {
         ...tx,
-        type: DelegationTransactionType.delegation,
+        type: DelegationActivityType.delegation,
         // Deposit already shown in the delegationRegistration
         deposit: undefined
       },
       {
         ...tx,
-        type: DelegationTransactionType.delegationRegistration,
+        type: DelegationActivityType.delegationRegistration,
         // Let registration show just the deposit,
         // and the other transaction show fee to avoid duplicity
         fee: '0'
@@ -70,13 +70,13 @@ const splitDelegationTx = (tx: TransformedActivity): TransformedTransactionActiv
     return [
       {
         ...tx,
-        type: DelegationTransactionType.delegation,
+        type: DelegationActivityType.delegation,
         // Reclaimed deposit already shown in the delegationDeregistration
         depositReclaim: undefined
       },
       {
         ...tx,
-        type: DelegationTransactionType.delegationDeregistration,
+        type: DelegationActivityType.delegationDeregistration,
         // Let de-registration show just the returned deposit,
         // and the other transaction show fee to avoid duplicity
         fee: '0'
@@ -87,7 +87,7 @@ const splitDelegationTx = (tx: TransformedActivity): TransformedTransactionActiv
   return [
     {
       ...tx,
-      type: DelegationTransactionType.delegation
+      type: DelegationActivityType.delegation
     }
   ];
 };
@@ -184,7 +184,7 @@ export const txTransformer = async ({
   // SDK Ticket LW-8767 should fix the type of Input in TxInFlight to contain the address
   const type = inspectTxType({ walletAddresses, tx: tx as unknown as Wallet.Cardano.HydratedTx });
 
-  if (type === DelegationTransactionType.delegation) {
+  if (type === DelegationActivityType.delegation) {
     return splitDelegationTx(baseTransformedActivity);
   }