fix: wrong call data from chain (#2867)

src/renderer/app/providers/context/MultisigChainContext/MultisigChainContext.tsx

@@ -46,7 +46,7 @@ export const MultisigChainProvider = ({ children }: PropsWithChildren) => {
   const account = activeAccount && accountUtils.isMultisigAccount(activeAccount) ? activeAccount : undefined;
 
   const txs = getLiveAccountMultisigTxs(account?.accountId ? [account.accountId] : []);
-  const events = getLiveEventsByKeys(txs.filter((tx) => !tx.dateCreated));
+  const events = getLiveEventsByKeys(txs);
 
   useGate(operationsModel.gate.flow, {
     transactions: txs,

src/renderer/entities/multisig/lib/multisigTx/multisigTxService.ts

@@ -12,7 +12,7 @@ import {
   MultisigTxInitStatus,
 } from '@/shared/core';
 import { type Task } from '@/shared/lib/hooks/useTaskQueue';
-import { getCurrentBlockNumber, getExpectedBlockTime, toAddress } from '@/shared/lib/utils';
+import { getCurrentBlockNumber, getExpectedBlockTime, toAddress, validateCallData } from '@/shared/lib/utils';
 import { useCallDataDecoder } from '@/entities/transaction';
 import { useMultisigEvent } from '../multisigEvent/multisigEventService';
 
@@ -241,6 +241,8 @@ export const useMultisigTx = ({ addTask }: Props): IMultisigTxService => {
 
       const callData = extrinsic.args[MULTISIG_EXTRINSIC_CALL_INDEX].toHex();
 
+      if (!validateCallData(callData, tx.callHash)) return;
+
       updateCallData(api, tx, callData);
     } catch (e) {
       console.log('Error during update call data from chain', e);

src/renderer/entities/signatory/lib/utils.ts

@@ -7,7 +7,7 @@ export const signatoryUtils = {
 
 function getSignatoryWallet(wallets: Wallet[], accountId: AccountId): Wallet | undefined {
   return wallets.find((wallet) => {
-    const hasMatch = wallet.accounts.some((account) => account.accountId === accountId);
+    const hasMatch = wallet.accounts?.some((account) => account.accountId === accountId);
 
     return hasMatch && walletUtils.isValidSignatory(wallet);
   });

src/renderer/pages/Operations/common/utils.ts

@@ -48,7 +48,7 @@ export const getSignatoryName = (
   addressPrefix?: number,
 ): string => {
   const finderFn = <T extends { accountId: AccountId }>(collection: T[]): T | undefined => {
-    return collection.find((c) => c.accountId === signatoryId);
+    return collection.find((c) => c?.accountId === signatoryId);
   };
 
   // signatory data source priority: transaction -> contacts -> wallets -> address

src/renderer/pages/Operations/components/OperationFullInfo.tsx

@@ -1,14 +1,16 @@
-import { useUnit } from 'effector-react';
+import { useStoreMap, useUnit } from 'effector-react';
 
 import { useMultisigChainContext } from '@/app/providers';
 import { type MultisigTransactionDS } from '@/shared/api/storage';
 import { type CallData, type MultisigAccount } from '@/shared/core';
 import { useI18n } from '@/shared/i18n';
 import { useToggle } from '@/shared/lib/hooks';
+import { validateCallData } from '@/shared/lib/utils';
 import { Button, Icon, InfoLink, SmallTitleText } from '@/shared/ui';
 import { useMultisigTx } from '@/entities/multisig';
 import { useNetworkData } from '@/entities/network';
-import { permissionUtils, walletModel } from '@/entities/wallet';
+import { operationsModel } from '@/entities/operations';
+import { permissionUtils, walletModel, walletUtils } from '@/entities/wallet';
 import { getMultisigExtrinsicLink } from '../common/utils';
 
 import { OperationCardDetails } from './OperationCardDetails';
@@ -27,6 +29,24 @@ export const OperationFullInfo = ({ tx, account }: Props) => {
   const { api, chain, connection, extendedChain } = useNetworkData(tx.chainId);
 
   const wallets = useUnit(walletModel.$wallets);
+  const activeWallet = useUnit(walletModel.$activeWallet);
+
+  const events = useStoreMap({
+    store: operationsModel.$multisigEvents,
+    keys: [tx],
+    fn: (events, [tx]) => {
+      return events.filter((e) => {
+        return (
+          e.txAccountId === tx.accountId &&
+          e.txChainId === tx.chainId &&
+          e.txCallHash === tx.callHash &&
+          e.txBlock === tx.blockCreated &&
+          e.txIndex === tx.indexCreated &&
+          e.status === 'SIGNED'
+        );
+      });
+    },
+  });
 
   const { addTask } = useMultisigChainContext();
   const { updateCallData } = useMultisigTx({ addTask });
@@ -41,12 +61,17 @@ export const OperationFullInfo = ({ tx, account }: Props) => {
     updateCallData(api, tx, callData as CallData);
   };
 
+  if (!walletUtils.isMultisig(activeWallet)) return null;
+
   const isRejectAvailable = wallets.some((wallet) => {
-    const hasDepositor = wallet.accounts.some((account) => account.accountId === tx.depositor);
+    const hasDepositor = wallet.accounts?.some((account) => account.accountId === tx.depositor);
 
     return hasDepositor && permissionUtils.canRejectMultisigTx(wallet);
   });
 
+  const isFinalSigning = events.length === activeWallet.accounts[0].threshold - 1;
+  const isApproveAvailable = !isFinalSigning || (tx.callData && validateCallData(tx.callData, tx.callHash));
+
   return (
     <div className="flex flex-1">
       <div className="flex w-[416px] flex-col border-r border-r-divider p-4">
@@ -80,7 +105,7 @@ export const OperationFullInfo = ({ tx, account }: Props) => {
               </Button>
             </RejectTxModal>
           )}
-          {account && connection && (
+          {account && isApproveAvailable && connection && (
             <ApproveTxModal tx={tx} account={account} connection={extendedChain}>
               <Button className="ml-auto">{t('operation.approveButton')}</Button>
             </ApproveTxModal>

src/renderer/pages/Operations/components/modals/ApproveTx.tsx

@@ -15,7 +15,7 @@ import {
 import { TransactionType } from '@/shared/core';
 import { useI18n } from '@/shared/i18n';
 import { useToggle } from '@/shared/lib/hooks';
-import { TEST_ADDRESS, getAssetById, toAddress, transferableAmount } from '@/shared/lib/utils';
+import { TEST_ADDRESS, getAssetById, toAddress, transferableAmount, validateCallData } from '@/shared/lib/utils';
 import { Button } from '@/shared/ui';
 import { Modal } from '@/shared/ui-kit';
 import { balanceModel, balanceUtils } from '@/entities/balance';
@@ -155,10 +155,12 @@ const ApproveTxModal = ({ tx, account, connection, children }: Props) => {
       return acc;
     }, []);
 
+    const hasCallData = tx.callData && validateCallData(tx.callData, tx.callHash);
+
     return {
       chainId: tx.chainId,
       address: signerAddress,
-      type: tx.callData ? TransactionType.MULTISIG_AS_MULTI : TransactionType.MULTISIG_APPROVE_AS_MULTI,
+      type: hasCallData ? TransactionType.MULTISIG_AS_MULTI : TransactionType.MULTISIG_APPROVE_AS_MULTI,
       args: {
         threshold: account.threshold,
         otherSignatories: otherSignatories.sort(),