symbol
diff --git a/‎wallet/common/core/src/constants/index.js‎
Lines changed: 1 addition & 0 deletions b/‎wallet/common/core/src/constants/index.js‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎wallet/common/core/src/index.js‎
Lines changed: 5 additions & 1 deletion b/‎wallet/common/core/src/index.js‎
Lines changed: 5 additions & 1 deletion
diff --git a/‎wallet/common/core/src/lib/bridge/BridgeManager.js‎
Lines changed: 3 additions & 3 deletions b/‎wallet/common/core/src/lib/bridge/BridgeManager.js‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎wallet/common/core/src/lib/controller/WalletController.js‎
Lines changed: 16 additions & 2 deletions b/‎wallet/common/core/src/lib/controller/WalletController.js‎
Lines changed: 16 additions & 2 deletions
diff --git a/‎wallet/common/core/src/lib/storage/PersistentStorageRepository.js‎
Lines changed: 61 additions & 1 deletion b/‎wallet/common/core/src/lib/storage/PersistentStorageRepository.js‎
Lines changed: 61 additions & 1 deletion
diff --git a/‎wallet/common/core/tests/lib/PersistentStorageRepository.test.js‎
Lines changed: 33 additions & 0 deletions b/‎wallet/common/core/tests/lib/PersistentStorageRepository.test.js‎
Lines changed: 33 additions & 0 deletions
diff --git a/‎wallet/common/core/tests/lib/WalletController.test.js‎
Lines changed: 23 additions & 6 deletions b/‎wallet/common/core/tests/lib/WalletController.test.js‎
Lines changed: 23 additions & 6 deletions
diff --git a/‎wallet/common/ethereum/src/api/TransactionService.js‎
Lines changed: 18 additions & 0 deletions b/‎wallet/common/ethereum/src/api/TransactionService.js‎
Lines changed: 18 additions & 0 deletions
diff --git a/‎wallet/common/ethereum/tests/api/TransactionService.test.js‎
Lines changed: 42 additions & 0 deletions b/‎wallet/common/ethereum/tests/api/TransactionService.test.js‎
Lines changed: 42 additions & 0 deletions
diff --git a/‎wallet/common/symbol/src/api/AccountService.js‎
Lines changed: 7 additions & 1 deletion b/‎wallet/common/symbol/src/api/AccountService.js‎
Lines changed: 7 additions & 1 deletion
@@ -70,6 +70,7 @@ export const TransactionGroup = {
 export const REQUIRED_API_METHODS = [
 	'account.fetchAccountInfo',
 	'transaction.fetchAccountTransactions',
+	'transaction.fetchAccountTransaction',
 	'transaction.fetchTransactionStatus',
 	'transaction.announceTransaction',
 	'transaction.announceTransactionBundle',
 
@@ -6,6 +6,7 @@ import { ExternalAccountKeystore } from './lib/keystore/ExternalAccountKeystore'
 import { MnemonicKeystore } from './lib/keystore/MnemonicKeystore';
 // Storage
 import { StorageInterface } from './lib/storage/StorageInterface';
+import { PersistentStorageRepository } from './lib/storage/PersistentStorageRepository';
 // Modules
 import { AddressBookModule } from './lib/modules/AddressBookModule';
 import { BridgeModule } from './lib/modules/BridgeModule';
@@ -19,7 +20,7 @@ import {
 	relativeToAbsoluteAmount, 
 	safeOperationWithRelativeAmounts 
 } from './utils/convert';
-import { createNetworkMap } from './utils/network';
+import { cloneNetworkArrayMap, cloneNetworkObjectMap, createNetworkMap } from './utils/network';
 // Constants
 import * as constants from './constants';
 // Errors
@@ -47,12 +48,15 @@ export {
 	MnemonicKeystore,
 	ExternalAccountKeystore,
 	StorageInterface,
+	PersistentStorageRepository,
 	absoluteToRelativeAmount,
 	relativeToAbsoluteAmount,
 	safeOperationWithRelativeAmounts,
 	base32ToHex, 
 	hexToBase32,
 	createNetworkMap,
+	cloneNetworkArrayMap,
+	cloneNetworkObjectMap,
 	constants,
 	AddressBookModule,
 	BridgeModule,
 
@@ -278,7 +278,6 @@ export class BridgeManager {
 
 	/**
 	 * Fetch pending requests that was sent to the bridge.
-	fetchPendingRequests
 	 * @param {string} mode - 'wrap' or 'unwrap'
 	 * @param {object} searchCriteria - Search criteria.
 	 * @param {number} searchCriteria.pageSize - Number of items to fetch.
@@ -299,9 +298,10 @@ export class BridgeManager {
 			pageNumber
 		});
 		const context = this.#getSwapContext(mode);
-		const filteredTransactions = transactions.filter(tx => context.source.normalizeAddress(tx.recipientAddress) === bridgeAddress);
+		const filteredTransactions = transactions.filter(tx =>
+			tx.recipientAddress 
+			&& context.source.normalizeAddress(tx.recipientAddress) === bridgeAddress);
 
-
 		return filteredTransactions.map(transaction => this.#transactionToPendingRequest(transaction, context));
 	};
 
 
@@ -473,8 +473,11 @@ export class WalletController {
 
 		// Select first account
 		const currentAccount = walletAccounts[this._state.networkIdentifier][0];
+		const account = await this.selectAccount(currentAccount.publicKey);
 
-		return this.selectAccount(currentAccount.publicKey);
+		this._emit(ControllerEventName.WALLET_CREATE);
+
+		return account;
 	};
 
 	/**
@@ -591,7 +594,7 @@ export class WalletController {
 		if (isExternalAccount) {
 			// Remove account from the keystore
 			const keystore = this.#accessKeystore(WalletAccountType.EXTERNAL);
-			await keystore.removeAccount(networkIdentifier, publicKey, password);
+			await keystore.removeAccount(publicKey, networkIdentifier, password);
 		}
 
 		// Load existing accounts from persistent storage
@@ -753,6 +756,17 @@ export class WalletController {
 		return this._api.transaction.fetchTransactionStatus(networkProperties, transactionHash);
 	};
 
+	/**
+	 * Fetch transaction info by transaction hash
+	 * @param {string} transactionHash - transaction hash
+	 * @returns {Promise<Transaction>} - transaction info object
+	 */
+	fetchAccountTransaction = async transactionHash => {
+		const { networkProperties } = this._state;
+
+		return this._api.transaction.fetchAccountTransaction(networkProperties, this.currentAccount, transactionHash);
+	};
+
 	/**
 	 * Return wallet mnemonic passphrase from the secure storage
 	 * @returns {Promise<string>} - mnemonic passphrase
 
@@ -24,7 +24,10 @@ export class PersistentStorageRepository {
 		ADDRESS_BOOK: 'ADDRESS_BOOK',
 		USER_CURRENCY: 'USER_CURRENCY',
 		NETWORK_PROPERTIES: 'NETWORK_PROPERTIES',
-		SELECTED_LANGUAGE: 'SELECTED_LANGUAGE'
+		SELECTED_LANGUAGE: 'SELECTED_LANGUAGE',
+		HARVESTING_STATUSES: 'HARVESTING_STATUSES',
+		HARVESTING_SUMMARIES: 'HARVESTING_SUMMARIES',
+		MULTISIG_ACCOUNTS: 'MULTISIG_ACCOUNTS'
 	};
 
 	/**
@@ -259,6 +262,44 @@ export class PersistentStorageRepository {
 		return this.storage.setItem(PersistentStorageRepository.STORAGE_KEYS.NETWORK_PROPERTIES, JSON.stringify(payload));
 	};
 
+	/**
+	 * Get the cached harvesting statuses.
+	 * @returns {Promise<NetworkObjectMap|null>} A promise that resolves to the harvesting statuses object or null if not set.
+	 */
+	getHarvestingStatuses = async () => {
+		const json = await this.storage.getItem(PersistentStorageRepository.STORAGE_KEYS.HARVESTING_STATUSES);
+
+		return decodeJson(json);
+	};
+
+	/**
+	 * Set the cached harvesting statuses.
+	 * @param {NetworkObjectMap} payload - The harvesting statuses object to set.
+	 * @returns {Promise<void>} A promise that resolves when the harvesting statuses are set.
+	 */
+	setHarvestingStatuses = async payload => {
+		return this.storage.setItem(PersistentStorageRepository.STORAGE_KEYS.HARVESTING_STATUSES, JSON.stringify(payload));
+	};
+
+	/**
+	 * Get the cached harvesting summaries.
+	 * @returns {Promise<NetworkObjectMap|null>} A promise that resolves to the harvesting summaries object or null if not set.
+	 */
+	getHarvestingSummaries = async () => {
+		const json = await this.storage.getItem(PersistentStorageRepository.STORAGE_KEYS.HARVESTING_SUMMARIES);
+
+		return decodeJson(json);
+	};
+
+	/**
+	 * Set the cached harvesting summaries.
+	 * @param {NetworkObjectMap} payload - The harvesting summaries object to set.
+	 * @returns {Promise<void>} A promise that resolves when the harvesting summaries are set.
+	 */
+	setHarvestingSummaries = async payload => {
+		return this.storage.setItem(PersistentStorageRepository.STORAGE_KEYS.HARVESTING_SUMMARIES, JSON.stringify(payload));
+	};
+
 	/**
 	 * Get the selected language.
 	 * @returns {Promise<string|null>} A promise that resolves to the selected language string or null if not set.
@@ -276,6 +317,25 @@ export class PersistentStorageRepository {
 		return this.storage.setItem(PersistentStorageRepository.STORAGE_KEYS.SELECTED_LANGUAGE, payload);
 	};
 
+	/**
+	 * Get the multisig accounts.
+	 * @returns {Promise<NetworkObjectMap|null>} A promise that resolves to the multisig accounts object or null if not set.
+	 */
+	getMultisigAccounts = async () => {
+		const json = await this.storage.getItem(PersistentStorageRepository.STORAGE_KEYS.MULTISIG_ACCOUNTS);
+
+		return decodeJson(json);
+	};
+
+	/**
+	 * Set the multisig accounts.
+	 * @param {NetworkObjectMap} payload - The multisig accounts object to set.
+	 * @returns {Promise<void>} A promise that resolves when the multisig accounts are set.
+	 */
+	setMultisigAccounts = async payload => {
+		return this.storage.setItem(PersistentStorageRepository.STORAGE_KEYS.MULTISIG_ACCOUNTS, JSON.stringify(payload));
+	};
+
 	/**
 	 * Clears all data managed by this repository from storage.
 	 * @returns {Promise<void>} A promise that resolves when all items have been removed.
 
@@ -136,6 +136,39 @@ const storageTestConfig = [
 		setterName: 'setNetworkProperties',
 		setterArguments: [jsonObject],
 		storagePayload: jsonString
+	},
+	{
+		key: 'MULTISIG_ACCOUNTS',
+		getterName: 'getMultisigAccounts',
+		emptyStorageValue: null,
+		expectedEmptyValue: null,
+		filledStorageValue: jsonString,
+		expectedFilledValue: jsonObject,
+		setterName: 'setMultisigAccounts',
+		setterArguments: [jsonObject],
+		storagePayload: jsonString
+	},
+	{
+		key: 'HARVESTING_STATUSES',
+		getterName: 'getHarvestingStatuses',
+		emptyStorageValue: null,
+		expectedEmptyValue: null,
+		filledStorageValue: jsonString,
+		expectedFilledValue: jsonObject,
+		setterName: 'setHarvestingStatuses',
+		setterArguments: [jsonObject],
+		storagePayload: jsonString
+	},
+	{
+		key: 'HARVESTING_SUMMARIES',
+		getterName: 'getHarvestingSummaries',
+		emptyStorageValue: null,
+		expectedEmptyValue: null,
+		filledStorageValue: jsonString,
+		expectedFilledValue: jsonObject,
+		setterName: 'setHarvestingSummaries',
+		setterArguments: [jsonObject],
+		storagePayload: jsonString
 	}
 ];
 
 
@@ -20,6 +20,7 @@ const defaultParameters = {
 		},
 		transaction: {
 			fetchAccountTransactions: jest.fn().mockResolvedValue([]),
+			fetchAccountTransaction: jest.fn().mockResolvedValue(),
 			fetchTransactionStatus: jest.fn().mockResolvedValue({}),
 			announceTransaction: jest.fn().mockResolvedValue(),
 			announceTransactionBundle: jest.fn().mockResolvedValue()
@@ -432,7 +433,7 @@ describe('WalletController', () => {
 			expect(walletController._state.walletAccounts).toStrictEqual(expectedWalletAccounts);
 			if (shouldRemoveFromExternalKeystore) {
 				expect(walletController._keystores.external.removeAccount)
-					.toHaveBeenCalledWith(accountToRemove.networkIdentifier, accountToRemove.publicKey, password);
+					.toHaveBeenCalledWith(accountToRemove.publicKey, accountToRemove.networkIdentifier, password);
 			} else {
 				expect(walletController._keystores.external.removeAccount)
 					.not.toHaveBeenCalled();
@@ -658,24 +659,40 @@ describe('WalletController', () => {
 				controllerMethodName: 'fetchTransactionStatus',
 				controllerMethodArguments: ['hash-123'],
 				apiNamespaceName: 'transaction',
-				apiMethodName: 'fetchTransactionStatus'
+				apiMethodName: 'fetchTransactionStatus',
+				createApiMethodArgs: wc => [wc.networkProperties, 'hash-123']
+			},
+			{
+				controllerMethodName: 'fetchAccountTransaction',
+				controllerMethodArguments: ['hash-123'],
+				apiNamespaceName: 'transaction',
+				apiMethodName: 'fetchAccountTransaction',
+				createApiMethodArgs: wc => [wc.networkProperties, wc.currentAccount, 'hash-123']
 			},
 			{
 				controllerMethodName: 'announceSignedTransaction',
 				controllerMethodArguments: ['signed-transaction-object', 'group'],
 				apiNamespaceName: 'transaction',
-				apiMethodName: 'announceTransaction'
+				apiMethodName: 'announceTransaction',
+				createApiMethodArgs: wc => [wc.networkProperties, 'signed-transaction-object', 'group']
 			},
 			{
 				controllerMethodName: 'announceSignedTransactionBundle',
 				controllerMethodArguments: ['signed-transaction-bundle-object', 'group'],
 				apiNamespaceName: 'transaction',
-				apiMethodName: 'announceTransactionBundle'
+				apiMethodName: 'announceTransactionBundle',
+				createApiMethodArgs: wc => [wc.networkProperties, 'signed-transaction-bundle-object', 'group']
 			}
 		];
 		const runNetworkApiProxyTests = async config => {
 			// Arrange:
-			const { controllerMethodName, controllerMethodArguments, apiNamespaceName, apiMethodName } = config;
+			const {
+				controllerMethodName,
+				controllerMethodArguments,
+				apiNamespaceName,
+				apiMethodName,
+				createApiMethodArgs
+			} = config;
 			describe(`${controllerMethodName}()`, () => {
 				it(`calls api.${apiNamespaceName}.${apiMethodName}() with correct arguments`, async () => {
 					walletController._state = cloneDeep(filledState);
@@ -689,7 +706,7 @@ describe('WalletController', () => {
 					// Assert:
 					expect(result).toStrictEqual(expectedReturnValue);
 					expect(walletController._api[apiNamespaceName][apiMethodName])
-						.toHaveBeenCalledWith(walletController._state.networkProperties, ...controllerMethodArguments);
+						.toHaveBeenCalledWith(...createApiMethodArgs(walletController));
 				});
 			});
 		};
 
@@ -39,6 +39,24 @@ export class TransactionService {
 		return this.resolveTransactionDTOs(networkProperties, transactionDTOs, account);
 	};
 
+	/**
+	 * Fetches transaction info by hash.
+	 * @param {NetworkProperties} networkProperties - Network properties.
+	 * @param {PublicAccount} currentAccount - Current account.
+	 * @param {string} hash - Requested transaction hash.
+	 * @returns {Promise<Transaction>} - The transaction info.
+	 */
+	fetchAccountTransaction = async (networkProperties, currentAccount, transactionHash) => {
+		const provider = createEthereumJrpcProvider(networkProperties);
+
+		const transaction = await provider.getTransaction(transactionHash);
+
+		if (!transaction) 
+			throw new ApiError(`Transaction with hash ${transactionHash} not found`);
+
+		return this.resolveTransactionDTOs(networkProperties, [transaction], currentAccount);
+	};
+
 	/**
 	 * Fetches the status of a transaction.
 	 * @param {NetworkProperties} networkProperties - Network properties.
 
@@ -93,6 +93,48 @@ describe('api/TransactionService', () => {
 		});
 	});
 
+	describe('fetchAccountTransaction', () => {
+		it('fetches transaction by hash and resolves it', async () => {
+			// Arrange:
+			const transactionHash = '0xHASH123';
+			const transactionDTO = { hash: transactionHash, from: currentAccount.address };
+			const resolvedTransactions = [{ id: 'tx1' }];
+			const provider = {
+				getTransaction: jest.fn().mockResolvedValue(transactionDTO)
+			};
+			createEthereumJrpcProviderMock.mockReturnValue(provider);
+
+			const service = createService();
+			const resolveSpy = jest
+				.spyOn(service, 'resolveTransactionDTOs')
+				.mockResolvedValue(resolvedTransactions);
+
+			// Act:
+			const result = await service.fetchAccountTransaction(networkProperties, currentAccount, transactionHash);
+
+			// Assert:
+			expect(createEthereumJrpcProviderMock).toHaveBeenCalledWith(networkProperties);
+			expect(provider.getTransaction).toHaveBeenCalledWith(transactionHash);
+			expect(resolveSpy).toHaveBeenCalledWith(networkProperties, [transactionDTO], currentAccount);
+			expect(result).toBe(resolvedTransactions);
+		});
+
+		it('throws ApiError when transaction is not found', async () => {
+			// Arrange:
+			const transactionHash = '0xMISSING';
+			const provider = {
+				getTransaction: jest.fn().mockResolvedValue(null)
+			};
+			createEthereumJrpcProviderMock.mockReturnValue(provider);
+
+			const service = createService();
+
+			// Act & Assert:
+			await expect(service.fetchAccountTransaction(networkProperties, currentAccount, transactionHash))
+				.rejects.toThrow(`Transaction with hash ${transactionHash} not found`);
+		});
+	});
+
 	describe('announceTransaction', () => {
 		it('announces transaction and returns hash', async () => {
 			// Arrange:
 
@@ -79,7 +79,13 @@ export class AccountService {
 			namespaces: namespaces.value,
 			isMultisig: isMultisigRequestSucceeded && multisigInfo.value.cosignatories.length > 0,
 			cosignatories: isMultisigRequestSucceeded ? multisigInfo.value.cosignatories : [],
-			multisigAddresses: isMultisigRequestSucceeded ? multisigInfo.value.multisigAddresses : []
+			multisigAddresses: isMultisigRequestSucceeded ? multisigInfo.value.multisigAddresses : [],
+			...(isMultisigRequestSucceeded
+				? {
+					minApproval: multisigInfo.value.minApproval,
+					minRemoval: multisigInfo.value.minRemoval
+				}
+				: {})
 		};
 	};