fix: display only multisig transactions on multisig token transaction details

Author: peronczyk

src/popup/pages/FungibleTokens/TokenTransactions.vue

@@ -12,7 +12,7 @@ import { computed, defineComponent, ref } from 'vue';
 import { useStore } from 'vuex';
 import type { ICommonTransaction, ITokenList, ITx } from '@/types';
 import { TXS_PER_PAGE } from '@/constants';
-import { useAccounts, useTransactionList } from '@/composables';
+import { useAccounts, useMultisigAccounts, useTransactionList } from '@/composables';
 import { useState } from '@/composables/vuex';
 import { AE_CONTRACT_ID } from '@/protocols/aeternity/config';
 import { getInnerTransaction } from '@/protocols/aeternity/helpers';
@@ -32,6 +32,7 @@ export default defineComponent({
     const store = useStore();
 
     const { activeAccount } = useAccounts({ store });
+    const { activeMultisigAccount } = useMultisigAccounts({ store });
     const {
       fetchTransactions,
       getAccountAllTransactions,
@@ -41,9 +42,14 @@ export default defineComponent({
 
     const availableTokens = useState<ITokenList>('fungibleTokens', 'availableTokens');
     const tokensContractIds = computed((): string[] => Object.keys(availableTokens.value));
+    const currentAddress = computed(
+      () => (props.isMultisig)
+        ? activeMultisigAccount.value?.gaAccountId
+        : activeAccount.value.address,
+    );
 
     const loadedTransactionList = computed(
-      (): ICommonTransaction[] => getAccountAllTransactions(activeAccount.value.address!),
+      (): ICommonTransaction[] => getAccountAllTransactions(currentAddress.value!),
     );
 
     function isFungibleTokenTx(tx: ITx) {
@@ -75,7 +81,7 @@ export default defineComponent({
         await fetchTransactions(
           TXS_PER_PAGE,
           !!recent,
-          activeAccount.value.address,
+          currentAddress.value!,
         );
       } finally {
         loading.value = false;

src/types/index.ts

@@ -64,7 +64,7 @@ export interface IRequestInitBodyParsed extends Omit<RequestInit, 'body'> {
   body?: object;
 }
 
-type GenericApiMethod<T = any> = (...args: any) => Promise<T>;
+type GenericApiMethod<T = any, U extends unknown[] = any> = (...args: U) => Promise<T>;
 
 export type ResolveCallback = (...args: any) => void;
 export type RejectCallback = (error?: RejectedByUserError) => void;
@@ -503,6 +503,7 @@ export interface INameEntryFetched {
 /**
  * Middleware v1 autogenerated endpoints.
  * TODO: Update the list after migrating to v2.
+ * @link https://testnet.aeternity.io/mdw/swagger/
  */
 export interface IMiddleware {
   getActiveNames: GenericApiMethod;
@@ -522,7 +523,13 @@ export interface IMiddleware {
   getOracle: GenericApiMethod;
   getOracles: GenericApiMethod;
   getStatus: GenericApiMethod;
-  getTxs: GenericApiMethod;
+  getTxs: GenericApiMethod<any, [{
+    account?: string;
+    contract?: string;
+    direction?: 'forward' | 'backward';
+    limit?: number;
+    [key: string]: any;
+  }]>;
   getTx: (hash: string) => Promise<any>;
   getTxByIndex: GenericApiMethod;
   getTxCountById: GenericApiMethod;