Fix: multisig proxy xcm transfer

src/renderer/entities/transaction/ui/TransactionTitle/TransactionTitle.tsx

@@ -11,6 +11,7 @@ type Props = {
   className?: string;
 };
 
+// TODO decompose
 export const TransactionTitle = ({ tx, className, children }: PropsWithChildren<Props>) => {
   const { t } = useI18n();
 

src/renderer/features/governance-operation-details/components/GovernanceOperationTitle.tsx

@@ -4,21 +4,23 @@ import { getAssetById } from '@/shared/lib/utils';
 import { Box } from '@/shared/ui-kit';
 import { AssetBalance } from '@/entities/asset';
 import { ChainTitle } from '@/entities/chain';
+import { getTransactionFromMultisigTx } from '@/entities/multisig';
 import { TransactionTitle, getTransactionAmount } from '@/entities/transaction';
 
 type Props = {
   operation: MultisigTransaction;
 };
 
 export const GovernanceOperationTitle = ({ operation }: Props) => {
+  const transaction = getTransactionFromMultisigTx(operation);
+
   const asset =
-    operation.transaction &&
-    getAssetById(operation.transaction.args.asset, chainsService.getChainById(operation.chainId)?.assets);
-  const amount = operation.transaction && getTransactionAmount(operation.transaction);
+    transaction && getAssetById(transaction.args.asset, chainsService.getChainById(operation.chainId)?.assets);
+  const amount = transaction && getTransactionAmount(transaction);
 
   return (
     <>
-      <TransactionTitle className="flex-1 overflow-hidden" tx={operation.transaction} />
+      <TransactionTitle className="flex-1 overflow-hidden" tx={transaction} />
 
       {asset && amount && (
         <Box width="160px">

src/renderer/features/proxy-operation-details/components/ProxyOperationTitle.tsx

@@ -3,21 +3,23 @@ import { type MultisigTransaction } from '@/shared/core';
 import { getAssetById } from '@/shared/lib/utils';
 import { AssetBalance } from '@/entities/asset';
 import { ChainTitle } from '@/entities/chain';
+import { getTransactionFromMultisigTx } from '@/entities/multisig';
 import { TransactionTitle, getTransactionAmount } from '@/entities/transaction';
 
 type Props = {
   operation: MultisigTransaction;
 };
 
 export const ProxyOperationTitle = ({ operation }: Props) => {
+  const transaction = getTransactionFromMultisigTx(operation);
+
   const asset =
-    operation.transaction &&
-    getAssetById(operation.transaction.args.asset, chainsService.getChainById(operation.chainId)?.assets);
-  const amount = operation.transaction && getTransactionAmount(operation.transaction);
+    transaction && getAssetById(transaction.args.asset, chainsService.getChainById(operation.chainId)?.assets);
+  const amount = transaction && getTransactionAmount(transaction);
 
   return (
     <>
-      <TransactionTitle className="flex-1 overflow-hidden" tx={operation.transaction} />
+      <TransactionTitle className="flex-1 overflow-hidden" tx={transaction} />
 
       {asset && amount && (
         <div className="w-[160px]">

src/renderer/features/staking-operation-details/components/StakingOperationTitle.tsx

@@ -3,21 +3,23 @@ import { type MultisigTransaction } from '@/shared/core';
 import { getAssetById } from '@/shared/lib/utils';
 import { AssetBalance } from '@/entities/asset';
 import { ChainTitle } from '@/entities/chain';
+import { getTransactionFromMultisigTx } from '@/entities/multisig';
 import { TransactionTitle, getTransactionAmount } from '@/entities/transaction';
 
 type Props = {
   operation: MultisigTransaction;
 };
 
 export const StakingOperationTitle = ({ operation }: Props) => {
+  const transaction = getTransactionFromMultisigTx(operation);
+
   const asset =
-    operation.transaction &&
-    getAssetById(operation.transaction.args.asset, chainsService.getChainById(operation.chainId)?.assets);
-  const amount = operation.transaction && getTransactionAmount(operation.transaction);
+    transaction && getAssetById(transaction.args.asset, chainsService.getChainById(operation.chainId)?.assets);
+  const amount = transaction && getTransactionAmount(transaction);
 
   return (
     <>
-      <TransactionTitle className="flex-1 overflow-hidden" tx={operation.transaction} />
+      <TransactionTitle className="flex-1 overflow-hidden" tx={transaction} />
 
       {asset && amount && (
         <div className="w-[160px]">

src/renderer/features/transfer-operation-details/components/TransferOperationTitle.tsx

@@ -3,21 +3,23 @@ import { type MultisigTransaction } from '@/shared/core';
 import { getAssetById } from '@/shared/lib/utils';
 import { AssetBalance } from '@/entities/asset';
 import { ChainTitle } from '@/entities/chain';
+import { getTransactionFromMultisigTx } from '@/entities/multisig';
 import { TransactionTitle, getTransactionAmount } from '@/entities/transaction';
 
 type Props = {
   operation: MultisigTransaction;
 };
 
 export const TransferOperationTitle = ({ operation }: Props) => {
+  const transaction = getTransactionFromMultisigTx(operation);
+
   const asset =
-    operation.transaction &&
-    getAssetById(operation.transaction.args.asset, chainsService.getChainById(operation.chainId)?.assets);
-  const amount = operation.transaction && getTransactionAmount(operation.transaction);
+    transaction && getAssetById(transaction.args.asset, chainsService.getChainById(operation.chainId)?.assets);
+  const amount = transaction && getTransactionAmount(transaction);
 
   return (
     <>
-      <TransactionTitle className="flex-1 overflow-hidden" tx={operation.transaction} />
+      <TransactionTitle className="flex-1 overflow-hidden" tx={transaction} />
 
       {asset && amount && (
         <div className="w-[160px]">

src/renderer/features/transfer-operation-details/components/XcmTransferOperationTitle.tsx

@@ -3,33 +3,32 @@ import { type FlexibleMultisigTransactionDS, type MultisigTransactionDS } from '
 import { getAssetById } from '@/shared/lib/utils';
 import { AssetBalance } from '@/entities/asset';
 import { XcmChains } from '@/entities/chain';
+import { getTransactionFromMultisigTx } from '@/entities/multisig';
 import { TransactionTitle, getTransactionAmount } from '@/entities/transaction';
 
 type Props = {
   operation: MultisigTransactionDS | FlexibleMultisigTransactionDS;
 };
 
 export const XcmTransferOperationTitle = ({ operation }: Props) => {
-  const assetId = operation.transaction?.args.assetId || operation.transaction?.args.asset;
+  const transaction = getTransactionFromMultisigTx(operation);
+
+  const assetId = transaction?.args.assetId || transaction?.args.asset;
   const asset = getAssetById(assetId, chainsService.getChainById(operation.chainId)?.assets);
 
-  const amount = operation.transaction && getTransactionAmount(operation.transaction);
+  const amount = transaction && getTransactionAmount(transaction);
 
   return (
     <>
-      <TransactionTitle className="flex-1 overflow-hidden" tx={operation.transaction} />
+      <TransactionTitle className="flex-1 overflow-hidden" tx={transaction} />
 
       {asset && amount && (
         <div className="w-[160px]">
           <AssetBalance value={amount} asset={asset} showIcon />
         </div>
       )}
 
-      <XcmChains
-        chainIdFrom={operation.chainId}
-        chainIdTo={operation.transaction?.args.destinationChain}
-        className="w-[114px]"
-      />
+      <XcmChains chainIdFrom={operation.chainId} chainIdTo={transaction?.args.destinationChain} className="w-[114px]" />
     </>
   );
 };

src/renderer/pages/Operations/components/ActionSteps/Confirmation.tsx

@@ -52,9 +52,8 @@ export const Confirmation = ({ api, tx, account, chain, signAccount, feeTx, onSi
   });
 
   const xcmConfig = useUnit(xcmTransferModel.$config);
-  const asset = getAssetById(tx.transaction?.args.assetId, chain.assets) || chain.assets[0];
-
   const transaction = getTransactionFromMultisigTx(tx);
+  const asset = getAssetById(transaction?.args.assetId, chain.assets) || chain.assets[0];
 
   const xcmApi = useStoreMap({
     store: networkModel.$apis,
@@ -75,9 +74,9 @@ export const Confirmation = ({ api, tx, account, chain, signAccount, feeTx, onSi
   return (
     <div className="flex flex-col items-center gap-y-3 px-5 pb-4">
       <div className="mb-6 flex flex-col items-center gap-y-3">
-        <Icon className="text-icon-default" name={getIconName(tx.transaction)} size={60} />
+        <Icon className="text-icon-default" name={getIconName(transaction)} size={60} />
 
-        {tx.transaction && <TransactionAmount tx={tx.transaction} />}
+        {transaction && <TransactionAmount tx={transaction} />}
       </div>
 
       <Details api={api} tx={tx} account={account} chain={chain} signatory={signAccount} />

src/renderer/shared/api/xcm/__tests__/mock/xcmData.ts

@@ -314,6 +314,69 @@ export const XCMPALLET_TRANSFER_PAH_MYTH = {
   },
 };
 
+export const XCMPALLET_TRANSFER_PAH_MOONBEAM = {
+  dest: {
+    V4: {
+      interior: {
+        X1: [
+          {
+            Parachain: '2,004',
+          },
+        ],
+      },
+      parents: 1,
+    },
+  },
+  beneficiary: {
+    V4: {
+      interior: {
+        X1: [
+          {
+            AccountKey20: {
+              key: '0xb32b41625e14e55757a5d0cfcdd9768a1695c5f3',
+              network: null,
+            },
+          },
+        ],
+      },
+      parents: 0,
+    },
+  },
+  assets: {
+    V4: [
+      {
+        fun: {
+          Fungible: '5340000000000000',
+        },
+        id: {
+          interior: {
+            X2: [
+              {
+                PalletInstance: 50,
+              },
+              {
+                GeneralIndex: '23',
+              },
+            ],
+          },
+          parents: 0,
+        },
+      },
+      {
+        fun: {
+          Fungible: '156796325',
+        },
+        id: {
+          interior: {
+            Here: 'NULL',
+          },
+          parents: 1,
+        },
+      },
+    ],
+  },
+};
+
 export const XTOKENS_ACA_DOT = {
   asset: {
     V2: {

src/renderer/shared/api/xcm/__tests__/xcm-service.test.ts

@@ -4,6 +4,7 @@ import {
   CONFIG,
   XCMPALLET_TRANSFER_HUB_ASTAR,
   XCMPALLET_TRANSFER_KSM_BIFROST,
+  XCMPALLET_TRANSFER_PAH_MOONBEAM,
   XCMPALLET_TRANSFER_PAH_MYTH,
   XTOKENS_ACA_DOT,
   XTOKENS_ACA_PARALLEL,
@@ -40,6 +41,21 @@ describe('shared/api/xcm/service/xcm-service', () => {
     });
   });
 
+  test('should parse xcmPallet parachain > eth parachain 2', () => {
+    const result = xcmService.parseXcmPalletExtrinsic(XCMPALLET_TRANSFER_PAH_MOONBEAM);
+
+    expect(result).toEqual({
+      isRelayToken: false,
+      amount: '5340000000000000',
+      assetGeneralIndex: '23',
+      assetParachain: 0,
+      destAccountId: '0xb32b41625e14e55757a5d0cfcdd9768a1695c5f3',
+      destParachain: 2004,
+      toRelayChain: false,
+      type: 'xcmPallet',
+    });
+  });
+
   test('should parse xcmPallet parachain > parachain', () => {
     const result = xcmService.parseXcmPalletExtrinsic(XCMPALLET_TRANSFER_HUB_ASTAR);
 

src/renderer/shared/api/xcm/lib/xcm-utils.ts

@@ -246,7 +246,9 @@ function getSiblingLocation(version: string, parachainId: number, accountId?: Ac
 
 function getJunctionCols<T>(interior: Record<string, object>, path: string): T {
   if (path === 'X1') {
-    return get(interior, path) as T;
+    const result = get(interior, path) as T;
+
+    return Array.isArray(result) ? result[0] : result;
   }
 
   return Object.values(get(interior, path)).reduce((acc, item) => {

src/renderer/shared/api/xcm/service/xcmService.ts

@@ -218,7 +218,8 @@ type XTokensPayload = ParsedPayload & {
 function parseXcmPalletExtrinsic(args: Omit<XcmPalletTransferArgs, 'feeAssetItem' | 'weightLimit'>): XcmPalletPayload {
   const xcmVersion = Object.keys(args.dest as NonNullable<unknown>)[0];
 
-  const assetInterior = get(args.assets, `${xcmVersion}[0].id.Concrete.interior`) as unknown as NonNullable<unknown>;
+  const assetInterior = (get(args.assets, `${xcmVersion}[0].id.Concrete.interior`) ||
+    get(args.assets, `${xcmVersion}[0].id.interior`)) as unknown as NonNullable<unknown>;
   const destInterior = get(args.dest, `${xcmVersion}.interior`) as unknown as NonNullable<unknown>;
   const beneficiaryInterior = get(args.beneficiary, `${xcmVersion}.interior`) as unknown as NonNullable<unknown>;
 
@@ -234,12 +235,18 @@ function parseXcmPalletExtrinsic(args: Omit<XcmPalletTransferArgs, 'feeAssetItem
   };
 
   const beneficiaryJunction = Object.keys(beneficiaryInterior)[0];
-  const substrateAccountId = get(beneficiaryInterior, `${beneficiaryJunction}.AccountId32.id`) as unknown as string;
-  const ethAccountId = get(beneficiaryInterior, `${beneficiaryJunction}.AccountKey20.key`) as unknown as string;
-  parsedPayload.destAccountId = substrateAccountId || ethAccountId;
+
+  const beneficiaryCols = xcmUtils.getJunctionCols<{ AccountId32: any; AccountKey20: any }>(
+    beneficiaryInterior,
+    beneficiaryJunction,
+  );
+
+  parsedPayload.destAccountId = (get(beneficiaryCols, 'AccountId32.id') ||
+    get(beneficiaryCols, 'AccountKey20.key')) as unknown as string;
 
   const destJunction = Object.keys(destInterior)[0];
-  parsedPayload.destParachain = Number(xcmUtils.toRawString(get(destInterior, `${destJunction}.Parachain`)));
+  const destParachain = xcmUtils.getJunctionCols<{ Parachain: string }>(destInterior, destJunction);
+  parsedPayload.destParachain = Number(xcmUtils.toRawString(get(destParachain, 'Parachain')));
 
   if (!parsedPayload.isRelayToken && assetInterior) {
     const assetJunction = Object.keys(assetInterior)[0];
@@ -280,10 +287,8 @@ function parseXTokensExtrinsic(args: Omit<XTokenPalletTransferArgs, 'destWeight'
   parsedPayload.toRelayChain = destJunction === 'X1';
 
   if (parsedPayload.toRelayChain) {
-    const substrateAccountId = get(destInterior, `X1.AccountId32.id`) as unknown as string;
-    const ethAccountId = get(destInterior, `X1.AccountKey20.key`) as unknown as string;
-
-    parsedPayload.destAccountId = substrateAccountId || ethAccountId;
+    const cols = xcmUtils.getJunctionCols<{ AccountId32?: any; AccountKey20?: any }>(destInterior, destJunction);
+    parsedPayload.destAccountId = (get(cols, 'AccountId32.id') || get(cols, 'AccountKey20.key')) as unknown as string;
   } else {
     const cols = xcmUtils.getJunctionCols<{ Parachain?: number }>(destInterior, destJunction);
     if (cols.Parachain) {