From 44658fcccd9120836f693b9b721376d86cf09848 Mon Sep 17 00:00:00 2001
From: Logan Nguyen <logan.nguyen@swirldslabs.com>
Date: Fri, 22 Sep 2023 23:54:52 -0500
Subject: [PATCH] dapp-refactor: reorganized shared items (#420) (#422)

* dapp-refactor: moved /hooks folder to /src folder

Signed-off-by: Logan Nguyen <logan.nguyen@swirldslabs.com>

* dapp-refactor: moved handleRetrievingTransactionResultsFromLocalStorage and handleSanitizeFormInputs to main common shared method folder

Signed-off-by: Logan Nguyen <logan.nguyen@swirldslabs.com>

* dapp-refactor: moved erc/hooks to main hooks folder and erc/methods to main methods folder

Signed-off-by: Logan Nguyen <logan.nguyen@swirldslabs.com>

* dapp-refactor: moved prepareInfoValuesToShow() and TransactionResultTable() to its main shared folder

Signed-off-by: Logan Nguyen <logan.nguyen@swirldslabs.com>

* dapp-refactor: reorganized token-create-custom

Signed-off-by: Logan Nguyen <logan.nguyen@swirldslabs.com>

* dapp-update: reused copyContentToClipboard where needed

Signed-off-by: Logan Nguyen <logan.nguyen@swirldslabs.com>

* dapp-update: renamed handleRemoveRecord to handleRemoveMapRecord

Signed-off-by: Logan Nguyen <logan.nguyen@swirldslabs.com>

* dapp-update: renamed navsidebar

Signed-off-by: Logan Nguyen <logan.nguyen@swirldslabs.com>

* dapp-update: renamed interfaces and types

Signed-off-by: Logan Nguyen <logan.nguyen@swirldslabs.com>

* dapp-refactor: moved ITransactionResult && ISmartContractExecutionResult to a shared type folder

Signed-off-by: Logan Nguyen <logan.nguyen@swirldslabs.com>

* dapp-update: replaced IExchangeRateContractResult & IPRNGContractResult with ISmartContractExecutionResult

Signed-off-by: Logan Nguyen <logan.nguyen@swirldslabs.com>

---------

Signed-off-by: Logan Nguyen <logan.nguyen@swirldslabs.com>
---
 .../__tests__/hedera/helper/index.test.ts     |  4 -
 .../token-create-custom/index.test.ts         |  9 +-
 .../token-management-contract/index.test.ts   | 11 +--
 .../token-transfer-contract/index.test.ts     |  4 -
 .../__tests__/hedera/index.test.ts            |  4 +-
 .../__tests__/mirror-node/index.test.ts       | 14 ++--
 .../src/api/ethers/index.ts                   | 16 ++--
 .../api/hedera/erc20-interactions/index.ts    | 20 ++---
 .../api/hedera/erc721-interactions/index.ts   | 32 ++++----
 .../exchange-rate-interactions/index.ts       |  5 +-
 .../tokenCreateCustom-interactions/index.ts   | 81 +++++++-----------
 .../tokenManagement-interactions/index.ts     | 82 ++++++++-----------
 .../tokenQuery-interactions/index.ts          | 47 ++++-------
 .../tokenTransfer-interactions/index.ts       | 32 +++-----
 .../src/api/hedera/ihrc-interactions/index.ts |  6 +-
 .../src/api/hedera/index.ts                   | 14 ++--
 .../src/api/hedera/prng-interactions/index.ts |  9 +-
 .../src/api/mirror-node/index.ts              | 10 +--
 .../src/api/wallet/index.ts                   | 22 ++---
 .../src/app/activity/layout.tsx               |  6 +-
 .../src/app/hedera/layout.tsx                 |  6 +-
 .../common/{ => components}/AlertDialog.tsx   |  0
 .../common/{ => components}/ConfirmModal.tsx  |  0
 .../HederaCommonTextField.tsx                 |  0
 .../{ => components}/MultiLineMethod.tsx      |  0
 .../common/{ => components}/OneLineMethod.tsx |  0
 .../components/TransactionResultTable.tsx     | 29 +++----
 .../erc/shared => common}/methods/common.tsx  |  2 +-
 .../methods/handleAPIErrors.tsx               |  4 +-
 ...vingTransactionResultsFromLocalStorage.tsx |  8 +-
 .../methods/handleSanitizeFormInputs.tsx      |  3 +-
 .../methods/prepareInfoValuesToShow.tsx       |  0
 .../erc/deployment/ERCDeployField.tsx         |  2 +-
 .../erc/erc-20/methods/balance-of/index.tsx   |  6 +-
 .../erc/erc-20/methods/mint/index.tsx         | 10 +--
 .../methods/token-information/index.tsx       |  2 +-
 .../erc-20/methods/token-permission/index.tsx | 14 ++--
 .../erc-20/methods/token-transfer/index.tsx   | 12 +--
 .../erc/erc-721/methods/approve/index.tsx     | 18 ++--
 .../erc/erc-721/methods/balance-of/index.tsx  |  6 +-
 .../erc/erc-721/methods/mint/index.tsx        | 12 +--
 .../methods/operator-approve/index.tsx        | 14 ++--
 .../erc/erc-721/methods/owner-of/index.tsx    |  6 +-
 .../methods/token-information/index.tsx       |  2 +-
 .../erc-721/methods/token-transfer/index.tsx  | 12 +--
 .../erc/erc-721/methods/token-uri/index.tsx   |  6 +-
 .../deployment/ExchangeRateDeployField.tsx    |  8 +-
 .../exchange-rate/methods/index.tsx           | 20 ++---
 .../hts/shared/components/SigningKeysForm.tsx | 22 ++---
 .../components/TokenGeneralInfoModal.tsx      |  2 +-
 .../components/TokenSpecificInfoModal.tsx     |  3 +-
 .../hts/shared/methods/signingKeys.tsx        | 20 ++---
 .../hts/shared/states/commonStates.ts         |  5 --
 .../index.tsx}                                | 26 +++---
 .../index.tsx}                                | 32 ++++----
 .../index.tsx}                                | 24 +++---
 .../index.tsx}                                | 26 +++---
 .../index.tsx}                                | 32 ++++----
 .../hts/token-create-custom/methods/index.tsx |  4 +-
 .../methods/manageTokenDelete/index.tsx       | 20 ++---
 .../methods/manageTokenInfo/TokenKeysForm.tsx | 17 +---
 .../methods/manageTokenInfo/index.tsx         | 33 +++-----
 .../methods/manageTokenPermission/index.tsx   | 20 ++---
 .../methods/manageTokenRelation/index.tsx     | 20 ++---
 .../methods/manageTokenStatus/index.tsx       | 18 ++--
 .../manageTokenSupplyReduction/index.tsx      | 20 ++---
 .../methods/querySpecificToken/index.tsx      | 16 ++--
 .../methods/queryTokenGeneralInfo/index.tsx   | 18 ++--
 .../methods/queryTokenPermission/index.tsx    | 18 ++--
 .../methods/queryTokenStatus/index.tsx        | 20 ++---
 .../methods/queryTokenValidity/index.tsx      | 18 ++--
 .../helpers/prepareCryptoTransferValues.ts    |  5 --
 .../method/transferCrypto/index.tsx           | 22 ++---
 .../method/transferMultipleTokens/index.tsx   | 22 ++---
 .../method/transferSingleToken/index.tsx      | 20 ++---
 .../ihrc/methods/index.tsx                    | 16 ++--
 .../components/contract-interaction/index.tsx | 19 +++--
 .../prng/methods/index.tsx                    | 18 ++--
 .../src/components/navbar/index.tsx           |  6 +-
 .../{leftSideBar => sidebar}/index.tsx        |  8 +-
 .../src/components/wallet-popup/index.tsx     | 11 +--
 ...useFilterTransactionsByContractAddress.tsx |  4 +-
 .../hooks/usePaginatedTxResults.tsx           |  6 +-
 .../useRetrieveMapValueFromLocalStorage.tsx   |  0
 .../shared => }/hooks/useToastSuccessful.tsx  | 19 ++---
 .../hooks/useUpdateLocalStorage.tsx           |  4 +-
 .../hooks/useUpdateMapStateUILocalStorage.tsx | 10 +--
 .../src/sections/activity/index.tsx           | 13 +--
 .../src/sections/overview/index.tsx           |  4 +-
 .../src/types/common/index.d.ts               | 26 +++---
 .../ExchangeRate/index.d.ts                   | 26 ------
 .../contract-interactions/HTS/index.d.ts      | 51 +-----------
 .../contract-interactions/PRNG/index.d.ts     | 26 ------
 .../contract-interactions/erc/index.d.ts      |  2 +-
 .../contract-interactions/shared/index.d.ts   | 70 ++++++++++++++++
 .../src/utils/common/constants.ts             | 28 +++----
 .../src/utils/common/helpers.ts               | 10 +--
 .../contract-interactions/HTS/helpers.ts      | 29 ++-----
 .../HTS/token-create-custom/constant.ts       | 27 +++---
 .../HTS/token-management/constant.ts          |  7 +-
 100 files changed, 683 insertions(+), 890 deletions(-)
 rename system-contract-dapp-playground/src/components/common/{ => components}/AlertDialog.tsx (100%)
 rename system-contract-dapp-playground/src/components/common/{ => components}/ConfirmModal.tsx (100%)
 rename system-contract-dapp-playground/src/components/common/{ => components}/HederaCommonTextField.tsx (100%)
 rename system-contract-dapp-playground/src/components/common/{ => components}/MultiLineMethod.tsx (100%)
 rename system-contract-dapp-playground/src/components/common/{ => components}/OneLineMethod.tsx (100%)
 rename system-contract-dapp-playground/src/components/{contract-interaction/hts/shared => common}/components/TransactionResultTable.tsx (96%)
 rename system-contract-dapp-playground/src/components/{contract-interaction/erc/shared => common}/methods/common.tsx (90%)
 rename system-contract-dapp-playground/src/components/{contract-interaction/hts/shared => common}/methods/handleAPIErrors.tsx (95%)
 rename system-contract-dapp-playground/src/components/{contract-interaction/hts/shared => common}/methods/handleRetrievingTransactionResultsFromLocalStorage.tsx (85%)
 rename system-contract-dapp-playground/src/components/{contract-interaction/hts/shared => common}/methods/handleSanitizeFormInputs.tsx (99%)
 rename system-contract-dapp-playground/src/components/{contract-interaction/hts/shared => common}/methods/prepareInfoValuesToShow.tsx (100%)
 rename system-contract-dapp-playground/src/components/contract-interaction/hts/token-create-custom/methods/{AssociateHederaToken.tsx => AssociateHederaToken/index.tsx} (89%)
 rename system-contract-dapp-playground/src/components/contract-interaction/hts/token-create-custom/methods/{FungibleTokenCreate.tsx => FungibleTokenCreate/index.tsx} (92%)
 rename system-contract-dapp-playground/src/components/contract-interaction/hts/token-create-custom/methods/{GrantTokenKYC.tsx => GrantTokenKYC/index.tsx} (88%)
 rename system-contract-dapp-playground/src/components/contract-interaction/hts/token-create-custom/methods/{MintHederaToken.tsx => MintHederaToken/index.tsx} (90%)
 rename system-contract-dapp-playground/src/components/contract-interaction/hts/token-create-custom/methods/{NonFungibleTokenCreate.tsx => NonFungibleTokenCreate/index.tsx} (90%)
 rename system-contract-dapp-playground/src/components/{leftSideBar => sidebar}/index.tsx (90%)
 rename system-contract-dapp-playground/src/{components/contract-interaction/hts/shared => }/hooks/useFilterTransactionsByContractAddress.tsx (89%)
 rename system-contract-dapp-playground/src/{components/contract-interaction/hts/shared => }/hooks/usePaginatedTxResults.tsx (87%)
 rename system-contract-dapp-playground/src/{components/contract-interaction/erc/shared => }/hooks/useRetrieveMapValueFromLocalStorage.tsx (100%)
 rename system-contract-dapp-playground/src/{components/contract-interaction/hts/shared => }/hooks/useToastSuccessful.tsx (89%)
 rename system-contract-dapp-playground/src/{components/contract-interaction/hts/shared => }/hooks/useUpdateLocalStorage.tsx (90%)
 rename system-contract-dapp-playground/src/{components/contract-interaction/erc/shared => }/hooks/useUpdateMapStateUILocalStorage.tsx (96%)
 delete mode 100644 system-contract-dapp-playground/src/types/contract-interactions/ExchangeRate/index.d.ts
 delete mode 100644 system-contract-dapp-playground/src/types/contract-interactions/PRNG/index.d.ts
 create mode 100644 system-contract-dapp-playground/src/types/contract-interactions/shared/index.d.ts

diff --git a/system-contract-dapp-playground/__tests__/hedera/helper/index.test.ts b/system-contract-dapp-playground/__tests__/hedera/helper/index.test.ts
index 617ab24ea..30e9029ac 100644
--- a/system-contract-dapp-playground/__tests__/hedera/helper/index.test.ts
+++ b/system-contract-dapp-playground/__tests__/hedera/helper/index.test.ts
@@ -23,10 +23,6 @@ import {
   DEFAULT_IHTS_KEY_VALUE,
   KEY_TYPE_MAP,
 } from '@/utils/contract-interactions/HTS/token-create-custom/constant';
-import {
-  IHederaTokenServiceKeyType,
-  IHederaTokenServiceKeyValueType,
-} from '@/types/contract-interactions/HTS';
 
 describe('constructIHederaTokenKey test suite', () => {
   // mock contractId & compressedPubKey
diff --git a/system-contract-dapp-playground/__tests__/hedera/hts-interactions/token-create-custom/index.test.ts b/system-contract-dapp-playground/__tests__/hedera/hts-interactions/token-create-custom/index.test.ts
index e1dcfcb24..ae51dd01d 100644
--- a/system-contract-dapp-playground/__tests__/hedera/hts-interactions/token-create-custom/index.test.ts
+++ b/system-contract-dapp-playground/__tests__/hedera/hts-interactions/token-create-custom/index.test.ts
@@ -27,7 +27,6 @@ import {
   createHederaNonFungibleToken,
   associateHederaTokensToAccounts,
 } from '@/api/hedera/hts-interactions/tokenCreateCustom-interactions';
-import { CommonKeyObject } from '@/types/contract-interactions/HTS';
 import { MOCK_TOKEN_ADDRESS, MOCK_TX_HASH } from '../../../utils/common/constants';
 
 describe('createHederaFungibleToken test suite', () => {
@@ -83,8 +82,8 @@ describe('createHederaFungibleToken test suite', () => {
     createNonFungibleTokenWithCustomFeesPublic: jest.fn().mockResolvedValue(mockResolvedValue),
   };
 
-  // mock inputKeys with CommonKeyObject[] type
-  const inputKeys: CommonKeyObject[] = [
+  // mock inputKeys with ICommonKeyObject[] type
+  const inputKeys: ICommonKeyObject[] = [
     {
       keyType: 'ADMIN',
       keyValueType: 'contractId',
@@ -261,7 +260,7 @@ describe('createHederaFungibleToken test suite', () => {
     });
 
     it('should execute createHederaFungibleToken and return error if inputKeys is invalid ', async () => {
-      const failedKeys: CommonKeyObject[] = [
+      const failedKeys: ICommonKeyObject[] = [
         {
           keyType: 'ADMIN',
           keyValueType: 'contractId',
@@ -395,7 +394,7 @@ describe('createHederaFungibleToken test suite', () => {
     });
 
     it('should execute createHederaNonFungibleToken and return error if inputKeys is invalid ', async () => {
-      const failedKeys: CommonKeyObject[] = [
+      const failedKeys: ICommonKeyObject[] = [
         {
           keyType: 'ADMIN',
           keyValueType: 'contractId',
diff --git a/system-contract-dapp-playground/__tests__/hedera/hts-interactions/token-management-contract/index.test.ts b/system-contract-dapp-playground/__tests__/hedera/hts-interactions/token-management-contract/index.test.ts
index 7dc94ea10..426cc53f9 100644
--- a/system-contract-dapp-playground/__tests__/hedera/hts-interactions/token-management-contract/index.test.ts
+++ b/system-contract-dapp-playground/__tests__/hedera/hts-interactions/token-management-contract/index.test.ts
@@ -18,6 +18,7 @@
  *
  */
 
+import { Contract } from 'ethers';
 import {
   manageTokenStatus,
   manageTokenRelation,
@@ -25,12 +26,6 @@ import {
   manageTokenInfomation,
   manageTokenPermission,
 } from '@/api/hedera/hts-interactions/tokenManagement-interactions';
-import {
-  CommonKeyObject,
-  IHederaTokenServiceExpiry,
-  IHederaTokenServiceHederaToken,
-} from '@/types/contract-interactions/HTS';
-import { Contract } from 'ethers';
 import {
   MOCK_CONTRACT_ID,
   MOCK_GAS_LIMIT,
@@ -68,8 +63,8 @@ describe('TokenManagementContract test suite', () => {
     expiry: tokenExpiry,
   };
 
-  // mock inputKeys with CommonKeyObject[] type
-  const tokenKeys: CommonKeyObject[] = [
+  // mock inputKeys with ICommonKeyObject[] type
+  const tokenKeys: ICommonKeyObject[] = [
     {
       keyType: 'ADMIN',
       keyValueType: 'contractId',
diff --git a/system-contract-dapp-playground/__tests__/hedera/hts-interactions/token-transfer-contract/index.test.ts b/system-contract-dapp-playground/__tests__/hedera/hts-interactions/token-transfer-contract/index.test.ts
index 149cf337a..f2d6755e1 100644
--- a/system-contract-dapp-playground/__tests__/hedera/hts-interactions/token-transfer-contract/index.test.ts
+++ b/system-contract-dapp-playground/__tests__/hedera/hts-interactions/token-transfer-contract/index.test.ts
@@ -19,10 +19,6 @@
  */
 
 import { Contract } from 'ethers';
-import {
-  IHederaTokenServiceTokenTransferList,
-  IHederaTokenServiceTransferList,
-} from '@/types/contract-interactions/HTS';
 import {
   MOCK_RESPONSE_CODE,
   MOCK_TX_HASH,
diff --git a/system-contract-dapp-playground/__tests__/hedera/index.test.ts b/system-contract-dapp-playground/__tests__/hedera/index.test.ts
index 0e0f7cf62..ecc5ec165 100644
--- a/system-contract-dapp-playground/__tests__/hedera/index.test.ts
+++ b/system-contract-dapp-playground/__tests__/hedera/index.test.ts
@@ -20,7 +20,7 @@
 
 import { ContractFactory } from 'ethers';
 import { deploySmartContract } from '@/api/hedera';
-import { HederaSmartContractResult } from '@/types/common';
+import { IHederaSmartContractResult } from '@/types/common';
 import { HEDERA_SMART_CONTRACTS_ASSETS } from '@/utils/common/constants';
 import { MOCK_CONTRACT_ID, MOCK_TX_HASH } from '../utils/common/constants';
 
@@ -74,7 +74,7 @@ describe('deploySmartContract', () => {
     (ContractFactory as unknown as jest.Mock).mockImplementation(() => mockContract);
 
     // execute deploySmartContract API
-    const result: HederaSmartContractResult = await deploySmartContract(
+    const result: IHederaSmartContractResult = await deploySmartContract(
       contractABI,
       contractBytecode,
       deployParams
diff --git a/system-contract-dapp-playground/__tests__/mirror-node/index.test.ts b/system-contract-dapp-playground/__tests__/mirror-node/index.test.ts
index 6a1ee89b6..6e4000572 100644
--- a/system-contract-dapp-playground/__tests__/mirror-node/index.test.ts
+++ b/system-contract-dapp-playground/__tests__/mirror-node/index.test.ts
@@ -19,7 +19,7 @@
  */
 
 import { getHederaNativeIDFromEvmAddress } from '@/api/mirror-node';
-import { NetworkName } from '@/types/common';
+import { TNetworkName } from '@/types/common';
 import { HEDERA_NETWORKS } from '@/utils/common/constants';
 import axios from 'axios';
 import MockAdapter from 'axios-mock-adapter';
@@ -30,7 +30,7 @@ const RestMock = new MockAdapter(axios);
 describe('getHederaNativeIDFromEvmAddress calls the correct mirror URL', () => {
   it('should match mirror-node url dynamically based on different networks', async () => {
     const evmAddress = '0xCC07a8243578590d55c5708D7fB453245350Cc2A';
-    const networks: NetworkName[] = ['mainnet', 'testnet', 'previewnet', 'localnet'];
+    const networks: TNetworkName[] = ['mainnet', 'testnet', 'previewnet', 'localnet'];
 
     networks.forEach((network) => {
       const experimentUrl = `${HEDERA_NETWORKS[network].mirrorNodeUrl}/accounts/${evmAddress}`;
@@ -47,7 +47,7 @@ describe('getHederaNativeIDFromEvmAddress calls the correct mirror URL', () => {
 
   it('should match mirror-node url dynamically based on different params', async () => {
     const evmAddress = '0xCC07a8243578590d55c5708D7fB453245350Cc2A';
-    const network: NetworkName = 'mainnet';
+    const network: TNetworkName = 'mainnet';
     const params = ['accounts', 'contracts'];
 
     params.forEach((param) => {
@@ -61,7 +61,7 @@ describe('getHederaNativeIDFromEvmAddress calls the correct mirror URL', () => {
   it('should call the correct mirror node URL when a network environment is set', async () => {
     const accountParam = 'accounts';
     const contractParam = 'contracts';
-    const network: NetworkName = 'testnet';
+    const network: TNetworkName = 'testnet';
     const expectedHederaNativeId = '0.0.445445';
     const evmAddress = '0xCC07a8243578590d55c5708D7fB453245350Cc2A';
 
@@ -75,11 +75,7 @@ describe('getHederaNativeIDFromEvmAddress calls the correct mirror URL', () => {
     RestMock.onGet(expectedContractUrl).reply(200, mockContractResponse);
 
     const accountResult = await getHederaNativeIDFromEvmAddress(evmAddress, network, accountParam);
-    const contractResult = await getHederaNativeIDFromEvmAddress(
-      evmAddress,
-      network,
-      contractParam
-    );
+    const contractResult = await getHederaNativeIDFromEvmAddress(evmAddress, network, contractParam);
 
     expect(accountResult.accountId).toBe(expectedHederaNativeId);
     expect(contractResult.contractId).toBe(expectedHederaNativeId);
diff --git a/system-contract-dapp-playground/src/api/ethers/index.ts b/system-contract-dapp-playground/src/api/ethers/index.ts
index ed21ba70f..3898b22d8 100644
--- a/system-contract-dapp-playground/src/api/ethers/index.ts
+++ b/system-contract-dapp-playground/src/api/ethers/index.ts
@@ -20,21 +20,21 @@
 
 import { ethers } from 'ethers';
 import { getWalletProvider } from '../wallet';
-import { ContractABI, EthersResult } from '@/types/common';
+import { IContractABI, IEthersResult } from '@/types/common';
 
 /**
  * @dev generate a new ethers.Contract instance at contractAddress
  *
  * @param contractAddress: string
  *
- * @param contractABI: ContractABI[]
+ * @param contractABI: IContractABI[]
  *
- * @return Promise<EthersResult>
+ * @return Promise<IEthersResult>
  */
 export const generateBaseContractInstance = async (
   contractAddress: string,
-  contractABI: ContractABI[]
-): Promise<EthersResult> => {
+  contractABI: IContractABI[]
+): Promise<IEthersResult> => {
   // get wallet provider
   const walletProvider = getWalletProvider();
   if (walletProvider.err || !walletProvider.walletProvider) {
@@ -46,11 +46,7 @@ export const generateBaseContractInstance = async (
     const walletSigner = await walletProvider.walletProvider.getSigner();
 
     // generate a new ethers.Contract instance
-    const baseContract = new ethers.Contract(
-      contractAddress,
-      JSON.stringify(contractABI),
-      walletSigner
-    );
+    const baseContract = new ethers.Contract(contractAddress, JSON.stringify(contractABI), walletSigner);
 
     return { baseContract };
   } catch (err) {
diff --git a/system-contract-dapp-playground/src/api/hedera/erc20-interactions/index.ts b/system-contract-dapp-playground/src/api/hedera/erc20-interactions/index.ts
index a08922bce..712bbf4fb 100644
--- a/system-contract-dapp-playground/src/api/hedera/erc20-interactions/index.ts
+++ b/system-contract-dapp-playground/src/api/hedera/erc20-interactions/index.ts
@@ -29,12 +29,12 @@ import { Contract, isAddress } from 'ethers';
  *
  * @param method: 'name' | 'symbol' | 'totalSupply' | 'decimals'
  *
- * @return Promise<ERCSmartContractResult>
+ * @return Promise<IERCSmartContractResult>
  */
 export const getERC20TokenInformation = async (
   baseContract: Contract,
   method: 'name' | 'symbol' | 'totalSupply' | 'decimals'
-): Promise<ERCSmartContractResult> => {
+): Promise<IERCSmartContractResult> => {
   try {
     switch (method) {
       case 'name':
@@ -61,13 +61,13 @@ export const getERC20TokenInformation = async (
  *
  * @param tokenAmount: number
  *
- * @return Promise<ERCSmartContractResult>
+ * @return Promise<IERCSmartContractResult>
  */
 export const erc20Mint = async (
   baseContract: Contract,
   recipientAddress: string,
   tokenAmount: number
-): Promise<ERCSmartContractResult> => {
+): Promise<IERCSmartContractResult> => {
   if (!isAddress(recipientAddress)) {
     return { err: 'Invalid recipient address' };
   } else if (tokenAmount <= 0) {
@@ -90,12 +90,12 @@ export const erc20Mint = async (
  *
  * @param accountAddress: address
  *
- * @return Promise<ERCSmartContractResult>
+ * @return Promise<IERCSmartContractResult>
  */
 export const balanceOf = async (
   baseContract: Contract,
   accountAddress: string
-): Promise<ERCSmartContractResult> => {
+): Promise<IERCSmartContractResult> => {
   if (!isAddress(accountAddress)) {
     return { err: 'Invalid account address' };
   }
@@ -129,7 +129,7 @@ export const balanceOf = async (
  *
  * @param amount?: number
  *
- * @return Promise<ERCSmartContractResult>
+ * @return Promise<IERCSmartContractResult>
  */
 export const handleErc20TokenPermissions = async (
   baseContract: Contract,
@@ -137,7 +137,7 @@ export const handleErc20TokenPermissions = async (
   spenderAddress: string,
   ownerAddress?: string,
   amount?: number
-): Promise<ERCSmartContractResult> => {
+): Promise<IERCSmartContractResult> => {
   // sanitize params
   if (ownerAddress && !isAddress(ownerAddress)) {
     return { err: 'Invalid owner address' };
@@ -188,7 +188,7 @@ export const handleErc20TokenPermissions = async (
  *
  * @param tokenOwnerAddress?: address
  *
- * @return Promise<ERCSmartContractResult>
+ * @return Promise<IERCSmartContractResult>
  */
 export const erc20Transfers = async (
   baseContract: Contract,
@@ -196,7 +196,7 @@ export const erc20Transfers = async (
   recipientAddress: string,
   amount: number,
   tokenOwnerAddress?: string
-): Promise<ERCSmartContractResult> => {
+): Promise<IERCSmartContractResult> => {
   if (method === 'transferFrom' && !isAddress(tokenOwnerAddress)) {
     return { err: 'Invalid token owner address' };
   } else if (!isAddress(recipientAddress)) {
diff --git a/system-contract-dapp-playground/src/api/hedera/erc721-interactions/index.ts b/system-contract-dapp-playground/src/api/hedera/erc721-interactions/index.ts
index e33bb619a..d3ff95435 100644
--- a/system-contract-dapp-playground/src/api/hedera/erc721-interactions/index.ts
+++ b/system-contract-dapp-playground/src/api/hedera/erc721-interactions/index.ts
@@ -29,12 +29,12 @@ import { Contract, ethers, isAddress } from 'ethers';
  *
  * @param method: 'name' | 'symbol'
  *
- * @return Promise<ERCSmartContractResult>
+ * @return Promise<IERCSmartContractResult>
  */
 export const getERC721TokenInformation = async (
   baseContract: Contract,
   method: 'name' | 'symbol'
-): Promise<ERCSmartContractResult> => {
+): Promise<IERCSmartContractResult> => {
   try {
     switch (method) {
       case 'name':
@@ -55,12 +55,12 @@ export const getERC721TokenInformation = async (
  *
  * @param tokenId: number
  *
- * @return Promise<ERCSmartContractResult>
+ * @return Promise<IERCSmartContractResult>
  */
 export const erc721TokenURI = async (
   baseContract: Contract,
   tokenId: number
-): Promise<ERCSmartContractResult> => {
+): Promise<IERCSmartContractResult> => {
   if (tokenId < 0) {
     return { err: 'Invalid token amount' };
   }
@@ -82,13 +82,13 @@ export const erc721TokenURI = async (
  *
  * @param tokenId: number
  *
- * @return Promise<ERCSmartContractResult>
+ * @return Promise<IERCSmartContractResult>
  */
 export const erc721Mint = async (
   baseContract: Contract,
   recipientAddress: string,
   tokenId: number
-): Promise<ERCSmartContractResult> => {
+): Promise<IERCSmartContractResult> => {
   if (!isAddress(recipientAddress)) {
     return { err: 'Invalid recipient address' };
   } else if (tokenId < 0) {
@@ -111,12 +111,12 @@ export const erc721Mint = async (
  *
  * @param accountAddress: address
  *
- * @return Promise<ERCSmartContractResult>
+ * @return Promise<IERCSmartContractResult>
  */
 export const erc721BalanceOf = async (
   baseContract: Contract,
   accountAddress: string
-): Promise<ERCSmartContractResult> => {
+): Promise<IERCSmartContractResult> => {
   if (!isAddress(accountAddress)) {
     return { err: 'Invalid account address' };
   }
@@ -136,12 +136,12 @@ export const erc721BalanceOf = async (
  *
  * @param tokenId: number
  *
- * @return Promise<ERCSmartContractResult>
+ * @return Promise<IERCSmartContractResult>
  */
 export const erc721OwnerOf = async (
   baseContract: Contract,
   tokenId: number
-): Promise<ERCSmartContractResult> => {
+): Promise<IERCSmartContractResult> => {
   try {
     return { ownerOfRes: (await baseContract.ownerOf(tokenId)).toString() };
   } catch (err) {
@@ -163,14 +163,14 @@ export const erc721OwnerOf = async (
  *
  * @param tokenId: number
  *
- * @return Promise<ERCSmartContractResult>
+ * @return Promise<IERCSmartContractResult>
  */
 export const erc721TokenApprove = async (
   baseContract: Contract,
   method: 'APPROVE' | 'GET_APPROVE',
   spenderAddress: string,
   tokenId: number
-): Promise<ERCSmartContractResult> => {
+): Promise<IERCSmartContractResult> => {
   if (method === 'APPROVE' && !isAddress(spenderAddress)) {
     return { err: 'Invalid account address' };
   }
@@ -204,7 +204,7 @@ export const erc721TokenApprove = async (
  *
  * @param approvalStatus: boolean
  *
- * @return Promise<ERCSmartContractResult>
+ * @return Promise<IERCSmartContractResult>
  */
 export const erc721TokenApproval = async (
   baseContract: Contract,
@@ -212,7 +212,7 @@ export const erc721TokenApproval = async (
   ownerAddress: string,
   operatorAddress: string,
   approvalStatus: boolean
-): Promise<ERCSmartContractResult> => {
+): Promise<IERCSmartContractResult> => {
   if (method === 'IS_APPROVAL' && !isAddress(ownerAddress)) {
     return { err: 'Invalid owner address' };
   } else if (!isAddress(operatorAddress)) {
@@ -256,7 +256,7 @@ export const erc721TokenApproval = async (
  *
  * @param data: string
  *
- * @return Promise<ERCSmartContractResult>
+ * @return Promise<IERCSmartContractResult>
  */
 export const erc721Transfers = async (
   baseContract: Contract,
@@ -265,7 +265,7 @@ export const erc721Transfers = async (
   recipientAddress: string,
   tokenId: number,
   data: string
-): Promise<ERCSmartContractResult> => {
+): Promise<IERCSmartContractResult> => {
   if (!isAddress(senderAddress)) {
     return { err: 'Invalid sender address' };
   } else if (!isAddress(recipientAddress)) {
diff --git a/system-contract-dapp-playground/src/api/hedera/exchange-rate-interactions/index.ts b/system-contract-dapp-playground/src/api/hedera/exchange-rate-interactions/index.ts
index e9338d0e1..6734a8efa 100644
--- a/system-contract-dapp-playground/src/api/hedera/exchange-rate-interactions/index.ts
+++ b/system-contract-dapp-playground/src/api/hedera/exchange-rate-interactions/index.ts
@@ -19,6 +19,7 @@
  */
 
 import { Contract } from 'ethers';
+import { ISmartContractExecutionResult } from '@/types/contract-interactions/shared';
 
 /**
  * @dev handle converting tinycents to tinybars and vice versa
@@ -35,14 +36,14 @@ import { Contract } from 'ethers';
  *
  * @param gasLimit: number
  *
- * @return Promise<ExchangeRateContractResult>
+ * @return Promise<ISmartContractExecutionResult>
  */
 export const handleExchangeRate = async (
   baseContract: Contract,
   API: 'CENT_TO_BAR' | 'BAR_TO_CENT',
   amount: number,
   gasLimit: number
-): Promise<ExchangeRateContractResult> => {
+): Promise<ISmartContractExecutionResult> => {
   // sanitize param
   if (amount < 0) {
     console.error('Amount to convert cannot be negative');
diff --git a/system-contract-dapp-playground/src/api/hedera/hts-interactions/tokenCreateCustom-interactions/index.ts b/system-contract-dapp-playground/src/api/hedera/hts-interactions/tokenCreateCustom-interactions/index.ts
index 74ada729a..9f07d2ee9 100644
--- a/system-contract-dapp-playground/src/api/hedera/hts-interactions/tokenCreateCustom-interactions/index.ts
+++ b/system-contract-dapp-playground/src/api/hedera/hts-interactions/tokenCreateCustom-interactions/index.ts
@@ -23,7 +23,7 @@ import {
   prepareHederaTokenKeyArray,
 } from '@/utils/contract-interactions/HTS/helpers';
 import { Contract, ethers, isAddress } from 'ethers';
-import { CommonKeyObject, SmartContractExecutionResult } from '@/types/contract-interactions/HTS';
+import { ISmartContractExecutionResult } from '@/types/contract-interactions/shared';
 
 /**
  * @dev creates a Hedera fungible token
@@ -48,13 +48,13 @@ import { CommonKeyObject, SmartContractExecutionResult } from '@/types/contract-
  *
  * @param treasury: string
  *
- * @param inputKeys: CommonKeyObject[],
+ * @param inputKeys: ICommonKeyObject[],
  *
  * @param msgValue: string
  *
  * @param feeTokenAddress?: string
  *
- * @return Promise<SmartContractExecutionResult>
+ * @return Promise<ISmartContractExecutionResult>
  *
  * @see https://github.com/hashgraph/hedera-smart-contracts/blob/main/contracts/hts-precompile/IHederaTokenService.sol#L136
  *      for more information on the purposes of the params
@@ -69,10 +69,10 @@ export const createHederaFungibleToken = async (
   decimals: number,
   freezeDefaultStatus: boolean,
   treasury: string,
-  inputKeys: CommonKeyObject[],
+  inputKeys: ICommonKeyObject[],
   msgValue: string,
   feeTokenAddress?: string
-): Promise<SmartContractExecutionResult> => {
+): Promise<ISmartContractExecutionResult> => {
   // sanitize params
   let sanitizeErr;
   if (initialTotalSupply < 0) {
@@ -138,9 +138,7 @@ export const createHederaFungibleToken = async (
 
     const txReceipt = await tokenCreateTx.wait();
 
-    const { data } = txReceipt.logs.filter(
-      (event: any) => event.fragment.name === 'CreatedToken'
-    )[0];
+    const { data } = txReceipt.logs.filter((event: any) => event.fragment.name === 'CreatedToken')[0];
 
     // @notice since the returned `data` is 32 byte, convert it to the public 20-byte address standard
     const tokenAddress = `0x${data.slice(-40)}`;
@@ -169,13 +167,13 @@ export const createHederaFungibleToken = async (
  *
  * @param treasury: string
  *
- * @param inputKeys: CommonKeyObject[],
+ * @param inputKeys: ICommonKeyObject[],
  *
  * @param msgValue: string
  *
  * @param feeTokenAddress?: string
  *
- * @return Promise<SmartContractExecutionResult>
+ * @return Promise<ISmartContractExecutionResult>
  *
  * @see https://github.com/hashgraph/hedera-smart-contracts/blob/main/contracts/hts-precompile/IHederaTokenService.sol#L136
  *      for more information on the purposes of the params
@@ -187,10 +185,10 @@ export const createHederaNonFungibleToken = async (
   memo: string,
   maxSupply: number,
   treasury: string,
-  inputKeys: CommonKeyObject[],
+  inputKeys: ICommonKeyObject[],
   msgValue: string,
   feeTokenAddress?: string
-): Promise<SmartContractExecutionResult> => {
+): Promise<ISmartContractExecutionResult> => {
   // sanitize params
   let sanitizeErr;
   if (maxSupply < 0) {
@@ -247,9 +245,7 @@ export const createHederaNonFungibleToken = async (
 
     const txReceipt = await tokenCreateTx.wait();
 
-    const { data } = txReceipt.logs.filter(
-      (event: any) => event.fragment.name === 'CreatedToken'
-    )[0];
+    const { data } = txReceipt.logs.filter((event: any) => event.fragment.name === 'CreatedToken')[0];
 
     // @notice since the returned `data` is 32 byte, convert it to the public 20-byte address standard
     const tokenAddress = `0x${data.slice(-40)}`;
@@ -276,7 +272,7 @@ export const createHederaNonFungibleToken = async (
  *
  * @param metadata: string[]
  *
- * @return Promise<SmartContractExecutionResult>
+ * @return Promise<ISmartContractExecutionResult>
  */
 export const mintHederaToken = async (
   baseContract: Contract,
@@ -284,7 +280,7 @@ export const mintHederaToken = async (
   hederaTokenAddress: string,
   amountToMint: number,
   metadata: string[]
-): Promise<SmartContractExecutionResult> => {
+): Promise<ISmartContractExecutionResult> => {
   // sanitize params
   let sanitizeErr;
   if (!isAddress(hederaTokenAddress)) {
@@ -305,14 +301,9 @@ export const mintHederaToken = async (
 
   // execute .mintTokenPublic() method
   try {
-    const tx = await baseContract.mintTokenPublic(
-      hederaTokenAddress,
-      amountToMint,
-      bufferedMetadata,
-      {
-        gasLimit: 1_000_000,
-      }
-    );
+    const tx = await baseContract.mintTokenPublic(hederaTokenAddress, amountToMint, bufferedMetadata, {
+      gasLimit: 1_000_000,
+    });
 
     // handle contract responses
     return await handleContractResponse(tx);
@@ -339,7 +330,7 @@ export const mintHederaToken = async (
  *
  * @param metadata: string[]
  *
- * @return Promise<SmartContractExecutionResult>
+ * @return Promise<ISmartContractExecutionResult>
  */
 export const mintHederaTokenToAddress = async (
   baseContract: Contract,
@@ -348,7 +339,7 @@ export const mintHederaTokenToAddress = async (
   recipientAddress: string,
   amountToMint: number,
   metadata: string[]
-): Promise<SmartContractExecutionResult> => {
+): Promise<ISmartContractExecutionResult> => {
   // sanitize params
   let sanitizeErr;
   if (!isAddress(hederaTokenAddress)) {
@@ -412,13 +403,13 @@ export const mintHederaTokenToAddress = async (
  *
  * @param associtingAccountAddress: string
  *
- * @return Promise<SmartContractExecutionResult>
+ * @return Promise<ISmartContractExecutionResult>
  */
 export const associateHederaTokensToAccounts = async (
   baseContract: Contract,
   hederaTokenAddresses: string[],
   associtingAccountAddress: string
-): Promise<SmartContractExecutionResult> => {
+): Promise<ISmartContractExecutionResult> => {
   // sanitize params
   let sanitizeErr;
   if (hederaTokenAddresses.length === 0) {
@@ -445,21 +436,13 @@ export const associateHederaTokensToAccounts = async (
   try {
     let tx;
     if (hederaTokenAddresses.length === 1) {
-      tx = await baseContract.associateTokenPublic(
-        associtingAccountAddress,
-        hederaTokenAddresses[0],
-        {
-          gasLimit: 1_000_000,
-        }
-      );
+      tx = await baseContract.associateTokenPublic(associtingAccountAddress, hederaTokenAddresses[0], {
+        gasLimit: 1_000_000,
+      });
     } else {
-      tx = await baseContract.associateTokensPublic(
-        associtingAccountAddress,
-        hederaTokenAddresses,
-        {
-          gasLimit: 1_000_000,
-        }
-      );
+      tx = await baseContract.associateTokensPublic(associtingAccountAddress, hederaTokenAddresses, {
+        gasLimit: 1_000_000,
+      });
     }
 
     // handle contract responses
@@ -481,13 +464,13 @@ export const associateHederaTokensToAccounts = async (
  *
  * @param grantingKYCAccountAddress: string
  *
- * @return Promise<SmartContractExecutionResult>
+ * @return Promise<ISmartContractExecutionResult>
  */
 export const grantTokenKYCToAccount = async (
   baseContract: Contract,
   hederaTokenAddress: string,
   grantingKYCAccountAddress: string
-): Promise<SmartContractExecutionResult> => {
+): Promise<ISmartContractExecutionResult> => {
   // sanitize params
   let sanitizeErr;
   if (!isAddress(hederaTokenAddress)) {
@@ -502,11 +485,9 @@ export const grantTokenKYCToAccount = async (
   }
 
   try {
-    const tx = await baseContract.grantTokenKycPublic(
-      hederaTokenAddress,
-      grantingKYCAccountAddress,
-      { gasLimit: 1_000_000 }
-    );
+    const tx = await baseContract.grantTokenKycPublic(hederaTokenAddress, grantingKYCAccountAddress, {
+      gasLimit: 1_000_000,
+    });
 
     // handle contract responses
     return await handleContractResponse(tx);
diff --git a/system-contract-dapp-playground/src/api/hedera/hts-interactions/tokenManagement-interactions/index.ts b/system-contract-dapp-playground/src/api/hedera/hts-interactions/tokenManagement-interactions/index.ts
index 0b116641e..4e7e9b818 100644
--- a/system-contract-dapp-playground/src/api/hedera/hts-interactions/tokenManagement-interactions/index.ts
+++ b/system-contract-dapp-playground/src/api/hedera/hts-interactions/tokenManagement-interactions/index.ts
@@ -18,17 +18,12 @@
  *
  */
 
-import {
-  CommonKeyObject,
-  IHederaTokenServiceExpiry,
-  IHederaTokenServiceHederaToken,
-  SmartContractExecutionResult,
-} from '@/types/contract-interactions/HTS';
+import { Contract, isAddress } from 'ethers';
+import { ISmartContractExecutionResult } from '@/types/contract-interactions/shared';
 import {
   handleContractResponse,
   prepareHederaTokenKeyArray,
 } from '@/utils/contract-interactions/HTS/helpers';
-import { Contract, isAddress } from 'ethers';
 
 /**
  * @dev manages and updates token information
@@ -51,9 +46,9 @@ import { Contract, isAddress } from 'ethers';
  *
  * @param expiryInfo?: IHederaTokenServiceExpiry
  *
- * @param keysInfo?: CommonKeyObject[],
+ * @param keysInfo?: ICommonKeyObject[],
  *
- * @return Promise<SmartContractExecutionResult>
+ * @return Promise<ISmartContractExecutionResult>
  */
 export const manageTokenInfomation = async (
   baseContract: Contract,
@@ -62,8 +57,8 @@ export const manageTokenInfomation = async (
   gasLimit: number,
   tokenInfo?: IHederaTokenServiceHederaToken,
   expiryInfo?: IHederaTokenServiceExpiry,
-  keysInfo?: CommonKeyObject[]
-): Promise<SmartContractExecutionResult> => {
+  keysInfo?: ICommonKeyObject[]
+): Promise<ISmartContractExecutionResult> => {
   // sanitize param
   if (!isAddress(hederaTokenAddress)) {
     console.error('Invalid token address');
@@ -79,22 +74,18 @@ export const manageTokenInfomation = async (
         if (!tokenInfo) {
           errMsg = 'Token information object is needed for UPDATE_INFO API';
         } else {
-          transactionResult = await baseContract.updateTokenInfoPublic(
-            hederaTokenAddress,
-            tokenInfo,
-            { gasLimit }
-          );
+          transactionResult = await baseContract.updateTokenInfoPublic(hederaTokenAddress, tokenInfo, {
+            gasLimit,
+          });
         }
         break;
       case 'UPDATE_EXPIRY':
         if (!expiryInfo) {
           errMsg = 'Expiry information object is needed for UPDATE_EXPIRY API';
         } else {
-          transactionResult = await baseContract.updateTokenExpiryInfoPublic(
-            hederaTokenAddress,
-            expiryInfo,
-            { gasLimit }
-          );
+          transactionResult = await baseContract.updateTokenExpiryInfoPublic(hederaTokenAddress, expiryInfo, {
+            gasLimit,
+          });
         }
         break;
       case 'UPDATE_KEYS':
@@ -152,7 +143,7 @@ export const manageTokenInfomation = async (
  *
  * @param approvedStatus?: boolean (SET_APPROVAL)
  *
- * @return Promise<SmartContractExecutionResult>
+ * @return Promise<ISmartContractExecutionResult>
  */
 export const manageTokenPermission = async (
   baseContract: Contract,
@@ -163,7 +154,7 @@ export const manageTokenPermission = async (
   amountToApprove?: number,
   serialNumber?: number,
   approvedStatus?: boolean
-): Promise<SmartContractExecutionResult> => {
+): Promise<ISmartContractExecutionResult> => {
   // sanitize params
   let sanitizeErr;
   if (!isAddress(hederaTokenAddress)) {
@@ -241,13 +232,13 @@ export const manageTokenPermission = async (
  *
  * @param hederaTokenAddress: string
  *
- * @return Promise<SmartContractExecutionResult>
+ * @return Promise<ISmartContractExecutionResult>
  */
 export const manageTokenStatus = async (
   baseContract: Contract,
   API: 'PAUSE' | 'UNPAUSE',
   hederaTokenAddress: string
-): Promise<SmartContractExecutionResult> => {
+): Promise<ISmartContractExecutionResult> => {
   // sanitize param
   if (!isAddress(hederaTokenAddress)) {
     console.error('Invalid token address');
@@ -299,7 +290,7 @@ export const manageTokenStatus = async (
  *
  * @param hederaTokenAddresses?: string[]
  *
- * @return Promise<SmartContractExecutionResult>
+ * @return Promise<ISmartContractExecutionResult>
  */
 export const manageTokenRelation = async (
   baseContract: Contract,
@@ -308,7 +299,7 @@ export const manageTokenRelation = async (
   gasLimit: number,
   hederaTokenAddress?: string,
   hederaTokenAddresses?: string[]
-): Promise<SmartContractExecutionResult> => {
+): Promise<ISmartContractExecutionResult> => {
   // sanitize params
   let sanitizeErr;
   if (!isAddress(accountAddress)) {
@@ -335,25 +326,19 @@ export const manageTokenRelation = async (
     let transactionResult;
     switch (API) {
       case 'REVOKE_KYC':
-        transactionResult = await baseContract.revokeTokenKycPublic(
-          hederaTokenAddress,
-          accountAddress,
-          { gasLimit }
-        );
+        transactionResult = await baseContract.revokeTokenKycPublic(hederaTokenAddress, accountAddress, {
+          gasLimit,
+        });
         break;
       case 'FREEZE':
-        transactionResult = await baseContract.freezeTokenPublic(
-          hederaTokenAddress,
-          accountAddress,
-          { gasLimit }
-        );
+        transactionResult = await baseContract.freezeTokenPublic(hederaTokenAddress, accountAddress, {
+          gasLimit,
+        });
         break;
       case 'UNFREEZE':
-        transactionResult = await baseContract.unfreezeTokenPublic(
-          hederaTokenAddress,
-          accountAddress,
-          { gasLimit }
-        );
+        transactionResult = await baseContract.unfreezeTokenPublic(hederaTokenAddress, accountAddress, {
+          gasLimit,
+        });
         break;
       case 'DISSOCIATE_TOKEN':
         if (hederaTokenAddresses!.length === 1) {
@@ -404,7 +389,7 @@ export const manageTokenRelation = async (
  *
  * @param serialNumbers?: number[]
  *
- * @return Promise<SmartContractExecutionResult>
+ * @return Promise<ISmartContractExecutionResult>
  */
 export const manageTokenDeduction = async (
   baseContract: Contract,
@@ -414,7 +399,7 @@ export const manageTokenDeduction = async (
   accountAddress?: string,
   amount?: number,
   serialNumbers?: number[]
-): Promise<SmartContractExecutionResult> => {
+): Promise<ISmartContractExecutionResult> => {
   // sanitize params
   let sanitizeErr;
   if (!isAddress(hederaTokenAddress)) {
@@ -476,12 +461,9 @@ export const manageTokenDeduction = async (
         if (!amount && (!serialNumbers || serialNumbers.length === 0)) {
           errMsg = 'Amount/serial number is needed for BURN API';
         } else {
-          transactionResult = await baseContract.burnTokenPublic(
-            hederaTokenAddress,
-            amount,
-            serialNumbers,
-            { gasLimit }
-          );
+          transactionResult = await baseContract.burnTokenPublic(hederaTokenAddress, amount, serialNumbers, {
+            gasLimit,
+          });
         }
         break;
 
diff --git a/system-contract-dapp-playground/src/api/hedera/hts-interactions/tokenQuery-interactions/index.ts b/system-contract-dapp-playground/src/api/hedera/hts-interactions/tokenQuery-interactions/index.ts
index cd1ccb3bc..3f4ad8e4d 100644
--- a/system-contract-dapp-playground/src/api/hedera/hts-interactions/tokenQuery-interactions/index.ts
+++ b/system-contract-dapp-playground/src/api/hedera/hts-interactions/tokenQuery-interactions/index.ts
@@ -18,11 +18,8 @@
  *
  */
 
-import {
-  IHederaTokenServiceKeyType,
-  SmartContractExecutionResult,
-} from '@/types/contract-interactions/HTS';
 import { Contract, isAddress } from 'ethers';
+import { ISmartContractExecutionResult } from '@/types/contract-interactions/shared';
 import { KEY_TYPE_MAP } from '@/utils/contract-interactions/HTS/token-create-custom/constant';
 import {
   convertsArgsProxyToHTSSpecificInfo,
@@ -39,12 +36,12 @@ import {
  *
  * @param hederaTokenAddress: string
  *
- * @return Promise<SmartContractExecutionResult>
+ * @return Promise<ISmartContractExecutionResult>
  */
 export const queryTokenValidity = async (
   baseContract: Contract,
   hederaTokenAddress: string
-): Promise<SmartContractExecutionResult> => {
+): Promise<ISmartContractExecutionResult> => {
   // sanitize param
   if (!isAddress(hederaTokenAddress)) {
     console.error('Invalid token address');
@@ -82,14 +79,14 @@ export const queryTokenValidity = async (
  *
  * @param serialNumber?: number
  *
- * @return Promise<SmartContractExecutionResult>
+ * @return Promise<ISmartContractExecutionResult>
  */
 export const queryTokenGeneralInfomation = async (
   baseContract: Contract,
   API: 'TOKEN' | 'FUNGIBLE' | 'NON_FUNFIBLE',
   hederaTokenAddress: string,
   serialNumber?: number
-): Promise<SmartContractExecutionResult> => {
+): Promise<ISmartContractExecutionResult> => {
   // sanitize param
   if (!isAddress(hederaTokenAddress)) {
     console.error('Invalid token address');
@@ -136,9 +133,7 @@ export const queryTokenGeneralInfomation = async (
     const txReceipt = await transactionResult.wait();
 
     // retrieve information from event
-    const { args } = txReceipt.logs.filter(
-      (event: any) => event.fragment.name === eventMaps[API]
-    )[0];
+    const { args } = txReceipt.logs.filter((event: any) => event.fragment.name === eventMaps[API])[0];
 
     return {
       [eventMaps[API]]: convertsArgsProxyToHTSTokenInfo(args.tokenInfo, API),
@@ -173,7 +168,7 @@ export const queryTokenGeneralInfomation = async (
  *
  * @param keyType?: IHederaTokenServiceKeyType
  *
- * @return Promise<SmartContractExecutionResult>
+ * @return Promise<ISmartContractExecutionResult>
  */
 export const queryTokenSpecificInfomation = async (
   baseContract: Contract,
@@ -186,7 +181,7 @@ export const queryTokenSpecificInfomation = async (
     | 'DEFAULT_FREEZE_STATUS',
   hederaTokenAddress: string,
   keyType?: IHederaTokenServiceKeyType
-): Promise<SmartContractExecutionResult> => {
+): Promise<ISmartContractExecutionResult> => {
   // sanitize param
   if (!isAddress(hederaTokenAddress)) {
     console.error('Invalid token address');
@@ -208,9 +203,7 @@ export const queryTokenSpecificInfomation = async (
     let transactionResult;
     switch (API) {
       case 'DEFAULT_FREEZE_STATUS':
-        transactionResult = await baseContract.getTokenDefaultFreezeStatusPublic(
-          hederaTokenAddress
-        );
+        transactionResult = await baseContract.getTokenDefaultFreezeStatusPublic(hederaTokenAddress);
         break;
 
       case 'DEFAULT_KYC_STATUS':
@@ -232,10 +225,7 @@ export const queryTokenSpecificInfomation = async (
           console.error('Key Type is needed for querying NON_FUNGIBLE');
           return { err: 'Key Type is needed for querying NON_FUNGIBLE' };
         } else {
-          transactionResult = await baseContract.getTokenKeyPublic(
-            hederaTokenAddress,
-            KEY_TYPE_MAP[keyType]
-          );
+          transactionResult = await baseContract.getTokenKeyPublic(hederaTokenAddress, KEY_TYPE_MAP[keyType]);
         }
         break;
     }
@@ -244,9 +234,7 @@ export const queryTokenSpecificInfomation = async (
     const txReceipt = await transactionResult.wait();
 
     // retrieve information from event
-    const tokenInfoResult = txReceipt.logs.filter(
-      (event: any) => event.fragment.name === eventMaps[API]
-    )[0];
+    const tokenInfoResult = txReceipt.logs.filter((event: any) => event.fragment.name === eventMaps[API])[0];
 
     if (API === 'DEFAULT_FREEZE_STATUS' || API === 'DEFAULT_KYC_STATUS' || API === 'TOKEN_TYPE') {
       return { [eventMaps[API]]: tokenInfoResult.data, transactionHash: txReceipt.hash };
@@ -281,7 +269,7 @@ export const queryTokenSpecificInfomation = async (
  *
  * @param serialNumber?: number
  *
- * @return Promise<SmartContractExecutionResult>
+ * @return Promise<ISmartContractExecutionResult>
  */
 export const queryTokenPermissionInformation = async (
   baseContract: Contract,
@@ -290,7 +278,7 @@ export const queryTokenPermissionInformation = async (
   ownerAddress?: string,
   spenderAddress?: string,
   serialNumber?: number
-): Promise<SmartContractExecutionResult> => {
+): Promise<ISmartContractExecutionResult> => {
   // sanitize param
   if (!isAddress(hederaTokenAddress)) {
     console.error('Invalid token address');
@@ -334,10 +322,7 @@ export const queryTokenPermissionInformation = async (
         if (!serialNumber) {
           errMsg = 'Serial number is needed for GET_APPROVED API';
         } else {
-          transactionResult = await baseContract.getApprovedPublic(
-            hederaTokenAddress,
-            serialNumber
-          );
+          transactionResult = await baseContract.getApprovedPublic(hederaTokenAddress, serialNumber);
         }
         break;
       case 'IS_APPROVAL':
@@ -390,14 +375,14 @@ export const queryTokenPermissionInformation = async (
  *
  * @param serialNumber?: number
  *
- * @return Promise<SmartContractExecutionResult>
+ * @return Promise<ISmartContractExecutionResult>
  */
 export const queryTokenStatusInformation = async (
   baseContract: Contract,
   API: 'IS_KYC' | 'IS_FROZEN',
   hederaTokenAddress: string,
   accountAddress: string
-): Promise<SmartContractExecutionResult> => {
+): Promise<ISmartContractExecutionResult> => {
   // sanitize param
   if (!isAddress(hederaTokenAddress)) {
     console.error('Invalid token address');
diff --git a/system-contract-dapp-playground/src/api/hedera/hts-interactions/tokenTransfer-interactions/index.ts b/system-contract-dapp-playground/src/api/hedera/hts-interactions/tokenTransfer-interactions/index.ts
index 6827643a7..6b94b2b1e 100644
--- a/system-contract-dapp-playground/src/api/hedera/hts-interactions/tokenTransfer-interactions/index.ts
+++ b/system-contract-dapp-playground/src/api/hedera/hts-interactions/tokenTransfer-interactions/index.ts
@@ -19,12 +19,8 @@
  */
 
 import { Contract, isAddress } from 'ethers';
-import {
-  IHederaTokenServiceTransferList,
-  IHederaTokenServiceTokenTransferList,
-  SmartContractExecutionResult,
-} from '@/types/contract-interactions/HTS';
 import { handleContractResponse } from '@/utils/contract-interactions/HTS/helpers';
+import { ISmartContractExecutionResult } from '@/types/contract-interactions/shared';
 
 /**
  * @dev transfers Hedera Cryptos
@@ -39,14 +35,14 @@ import { handleContractResponse } from '@/utils/contract-interactions/HTS/helper
  *
  * @param gasLimit: number
  *
- * @return Promise<SmartContractExecutionResult>
+ * @return Promise<ISmartContractExecutionResult>
  */
 export const transferCrypto = async (
   baseContract: Contract,
   transferList: IHederaTokenServiceTransferList,
   tokenTransferList: IHederaTokenServiceTokenTransferList[],
   gasLimit: number
-): Promise<SmartContractExecutionResult> => {
+): Promise<ISmartContractExecutionResult> => {
   // invoking contract methods
   try {
     const tx = await baseContract.cryptoTransferPublic(transferList, tokenTransferList, {
@@ -75,7 +71,7 @@ export const transferCrypto = async (
  *
  * @param gasLimit: number
  *
- * @return Promise Promise<SmartContractExecutionResult>
+ * @return Promise Promise<ISmartContractExecutionResult>
  */
 export const transferFungibleTokens = async (
   baseContract: Contract,
@@ -83,7 +79,7 @@ export const transferFungibleTokens = async (
   accountIDs: string[],
   amounts: number[],
   gasLimit: number
-): Promise<SmartContractExecutionResult> => {
+): Promise<ISmartContractExecutionResult> => {
   // sanitize params
   let sanitizeErr;
   if (!isAddress(hederaTokenAddress)) {
@@ -141,7 +137,7 @@ export const transferFungibleTokens = async (
  *
  * @param gasLimit: number
  *
- * @return Promise<SmartContractExecutionResult>
+ * @return Promise<ISmartContractExecutionResult>
  */
 export const transferNonFungibleTokens = async (
   baseContract: Contract,
@@ -150,7 +146,7 @@ export const transferNonFungibleTokens = async (
   receivers: string[],
   serialNumbers: number[],
   gasLimit: number
-): Promise<SmartContractExecutionResult> => {
+): Promise<ISmartContractExecutionResult> => {
   // sanitize params
   let sanitizeErr;
   if (!isAddress(hederaTokenAddress)) {
@@ -187,13 +183,9 @@ export const transferNonFungibleTokens = async (
 
   // invoking contract methods
   try {
-    const tx = await baseContract.transferNFTsPublic(
-      hederaTokenAddress,
-      senders,
-      receivers,
-      serialNumbers,
-      { gasLimit }
-    );
+    const tx = await baseContract.transferNFTsPublic(hederaTokenAddress, senders, receivers, serialNumbers, {
+      gasLimit,
+    });
 
     return await handleContractResponse(tx);
   } catch (err: any) {
@@ -225,7 +217,7 @@ export const transferNonFungibleTokens = async (
  *
  * @param quantity: number (amount/serialNumber)
  *
- * @return Promise<SmartContractExecutionResult>
+ * @return Promise<ISmartContractExecutionResult>
  */
 export const transferSingleToken = async (
   baseContract: Contract,
@@ -235,7 +227,7 @@ export const transferSingleToken = async (
   receiver: string,
   quantity: number,
   gasLimit: number
-): Promise<SmartContractExecutionResult> => {
+): Promise<ISmartContractExecutionResult> => {
   // sanitize params
   let sanitizeErr;
   if (!isAddress(hederaTokenAddress)) {
diff --git a/system-contract-dapp-playground/src/api/hedera/ihrc-interactions/index.ts b/system-contract-dapp-playground/src/api/hedera/ihrc-interactions/index.ts
index ed1fcd614..653b8965f 100644
--- a/system-contract-dapp-playground/src/api/hedera/ihrc-interactions/index.ts
+++ b/system-contract-dapp-playground/src/api/hedera/ihrc-interactions/index.ts
@@ -20,7 +20,7 @@
 
 import { Contract, ethers, isAddress } from 'ethers';
 import { HEDERA_SMART_CONTRACTS_ASSETS } from '@/utils/common/constants';
-import { SmartContractExecutionResult } from '@/types/contract-interactions/HTS';
+import { ISmartContractExecutionResult } from '@/types/contract-interactions/shared';
 
 /**
  * @dev handle associating and/or dissociating token from an EOA
@@ -35,14 +35,14 @@ import { SmartContractExecutionResult } from '@/types/contract-interactions/HTS'
  *
  * @param signer: ethers.JsonRpcSigner
  *
- * @return Promise<SmartContractExecutionResult>
+ * @return Promise<ISmartContractExecutionResult>
  */
 export const handleIHRC719APIs = async (
   API: 'ASSOCIATE' | 'DISSOCIATE',
   hederaTokenAddress: string,
   signer: ethers.JsonRpcSigner,
   gasLimit: number
-): Promise<SmartContractExecutionResult> => {
+): Promise<ISmartContractExecutionResult> => {
   // sanitize params
   if (!isAddress(hederaTokenAddress)) {
     console.error('Invalid token address');
diff --git a/system-contract-dapp-playground/src/api/hedera/index.ts b/system-contract-dapp-playground/src/api/hedera/index.ts
index 3e17dc8cc..e4202ef79 100644
--- a/system-contract-dapp-playground/src/api/hedera/index.ts
+++ b/system-contract-dapp-playground/src/api/hedera/index.ts
@@ -20,26 +20,26 @@
 
 import { ContractFactory } from 'ethers';
 import { getWalletProvider } from '../wallet';
-import { TransactionResult } from '@/types/contract-interactions/HTS';
-import { ContractABI, HederaSmartContractResult } from '@/types/common';
+import { ITransactionResult } from '@/types/contract-interactions/shared';
+import { IContractABI, IHederaSmartContractResult } from '@/types/common';
 import { HEDERA_TRANSACTION_RESULT_STORAGE_KEYS } from '@/utils/common/constants';
 
 /**
  * @dev deploys smart contract to Hedera network
  *
- * @params contractABI: ContractABI
+ * @params contractABI: IContractABI
  *
  * @params contractBytecode: string
  *
- * @return Promise<HederaSmartContractResult>
+ * @return Promise<IHederaSmartContractResult>
  *
  * @resource https://github.com/ed-marquez/hedera-example-metamask-counter-dapp/blob/master/src/components/hedera/contractDeploy.js
  */
 export const deploySmartContract = async (
-  contractABI: ContractABI[],
+  contractABI: IContractABI[],
   contractBytecode: string,
   params: any[]
-): Promise<HederaSmartContractResult> => {
+): Promise<IHederaSmartContractResult> => {
   // states
   const transactionResultStorageKey = HEDERA_TRANSACTION_RESULT_STORAGE_KEYS['CONTRACT-CREATE'];
 
@@ -75,7 +75,7 @@ export const deploySmartContract = async (
 
     // prepare create transaction result
     if (txReceipt) {
-      const createTransactionResult: TransactionResult = {
+      const createTransactionResult: ITransactionResult = {
         status: 'success',
         transactionResultStorageKey,
         transactionTimeStamp: Date.now(),
diff --git a/system-contract-dapp-playground/src/api/hedera/prng-interactions/index.ts b/system-contract-dapp-playground/src/api/hedera/prng-interactions/index.ts
index 23bff04f3..6e58e18d1 100644
--- a/system-contract-dapp-playground/src/api/hedera/prng-interactions/index.ts
+++ b/system-contract-dapp-playground/src/api/hedera/prng-interactions/index.ts
@@ -19,6 +19,7 @@
  */
 
 import { Contract } from 'ethers';
+import { ISmartContractExecutionResult } from '@/types/contract-interactions/shared';
 
 /**
  * @dev handle retrieving a pseudo-random seed
@@ -29,12 +30,12 @@ import { Contract } from 'ethers';
  *
  * @param gasLimit: Number
  *
- * @return Promise<PRNGContractResult>
+ * @return Promise<ISmartContractExecutionResult>
  */
 export const handlePRGNAPI = async (
   baseContract: Contract,
   gasLimit: Number
-): Promise<PRNGContractResult> => {
+): Promise<ISmartContractExecutionResult> => {
   try {
     // invoke contract method
     const tx = await baseContract.getPseudorandomSeed({ gasLimit });
@@ -42,9 +43,7 @@ export const handlePRGNAPI = async (
     // retrieve txReceipt
     const txReceipt = await tx.wait();
 
-    const { data } = txReceipt.logs.filter(
-      (event: any) => event.fragment.name === 'PseudoRandomSeed'
-    )[0];
+    const { data } = txReceipt.logs.filter((event: any) => event.fragment.name === 'PseudoRandomSeed')[0];
 
     return { transactionHash: txReceipt.hash, pseudoRandomSeed: data };
   } catch (err: any) {
diff --git a/system-contract-dapp-playground/src/api/mirror-node/index.ts b/system-contract-dapp-playground/src/api/mirror-node/index.ts
index 8c726e4de..6e6d9edeb 100644
--- a/system-contract-dapp-playground/src/api/mirror-node/index.ts
+++ b/system-contract-dapp-playground/src/api/mirror-node/index.ts
@@ -20,7 +20,7 @@
 
 import axios from 'axios';
 import { HEDERA_NETWORKS } from '@/utils/common/constants';
-import { MirrorNodeResult, NetworkName } from '@/types/common';
+import { IMirrorNodeResult, TNetworkName } from '@/types/common';
 
 /**
  * @dev get Hedera native account ID from EVM address
@@ -33,13 +33,11 @@ import { MirrorNodeResult, NetworkName } from '@/types/common';
  */
 export const getHederaNativeIDFromEvmAddress = async (
   evmAddress: string,
-  network: NetworkName,
+  network: TNetworkName,
   params: 'accounts' | 'contracts'
-): Promise<MirrorNodeResult> => {
+): Promise<IMirrorNodeResult> => {
   try {
-    const accountInfo = await axios.get(
-      `${HEDERA_NETWORKS[network].mirrorNodeUrl}/${params}/${evmAddress}`
-    );
+    const accountInfo = await axios.get(`${HEDERA_NETWORKS[network].mirrorNodeUrl}/${params}/${evmAddress}`);
 
     if (params === 'accounts') {
       return { accountId: accountInfo.data.account };
diff --git a/system-contract-dapp-playground/src/api/wallet/index.ts b/system-contract-dapp-playground/src/api/wallet/index.ts
index 125a522c5..f0aad00cc 100644
--- a/system-contract-dapp-playground/src/api/wallet/index.ts
+++ b/system-contract-dapp-playground/src/api/wallet/index.ts
@@ -18,7 +18,7 @@
  *
  */
 
-import { WalletResult } from '@/types/common';
+import { IWalletResult } from '@/types/common';
 import { ethers, BrowserProvider } from 'ethers';
 
 /**
@@ -36,9 +36,9 @@ export const getWalletObject = () => {
 /**
  * @dev get ethersjs wallet provider (i.e. Metamask provider)
  *
- * @return WalletResult
+ * @return IWalletResult
  */
-export const getWalletProvider = (): WalletResult => {
+export const getWalletProvider = (): IWalletResult => {
   // prepare walletObject
   const walletObject = getWalletObject();
   if (!walletObject) {
@@ -57,12 +57,12 @@ export const getWalletProvider = (): WalletResult => {
  *
  * @params account: string
  *
- * @returns Promise<WalletResult>
+ * @returns Promise<IWalletResult>
  */
 export const getBalance = async (
   walletProvider: ethers.BrowserProvider,
   account: string
-): Promise<WalletResult> => {
+): Promise<IWalletResult> => {
   try {
     const balance = await walletProvider.send('eth_getBalance', [account]);
     return {
@@ -79,11 +79,9 @@ export const getBalance = async (
  *
  * @params walletProvider: ethers.BrowserProvider
  *
- * @returns Promise<WalletResult>
+ * @returns Promise<IWalletResult>
  */
-export const getCurrentChainId = async (
-  walletProvider: ethers.BrowserProvider
-): Promise<WalletResult> => {
+export const getCurrentChainId = async (walletProvider: ethers.BrowserProvider): Promise<IWalletResult> => {
   try {
     const currentChainId = await walletProvider.send('eth_chainId', []);
     return {
@@ -99,11 +97,9 @@ export const getCurrentChainId = async (
  *
  * @params walletProvider: ethers.BrowserProvider
  *
- * @returns Promise<WalletResult>
+ * @returns Promise<IWalletResult>
  */
-export const requestAccount = async (
-  walletProvider: ethers.BrowserProvider
-): Promise<WalletResult> => {
+export const requestAccount = async (walletProvider: ethers.BrowserProvider): Promise<IWalletResult> => {
   try {
     const accounts: [string] = await walletProvider.send('eth_requestAccounts', []);
     return {
diff --git a/system-contract-dapp-playground/src/app/activity/layout.tsx b/system-contract-dapp-playground/src/app/activity/layout.tsx
index ce552ac07..1b5abdec0 100644
--- a/system-contract-dapp-playground/src/app/activity/layout.tsx
+++ b/system-contract-dapp-playground/src/app/activity/layout.tsx
@@ -20,16 +20,16 @@
 
 import Footer from '@/components/footer';
 import Navbar from '@/components/navbar';
-import LeftSideBar from '@/components/leftSideBar';
+import NavSideBar from '@/components/sidebar';
 
 export default function RootLayout({ children }: { children: React.ReactNode }) {
   return (
     <main className="flex flex-col min-h-screen">
       <Navbar />
       <div className="flex flex-1 px-6 overflow-x-hidden">
-        {/* <LeftSidebar /> */}
+        {/* <NavSideBar /> */}
         <div>
-          <LeftSideBar />
+          <NavSideBar />
         </div>
         {/* <Main children /> */}
         <div className="flex-1">{children}</div>
diff --git a/system-contract-dapp-playground/src/app/hedera/layout.tsx b/system-contract-dapp-playground/src/app/hedera/layout.tsx
index 032e415d4..0b46536c3 100644
--- a/system-contract-dapp-playground/src/app/hedera/layout.tsx
+++ b/system-contract-dapp-playground/src/app/hedera/layout.tsx
@@ -20,16 +20,16 @@
 
 import Navbar from '@/components/navbar';
 import Footer from '@/components/footer';
-import LeftSideBar from '@/components/leftSideBar';
+import NavSideBar from '@/components/sidebar';
 
 export default function RootLayout({ children }: { children: React.ReactNode }) {
   return (
     <main className="flex flex-col min-h-screen">
       <Navbar />
       <div className="flex flex-1 px-6 overflow-x-hidden">
-        {/* <LeftSidebar /> */}
+        {/* <NavSideBar /> */}
         <div>
-          <LeftSideBar />
+          <NavSideBar />
         </div>
         {/* <Main children /> */}
         <div className="flex-1">{children}</div>
diff --git a/system-contract-dapp-playground/src/components/common/AlertDialog.tsx b/system-contract-dapp-playground/src/components/common/components/AlertDialog.tsx
similarity index 100%
rename from system-contract-dapp-playground/src/components/common/AlertDialog.tsx
rename to system-contract-dapp-playground/src/components/common/components/AlertDialog.tsx
diff --git a/system-contract-dapp-playground/src/components/common/ConfirmModal.tsx b/system-contract-dapp-playground/src/components/common/components/ConfirmModal.tsx
similarity index 100%
rename from system-contract-dapp-playground/src/components/common/ConfirmModal.tsx
rename to system-contract-dapp-playground/src/components/common/components/ConfirmModal.tsx
diff --git a/system-contract-dapp-playground/src/components/common/HederaCommonTextField.tsx b/system-contract-dapp-playground/src/components/common/components/HederaCommonTextField.tsx
similarity index 100%
rename from system-contract-dapp-playground/src/components/common/HederaCommonTextField.tsx
rename to system-contract-dapp-playground/src/components/common/components/HederaCommonTextField.tsx
diff --git a/system-contract-dapp-playground/src/components/common/MultiLineMethod.tsx b/system-contract-dapp-playground/src/components/common/components/MultiLineMethod.tsx
similarity index 100%
rename from system-contract-dapp-playground/src/components/common/MultiLineMethod.tsx
rename to system-contract-dapp-playground/src/components/common/components/MultiLineMethod.tsx
diff --git a/system-contract-dapp-playground/src/components/common/OneLineMethod.tsx b/system-contract-dapp-playground/src/components/common/components/OneLineMethod.tsx
similarity index 100%
rename from system-contract-dapp-playground/src/components/common/OneLineMethod.tsx
rename to system-contract-dapp-playground/src/components/common/components/OneLineMethod.tsx
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/hts/shared/components/TransactionResultTable.tsx b/system-contract-dapp-playground/src/components/common/components/TransactionResultTable.tsx
similarity index 96%
rename from system-contract-dapp-playground/src/components/contract-interaction/hts/shared/components/TransactionResultTable.tsx
rename to system-contract-dapp-playground/src/components/common/components/TransactionResultTable.tsx
index 925adcb98..4864a2f2c 100644
--- a/system-contract-dapp-playground/src/components/contract-interaction/hts/shared/components/TransactionResultTable.tsx
+++ b/system-contract-dapp-playground/src/components/common/components/TransactionResultTable.tsx
@@ -23,8 +23,9 @@ import { ethers } from 'ethers';
 import { FiExternalLink } from 'react-icons/fi';
 import { AiOutlineMinus } from 'react-icons/ai';
 import { Dispatch, SetStateAction } from 'react';
+import { copyContentToClipboard } from '../methods/common';
 import { MdNavigateBefore, MdNavigateNext } from 'react-icons/md';
-import { IHederaTokenServiceKeyType, TransactionResult } from '@/types/contract-interactions/HTS';
+import { ITransactionResult } from '@/types/contract-interactions/shared';
 import {
   HEDERA_BRANDING_COLORS,
   HEDERA_CHAKRA_TABLE_VARIANTS,
@@ -51,14 +52,14 @@ interface TransactionResultTablePageProps {
   TRANSACTION_PAGE_SIZE: number;
   currentTransactionPage: number;
   transactionResultStorageKey: string;
-  transactionResults: TransactionResult[];
+  transactionResults: ITransactionResult[];
   setTokenInfoFromTxResult?: Dispatch<any>;
-  paginatedTransactionResults: TransactionResult[];
+  paginatedTransactionResults: ITransactionResult[];
   setShowTokenInfo?: Dispatch<SetStateAction<boolean>>;
   setAPIMethodsFromTxResult?: Dispatch<SetStateAction<any>>;
   setCurrentTransactionPage: Dispatch<SetStateAction<number>>;
   setTokenAddressFromTxResult?: Dispatch<SetStateAction<string>>;
-  setTransactionResults: Dispatch<SetStateAction<TransactionResult[]>>;
+  setTransactionResults: Dispatch<SetStateAction<ITransactionResult[]>>;
   setKeyTypeFromTxResult?: Dispatch<SetStateAction<IHederaTokenServiceKeyType>>;
   API:
     | 'PRNG'
@@ -163,7 +164,7 @@ export const TransactionResultTable = ({
         <Tbody>
           {paginatedTransactionResults.map((transactionResult, index) => {
             /** @dev handle removing record */
-            const handleRemoveRecord = (targetTransactionResult: TransactionResult) => {
+            const handleRemoveRecord = (targetTransactionResult: ITransactionResult) => {
               const filteredItems = transactionResults.filter(
                 (transactionResult) => targetTransactionResult.txHash !== transactionResult.txHash
               );
@@ -197,7 +198,7 @@ export const TransactionResultTable = ({
                 {/* transaction hash */}
                 <Td className="cursor-pointer">
                   <div className="flex gap-1 items-center">
-                    <div onClick={() => navigator.clipboard.writeText(transactionResult.txHash)}>
+                    <div onClick={() => copyContentToClipboard(transactionResult.txHash)}>
                       <Popover>
                         <PopoverTrigger>
                           <div className="flex gap-1 items-center">
@@ -246,7 +247,7 @@ export const TransactionResultTable = ({
                   <Td className="cursor-pointer">
                     {transactionResult.tokenAddress ? (
                       <div className="flex gap-1 items-center">
-                        <div onClick={() => navigator.clipboard.writeText(transactionResult.tokenAddress!)}>
+                        <div onClick={() => copyContentToClipboard(transactionResult.tokenAddress!)}>
                           <Popover>
                             <PopoverTrigger>
                               <div className="flex gap-1 items-center">
@@ -291,9 +292,7 @@ export const TransactionResultTable = ({
                   <Td className="cursor-pointer">
                     {transactionResult.tokenAddresses && transactionResult.tokenAddresses.length === 1 ? (
                       <div className="flex gap-1 items-center">
-                        <div
-                          onClick={() => navigator.clipboard.writeText(transactionResult.tokenAddresses![0])}
-                        >
+                        <div onClick={() => copyContentToClipboard(transactionResult.tokenAddresses![0])}>
                           <Popover>
                             <PopoverTrigger>
                               <div className="flex gap-1 items-center">
@@ -341,7 +340,7 @@ export const TransactionResultTable = ({
                           >
                             {transactionResult.tokenAddresses?.map((token) => (
                               <div key={token} className="bg-secondary border-none font-medium flex gap-1">
-                                <div onClick={() => navigator.clipboard.writeText(token)}>
+                                <div onClick={() => copyContentToClipboard(token)}>
                                   <Popover>
                                     <PopoverTrigger>
                                       <div className="flex gap-1 items-center">
@@ -391,7 +390,7 @@ export const TransactionResultTable = ({
                   <Td className="cursor-pointer">
                     {transactionResult.accountAddress ? (
                       <div className="flex gap-1 items-center">
-                        <div onClick={() => navigator.clipboard.writeText(transactionResult.accountAddress!)}>
+                        <div onClick={() => copyContentToClipboard(transactionResult.accountAddress!)}>
                           <Popover>
                             <PopoverTrigger>
                               <div className="flex gap-1 items-center">
@@ -437,7 +436,7 @@ export const TransactionResultTable = ({
                 {API === 'TransferSingle' && (
                   <Td className="cursor-pointer">
                     <div className="flex gap-1 items-center">
-                      <div onClick={() => navigator.clipboard.writeText(transactionResult.receiverAddress!)}>
+                      <div onClick={() => copyContentToClipboard(transactionResult.receiverAddress!)}>
                         <Popover>
                           <PopoverTrigger>
                             <div className="flex gap-1 items-center">
@@ -554,9 +553,7 @@ export const TransactionResultTable = ({
                   <Td className="cursor-pointer">
                     {transactionResult.pseudoRandomSeed ? (
                       <div className="flex gap-1 items-center">
-                        <div
-                          onClick={() => navigator.clipboard.writeText(transactionResult.pseudoRandomSeed!)}
-                        >
+                        <div onClick={() => copyContentToClipboard(transactionResult.pseudoRandomSeed!)}>
                           <Popover>
                             <PopoverTrigger>
                               <div className="flex gap-1 items-center">
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/erc/shared/methods/common.tsx b/system-contract-dapp-playground/src/components/common/methods/common.tsx
similarity index 90%
rename from system-contract-dapp-playground/src/components/contract-interaction/erc/shared/methods/common.tsx
rename to system-contract-dapp-playground/src/components/common/methods/common.tsx
index 1d9f904c7..1affb0c46 100644
--- a/system-contract-dapp-playground/src/components/contract-interaction/erc/shared/methods/common.tsx
+++ b/system-contract-dapp-playground/src/components/common/methods/common.tsx
@@ -24,7 +24,7 @@ export const copyContentToClipboard = (content: string) => {
 };
 
 /** @dev handle remove record */
-export const handleRemoveRecord = (targetKey: any, setMap: any, transactionResultStorageKey: string) => {
+export const handleRemoveMapRecord = (targetKey: any, setMap: any, transactionResultStorageKey: string) => {
   setMap((prev: any) => {
     prev.delete(targetKey);
     if (prev.size === 0) {
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/hts/shared/methods/handleAPIErrors.tsx b/system-contract-dapp-playground/src/components/common/methods/handleAPIErrors.tsx
similarity index 95%
rename from system-contract-dapp-playground/src/components/contract-interaction/hts/shared/methods/handleAPIErrors.tsx
rename to system-contract-dapp-playground/src/components/common/methods/handleAPIErrors.tsx
index 0bc89930b..bbb756710 100644
--- a/system-contract-dapp-playground/src/components/contract-interaction/hts/shared/methods/handleAPIErrors.tsx
+++ b/system-contract-dapp-playground/src/components/common/methods/handleAPIErrors.tsx
@@ -20,8 +20,8 @@
 
 import { Dispatch, SetStateAction } from 'react';
 import { CommonErrorToast } from '@/components/toast/CommonToast';
+import { ITransactionResult } from '@/types/contract-interactions/shared';
 import { HEDERA_COMMON_WALLET_REVERT_REASONS } from '@/utils/common/constants';
-import { IHederaTokenServiceKeyType, TransactionResult } from '@/types/contract-interactions/HTS';
 
 /** @dev handle error returned back from invoking method APIs*/
 export const handleAPIErrors = ({
@@ -53,7 +53,7 @@ export const handleAPIErrors = ({
   transactionResultStorageKey: string;
   transactionHash: string | undefined;
   keyTypeCalled?: IHederaTokenServiceKeyType;
-  setTransactionResults: Dispatch<SetStateAction<TransactionResult[]>>;
+  setTransactionResults: Dispatch<SetStateAction<ITransactionResult[]>>;
 }) => {
   const errorMessage = JSON.stringify(err);
 
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/hts/shared/methods/handleRetrievingTransactionResultsFromLocalStorage.tsx b/system-contract-dapp-playground/src/components/common/methods/handleRetrievingTransactionResultsFromLocalStorage.tsx
similarity index 85%
rename from system-contract-dapp-playground/src/components/contract-interaction/hts/shared/methods/handleRetrievingTransactionResultsFromLocalStorage.tsx
rename to system-contract-dapp-playground/src/components/common/methods/handleRetrievingTransactionResultsFromLocalStorage.tsx
index e0c0184e2..7e87155fd 100644
--- a/system-contract-dapp-playground/src/components/contract-interaction/hts/shared/methods/handleRetrievingTransactionResultsFromLocalStorage.tsx
+++ b/system-contract-dapp-playground/src/components/common/methods/handleRetrievingTransactionResultsFromLocalStorage.tsx
@@ -19,17 +19,17 @@
  */
 
 import { Dispatch, SetStateAction } from 'react';
-import { TRANSACTION_PAGE_SIZE } from '../states/commonStates';
 import { CommonErrorToast } from '@/components/toast/CommonToast';
-import { TransactionResult } from '@/types/contract-interactions/HTS';
 import { getArrayTypedValuesFromLocalStorage } from '@/api/localStorage';
+import { ITransactionResult } from '@/types/contract-interactions/shared';
 import { HEDERA_COMMON_WALLET_REVERT_REASONS } from '@/utils/common/constants';
+import { TRANSACTION_PAGE_SIZE } from '../../contract-interaction/hts/shared/states/commonStates';
 
 export const handleRetrievingTransactionResultsFromLocalStorage = (
   toaster: any,
   transactionResultStorageKey: string,
   setCurrentTransactionPage: any,
-  setTransactionResults: Dispatch<SetStateAction<TransactionResult[]>>
+  setTransactionResults: Dispatch<SetStateAction<ITransactionResult[]>>
 ) => {
   const { storageResult, err: storagedErr } =
     getArrayTypedValuesFromLocalStorage(transactionResultStorageKey);
@@ -45,7 +45,7 @@ export const handleRetrievingTransactionResultsFromLocalStorage = (
 
   // update states if storageResult is found
   if (storageResult) {
-    setTransactionResults(storageResult as TransactionResult[]);
+    setTransactionResults(storageResult as ITransactionResult[]);
 
     // set the current page to the last page so it can show the latest transactions
     const maxPageNum = Math.ceil(storageResult.length / TRANSACTION_PAGE_SIZE);
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/hts/shared/methods/handleSanitizeFormInputs.tsx b/system-contract-dapp-playground/src/components/common/methods/handleSanitizeFormInputs.tsx
similarity index 99%
rename from system-contract-dapp-playground/src/components/contract-interaction/hts/shared/methods/handleSanitizeFormInputs.tsx
rename to system-contract-dapp-playground/src/components/common/methods/handleSanitizeFormInputs.tsx
index e9fecd784..6a5ecc61e 100644
--- a/system-contract-dapp-playground/src/components/contract-interaction/hts/shared/methods/handleSanitizeFormInputs.tsx
+++ b/system-contract-dapp-playground/src/components/common/methods/handleSanitizeFormInputs.tsx
@@ -19,7 +19,6 @@
  */
 
 import { isAddress } from 'ethers';
-import { CommonKeyObject } from '@/types/contract-interactions/HTS';
 import { isCompressedPublicKey } from '@/utils/contract-interactions/HTS/helpers';
 
 interface ParamsProps {
@@ -43,7 +42,7 @@ interface ParamsProps {
   serialNumbers?: number[];
   receiverAddress?: string;
   feeTokenAddress?: string;
-  keys?: CommonKeyObject[];
+  keys?: ICommonKeyObject[];
   autoRenewPeriod?: string;
   autoRenewAccount?: string;
   tokenAddresses?: string[];
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/hts/shared/methods/prepareInfoValuesToShow.tsx b/system-contract-dapp-playground/src/components/common/methods/prepareInfoValuesToShow.tsx
similarity index 100%
rename from system-contract-dapp-playground/src/components/contract-interaction/hts/shared/methods/prepareInfoValuesToShow.tsx
rename to system-contract-dapp-playground/src/components/common/methods/prepareInfoValuesToShow.tsx
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/erc/deployment/ERCDeployField.tsx b/system-contract-dapp-playground/src/components/contract-interaction/erc/deployment/ERCDeployField.tsx
index 448934adf..e4e8df7b8 100644
--- a/system-contract-dapp-playground/src/components/contract-interaction/erc/deployment/ERCDeployField.tsx
+++ b/system-contract-dapp-playground/src/components/contract-interaction/erc/deployment/ERCDeployField.tsx
@@ -22,7 +22,7 @@ import Image from 'next/image';
 import { useToast } from '@chakra-ui/react';
 import { Dispatch, SetStateAction, useState } from 'react';
 import { CommonErrorToast } from '../../../toast/CommonToast';
-import HederaCommonTextField from '../../../common/HederaCommonTextField';
+import HederaCommonTextField from '../../../common/components/HederaCommonTextField';
 
 interface PageProps {
   isDeploying: boolean;
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/erc/erc-20/methods/balance-of/index.tsx b/system-contract-dapp-playground/src/components/contract-interaction/erc/erc-20/methods/balance-of/index.tsx
index 71a4fe08a..c09b0ff57 100644
--- a/system-contract-dapp-playground/src/components/contract-interaction/erc/erc-20/methods/balance-of/index.tsx
+++ b/system-contract-dapp-playground/src/components/contract-interaction/erc/erc-20/methods/balance-of/index.tsx
@@ -23,10 +23,10 @@ import { Contract, isAddress } from 'ethers';
 import { useState, ReactNode, useCallback } from 'react';
 import { balanceOf } from '@/api/hedera/erc20-interactions';
 import { CommonErrorToast } from '@/components/toast/CommonToast';
-import HederaCommonTextField from '@/components/common/HederaCommonTextField';
+import HederaCommonTextField from '@/components/common/components/HederaCommonTextField';
 import { useToast, TableContainer, Table, Thead, Tr, Th, Tbody } from '@chakra-ui/react';
-import useUpdateMapStateUILocalStorage from '../../../shared/hooks/useUpdateMapStateUILocalStorage';
-import useRetrieveMapValueFromLocalStorage from '../../../shared/hooks/useRetrieveMapValueFromLocalStorage';
+import useUpdateMapStateUILocalStorage from '../../../../../../hooks/useUpdateMapStateUILocalStorage';
+import useRetrieveMapValueFromLocalStorage from '../../../../../../hooks/useRetrieveMapValueFromLocalStorage';
 import {
   HEDERA_BRANDING_COLORS,
   HEDERA_CHAKRA_TABLE_VARIANTS,
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/erc/erc-20/methods/mint/index.tsx b/system-contract-dapp-playground/src/components/contract-interaction/erc/erc-20/methods/mint/index.tsx
index 18b5679d1..45b2ece0b 100644
--- a/system-contract-dapp-playground/src/components/contract-interaction/erc/erc-20/methods/mint/index.tsx
+++ b/system-contract-dapp-playground/src/components/contract-interaction/erc/erc-20/methods/mint/index.tsx
@@ -24,12 +24,12 @@ import { useEffect, useState } from 'react';
 import { Contract, isAddress } from 'ethers';
 import { erc20Mint } from '@/api/hedera/erc20-interactions';
 import { CommonErrorToast } from '@/components/toast/CommonToast';
-import MultiLineMethod from '@/components/common/MultiLineMethod';
-import { TransactionResult } from '@/types/contract-interactions/HTS';
+import { ITransactionResult } from '@/types/contract-interactions/shared';
+import MultiLineMethod from '@/components/common/components/MultiLineMethod';
+import { handleAPIErrors } from '@/components/common/methods/handleAPIErrors';
 import { mintParamFields } from '@/utils/contract-interactions/erc/erc20/constant';
+import { useUpdateTransactionResultsToLocalStorage } from '@/hooks/useUpdateLocalStorage';
 import { CONTRACT_NAMES, HEDERA_TRANSACTION_RESULT_STORAGE_KEYS } from '@/utils/common/constants';
-import { handleAPIErrors } from '@/components/contract-interaction/hts/shared/methods/handleAPIErrors';
-import { useUpdateTransactionResultsToLocalStorage } from '@/components/contract-interaction/hts/shared/hooks/useUpdateLocalStorage';
 
 interface PageProps {
   baseContract: Contract;
@@ -40,7 +40,7 @@ const Mint = ({ baseContract }: PageProps) => {
   const [isLoading, setIsLoading] = useState(false);
   const [isSuccessful, setIsSuccessful] = useState(false);
   const currentContractAddress = Cookies.get(CONTRACT_NAMES.ERC20) as string;
-  const [transactionResults, setTransactionResults] = useState<TransactionResult[]>([]);
+  const [transactionResults, setTransactionResults] = useState<ITransactionResult[]>([]);
   const transactionResultStorageKey = HEDERA_TRANSACTION_RESULT_STORAGE_KEYS['ERC20-RESULT']['TOKEN-MINT'];
   const [mintParams, setMintParams] = useState({
     recipient: '',
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/erc/erc-20/methods/token-information/index.tsx b/system-contract-dapp-playground/src/components/contract-interaction/erc/erc-20/methods/token-information/index.tsx
index 9174ec8ba..824ba3fce 100644
--- a/system-contract-dapp-playground/src/components/contract-interaction/erc/erc-20/methods/token-information/index.tsx
+++ b/system-contract-dapp-playground/src/components/contract-interaction/erc/erc-20/methods/token-information/index.tsx
@@ -21,8 +21,8 @@
 import { useState } from 'react';
 import { Contract } from 'ethers';
 import { useToast } from '@chakra-ui/react';
-import OneLineMethod from '@/components/common/OneLineMethod';
 import { CommonErrorToast } from '@/components/toast/CommonToast';
+import OneLineMethod from '@/components/common/components/OneLineMethod';
 import { getERC20TokenInformation } from '@/api/hedera/erc20-interactions';
 import { HEDERA_COMMON_WALLET_REVERT_REASONS } from '@/utils/common/constants';
 
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/erc/erc-20/methods/token-permission/index.tsx b/system-contract-dapp-playground/src/components/contract-interaction/erc/erc-20/methods/token-permission/index.tsx
index c195ccc9a..b807f9515 100644
--- a/system-contract-dapp-playground/src/components/contract-interaction/erc/erc-20/methods/token-permission/index.tsx
+++ b/system-contract-dapp-playground/src/components/contract-interaction/erc/erc-20/methods/token-permission/index.tsx
@@ -25,15 +25,15 @@ import { BiCopy } from 'react-icons/bi';
 import { AiOutlineMinus } from 'react-icons/ai';
 import { IoRefreshOutline } from 'react-icons/io5';
 import { CommonErrorToast } from '@/components/toast/CommonToast';
-import MultiLineMethod from '@/components/common/MultiLineMethod';
 import { Dispatch, SetStateAction, useEffect, useState } from 'react';
-import { TransactionResult } from '@/types/contract-interactions/HTS';
-import { copyContentToClipboard } from '../../../shared/methods/common';
 import { getArrayTypedValuesFromLocalStorage } from '@/api/localStorage';
+import { ITransactionResult } from '@/types/contract-interactions/shared';
+import MultiLineMethod from '@/components/common/components/MultiLineMethod';
+import { copyContentToClipboard } from '../../../../../common/methods/common';
 import { handleErc20TokenPermissions } from '@/api/hedera/erc20-interactions';
-import { handleAPIErrors } from '@/components/contract-interaction/hts/shared/methods/handleAPIErrors';
-import { useUpdateTransactionResultsToLocalStorage } from '@/components/contract-interaction/hts/shared/hooks/useUpdateLocalStorage';
-import { handleRetrievingTransactionResultsFromLocalStorage } from '@/components/contract-interaction/hts/shared/methods/handleRetrievingTransactionResultsFromLocalStorage';
+import { handleAPIErrors } from '@/components/common/methods/handleAPIErrors';
+import { useUpdateTransactionResultsToLocalStorage } from '@/hooks/useUpdateLocalStorage';
+import { handleRetrievingTransactionResultsFromLocalStorage } from '@/components/common/methods/handleRetrievingTransactionResultsFromLocalStorage';
 import {
   HEDERA_BRANDING_COLORS,
   HEDERA_CHAKRA_TABLE_VARIANTS,
@@ -77,7 +77,7 @@ const TokenPermission = ({ baseContract }: PageProps) => {
   const toaster = useToast();
   const [allowances, setAllowances] = useState<Allowance[]>([]);
   const currentContractAddress = Cookies.get(CONTRACT_NAMES.ERC20) as string;
-  const [transactionResults, setTransactionResults] = useState<TransactionResult[]>([]);
+  const [transactionResults, setTransactionResults] = useState<ITransactionResult[]>([]);
   const transactionResultStorageKey =
     HEDERA_TRANSACTION_RESULT_STORAGE_KEYS['ERC20-RESULT']['TOKEN-PERMISSION'];
   const allowanceStorageKey = HEDERA_TRANSACTION_RESULT_STORAGE_KEYS['ERC20-RESULT']['ALLOWANCES-RESULT'];
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/erc/erc-20/methods/token-transfer/index.tsx b/system-contract-dapp-playground/src/components/contract-interaction/erc/erc-20/methods/token-transfer/index.tsx
index 987284875..d18eda674 100644
--- a/system-contract-dapp-playground/src/components/contract-interaction/erc/erc-20/methods/token-transfer/index.tsx
+++ b/system-contract-dapp-playground/src/components/contract-interaction/erc/erc-20/methods/token-transfer/index.tsx
@@ -24,14 +24,14 @@ import { isAddress } from 'ethers';
 import { useToast } from '@chakra-ui/react';
 import { erc20Transfers } from '@/api/hedera/erc20-interactions';
 import { CommonErrorToast } from '@/components/toast/CommonToast';
-import MultiLineMethod from '@/components/common/MultiLineMethod';
 import { Dispatch, SetStateAction, useEffect, useState } from 'react';
-import { TransactionResult } from '@/types/contract-interactions/HTS';
 import { convertCalmelCaseFunctionName } from '@/utils/common/helpers';
+import { ITransactionResult } from '@/types/contract-interactions/shared';
+import MultiLineMethod from '@/components/common/components/MultiLineMethod';
+import { handleAPIErrors } from '@/components/common/methods/handleAPIErrors';
+import { useUpdateTransactionResultsToLocalStorage } from '@/hooks/useUpdateLocalStorage';
 import { CONTRACT_NAMES, HEDERA_TRANSACTION_RESULT_STORAGE_KEYS } from '@/utils/common/constants';
-import { handleAPIErrors } from '@/components/contract-interaction/hts/shared/methods/handleAPIErrors';
-import { useUpdateTransactionResultsToLocalStorage } from '@/components/contract-interaction/hts/shared/hooks/useUpdateLocalStorage';
-import { handleRetrievingTransactionResultsFromLocalStorage } from '@/components/contract-interaction/hts/shared/methods/handleRetrievingTransactionResultsFromLocalStorage';
+import { handleRetrievingTransactionResultsFromLocalStorage } from '@/components/common/methods/handleRetrievingTransactionResultsFromLocalStorage';
 import {
   transferParamFields,
   transferFromParamFields,
@@ -46,7 +46,7 @@ const Transfer = ({ baseContract }: PageProps) => {
   const transactionResultStorageKey =
     HEDERA_TRANSACTION_RESULT_STORAGE_KEYS['ERC20-RESULT']['TOKEN-TRANSFER'];
   const currentContractAddress = Cookies.get(CONTRACT_NAMES.ERC20) as string;
-  const [transactionResults, setTransactionResults] = useState<TransactionResult[]>([]);
+  const [transactionResults, setTransactionResults] = useState<ITransactionResult[]>([]);
 
   const [transferParams, setTransferParams] = useState({
     owner: '',
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/erc/erc-721/methods/approve/index.tsx b/system-contract-dapp-playground/src/components/contract-interaction/erc/erc-721/methods/approve/index.tsx
index 124281c8c..006d328ae 100644
--- a/system-contract-dapp-playground/src/components/contract-interaction/erc/erc-721/methods/approve/index.tsx
+++ b/system-contract-dapp-playground/src/components/contract-interaction/erc/erc-721/methods/approve/index.tsx
@@ -22,19 +22,19 @@ import Image from 'next/image';
 import Cookies from 'js-cookie';
 import { Contract } from 'ethers';
 import { isAddress } from 'ethers';
-import MultiLineMethod from '@/components/common/MultiLineMethod';
 import { CommonErrorToast } from '@/components/toast/CommonToast';
 import { ReactNode, useCallback, useEffect, useState } from 'react';
-import { TransactionResult } from '@/types/contract-interactions/HTS';
 import { erc721TokenApprove } from '@/api/hedera/erc721-interactions';
-import HederaCommonTextField from '@/components/common/HederaCommonTextField';
+import { ITransactionResult } from '@/types/contract-interactions/shared';
+import MultiLineMethod from '@/components/common/components/MultiLineMethod';
+import { handleAPIErrors } from '@/components/common/methods/handleAPIErrors';
+import HederaCommonTextField from '@/components/common/components/HederaCommonTextField';
 import { Th, Tr, Table, Tbody, Thead, useToast, TableContainer } from '@chakra-ui/react';
+import { useUpdateTransactionResultsToLocalStorage } from '@/hooks/useUpdateLocalStorage';
 import { approveERC721ParamFields } from '@/utils/contract-interactions/erc/erc721/constant';
-import useUpdateMapStateUILocalStorage from '../../../shared/hooks/useUpdateMapStateUILocalStorage';
-import { handleAPIErrors } from '@/components/contract-interaction/hts/shared/methods/handleAPIErrors';
-import useRetrieveMapValueFromLocalStorage from '../../../shared/hooks/useRetrieveMapValueFromLocalStorage';
-import { useUpdateTransactionResultsToLocalStorage } from '@/components/contract-interaction/hts/shared/hooks/useUpdateLocalStorage';
-import { handleRetrievingTransactionResultsFromLocalStorage } from '@/components/contract-interaction/hts/shared/methods/handleRetrievingTransactionResultsFromLocalStorage';
+import useUpdateMapStateUILocalStorage from '../../../../../../hooks/useUpdateMapStateUILocalStorage';
+import useRetrieveMapValueFromLocalStorage from '../../../../../../hooks/useRetrieveMapValueFromLocalStorage';
+import { handleRetrievingTransactionResultsFromLocalStorage } from '@/components/common/methods/handleRetrievingTransactionResultsFromLocalStorage';
 import {
   CONTRACT_NAMES,
   HEDERA_BRANDING_COLORS,
@@ -54,7 +54,7 @@ const ERC721Approve = ({ baseContract }: PageProps) => {
   const [getApproveTokenId, setGetApproveTokenId] = useState('');
   const currentContractAddress = Cookies.get(CONTRACT_NAMES.ERC721) as string;
   const [tokenSpenders, setTokenSpenders] = useState(new Map<number, string>());
-  const [transactionResults, setTransactionResults] = useState<TransactionResult[]>([]);
+  const [transactionResults, setTransactionResults] = useState<ITransactionResult[]>([]);
   const tokenSpenderResultsStorageKey =
     HEDERA_TRANSACTION_RESULT_STORAGE_KEYS['ERC721-RESULT']['GET-APPROVE'];
   const transactionResultStorageKey =
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/erc/erc-721/methods/balance-of/index.tsx b/system-contract-dapp-playground/src/components/contract-interaction/erc/erc-721/methods/balance-of/index.tsx
index 79627fe8b..0b91cf4fb 100644
--- a/system-contract-dapp-playground/src/components/contract-interaction/erc/erc-721/methods/balance-of/index.tsx
+++ b/system-contract-dapp-playground/src/components/contract-interaction/erc/erc-721/methods/balance-of/index.tsx
@@ -23,10 +23,10 @@ import { Contract, isAddress } from 'ethers';
 import { ReactNode, useCallback, useState } from 'react';
 import { CommonErrorToast } from '@/components/toast/CommonToast';
 import { erc721BalanceOf } from '@/api/hedera/erc721-interactions';
-import HederaCommonTextField from '@/components/common/HederaCommonTextField';
+import HederaCommonTextField from '@/components/common/components/HederaCommonTextField';
 import { Table, TableContainer, Tbody, Th, Thead, Tr, useToast } from '@chakra-ui/react';
-import useUpdateMapStateUILocalStorage from '../../../shared/hooks/useUpdateMapStateUILocalStorage';
-import useRetrieveMapValueFromLocalStorage from '../../../shared/hooks/useRetrieveMapValueFromLocalStorage';
+import useUpdateMapStateUILocalStorage from '../../../../../../hooks/useUpdateMapStateUILocalStorage';
+import useRetrieveMapValueFromLocalStorage from '../../../../../../hooks/useRetrieveMapValueFromLocalStorage';
 import {
   HEDERA_BRANDING_COLORS,
   HEDERA_CHAKRA_TABLE_VARIANTS,
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/erc/erc-721/methods/mint/index.tsx b/system-contract-dapp-playground/src/components/contract-interaction/erc/erc-721/methods/mint/index.tsx
index 3105ef8b4..8496cbc65 100644
--- a/system-contract-dapp-playground/src/components/contract-interaction/erc/erc-721/methods/mint/index.tsx
+++ b/system-contract-dapp-playground/src/components/contract-interaction/erc/erc-721/methods/mint/index.tsx
@@ -24,12 +24,12 @@ import { useEffect, useState } from 'react';
 import { Contract, isAddress } from 'ethers';
 import { erc721Mint } from '@/api/hedera/erc721-interactions';
 import { CommonErrorToast } from '@/components/toast/CommonToast';
-import MultiLineMethod from '@/components/common/MultiLineMethod';
-import { TransactionResult } from '@/types/contract-interactions/HTS';
-import { CONTRACT_NAMES, HEDERA_TRANSACTION_RESULT_STORAGE_KEYS } from '@/utils/common/constants';
+import { ITransactionResult } from '@/types/contract-interactions/shared';
+import MultiLineMethod from '@/components/common/components/MultiLineMethod';
+import { handleAPIErrors } from '@/components/common/methods/handleAPIErrors';
 import { mintParamFields } from '@/utils/contract-interactions/erc/erc721/constant';
-import { handleAPIErrors } from '@/components/contract-interaction/hts/shared/methods/handleAPIErrors';
-import { useUpdateTransactionResultsToLocalStorage } from '@/components/contract-interaction/hts/shared/hooks/useUpdateLocalStorage';
+import { CONTRACT_NAMES, HEDERA_TRANSACTION_RESULT_STORAGE_KEYS } from '@/utils/common/constants';
+import { useUpdateTransactionResultsToLocalStorage } from '@/hooks/useUpdateLocalStorage';
 
 interface PageProps {
   baseContract: Contract;
@@ -40,7 +40,7 @@ const Mint = ({ baseContract }: PageProps) => {
   const [isLoading, setIsLoading] = useState(false);
   const [isSuccessful, setIsSuccessful] = useState(false);
   const currentContractAddress = Cookies.get(CONTRACT_NAMES.ERC721) as string;
-  const [transactionResults, setTransactionResults] = useState<TransactionResult[]>([]);
+  const [transactionResults, setTransactionResults] = useState<ITransactionResult[]>([]);
   const transactionResultStorageKey = HEDERA_TRANSACTION_RESULT_STORAGE_KEYS['ERC721-RESULT']['TOKEN-MINT'];
   const [mintParams, setMintParams] = useState({
     recipient: '',
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/erc/erc-721/methods/operator-approve/index.tsx b/system-contract-dapp-playground/src/components/contract-interaction/erc/erc-721/methods/operator-approve/index.tsx
index 770577446..78831bfc1 100644
--- a/system-contract-dapp-playground/src/components/contract-interaction/erc/erc-721/methods/operator-approve/index.tsx
+++ b/system-contract-dapp-playground/src/components/contract-interaction/erc/erc-721/methods/operator-approve/index.tsx
@@ -26,15 +26,15 @@ import { useEffect, useState } from 'react';
 import { AiOutlineMinus } from 'react-icons/ai';
 import { IoRefreshOutline } from 'react-icons/io5';
 import { CommonErrorToast } from '@/components/toast/CommonToast';
-import MultiLineMethod from '@/components/common/MultiLineMethod';
-import { TransactionResult } from '@/types/contract-interactions/HTS';
+import { ITransactionResult } from '@/types/contract-interactions/shared';
 import { erc721TokenApproval } from '@/api/hedera/erc721-interactions';
-import { copyContentToClipboard } from '../../../shared/methods/common';
+import { copyContentToClipboard } from '../../../../../common/methods/common';
 import { getArrayTypedValuesFromLocalStorage } from '@/api/localStorage';
+import MultiLineMethod from '@/components/common/components/MultiLineMethod';
+import { handleAPIErrors } from '@/components/common/methods/handleAPIErrors';
+import { useUpdateTransactionResultsToLocalStorage } from '@/hooks/useUpdateLocalStorage';
 import { isApprovalERC721ParamFields } from '@/utils/contract-interactions/erc/erc721/constant';
-import { handleAPIErrors } from '@/components/contract-interaction/hts/shared/methods/handleAPIErrors';
-import { useUpdateTransactionResultsToLocalStorage } from '@/components/contract-interaction/hts/shared/hooks/useUpdateLocalStorage';
-import { handleRetrievingTransactionResultsFromLocalStorage } from '@/components/contract-interaction/hts/shared/methods/handleRetrievingTransactionResultsFromLocalStorage';
+import { handleRetrievingTransactionResultsFromLocalStorage } from '@/components/common/methods/handleRetrievingTransactionResultsFromLocalStorage';
 import {
   Td,
   Th,
@@ -79,7 +79,7 @@ const ERC721OperatorApproval = ({ baseContract }: PageProps) => {
   const [successStatus, setSuccessStatus] = useState(false);
   const currentContractAddress = Cookies.get(CONTRACT_NAMES.ERC721) as string;
   const [approvalRecords, setApprovalRecords] = useState<ApprovalStatus[]>([]);
-  const [transactionResults, setTransactionResults] = useState<TransactionResult[]>([]);
+  const [transactionResults, setTransactionResults] = useState<ITransactionResult[]>([]);
   const approvalStatusStorageKey = HEDERA_TRANSACTION_RESULT_STORAGE_KEYS['ERC721-RESULT']['GET-APPROVAL'];
   const transactionResultStorageKey = HEDERA_TRANSACTION_RESULT_STORAGE_KEYS['ERC721-RESULT']['SET-APPROVAL'];
   const [isLoading, setIsLoading] = useState({
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/erc/erc-721/methods/owner-of/index.tsx b/system-contract-dapp-playground/src/components/contract-interaction/erc/erc-721/methods/owner-of/index.tsx
index f62016a59..4dbe651aa 100644
--- a/system-contract-dapp-playground/src/components/contract-interaction/erc/erc-721/methods/owner-of/index.tsx
+++ b/system-contract-dapp-playground/src/components/contract-interaction/erc/erc-721/methods/owner-of/index.tsx
@@ -23,10 +23,10 @@ import { Contract } from 'ethers';
 import { ReactNode, useCallback, useState } from 'react';
 import { erc721OwnerOf } from '@/api/hedera/erc721-interactions';
 import { CommonErrorToast } from '@/components/toast/CommonToast';
-import HederaCommonTextField from '@/components/common/HederaCommonTextField';
+import HederaCommonTextField from '@/components/common/components/HederaCommonTextField';
 import { Table, TableContainer, Tbody, Th, Thead, Tr, useToast } from '@chakra-ui/react';
-import useUpdateMapStateUILocalStorage from '../../../shared/hooks/useUpdateMapStateUILocalStorage';
-import useRetrieveMapValueFromLocalStorage from '../../../shared/hooks/useRetrieveMapValueFromLocalStorage';
+import useUpdateMapStateUILocalStorage from '../../../../../../hooks/useUpdateMapStateUILocalStorage';
+import useRetrieveMapValueFromLocalStorage from '../../../../../../hooks/useRetrieveMapValueFromLocalStorage';
 import {
   HEDERA_BRANDING_COLORS,
   HEDERA_CHAKRA_TABLE_VARIANTS,
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/erc/erc-721/methods/token-information/index.tsx b/system-contract-dapp-playground/src/components/contract-interaction/erc/erc-721/methods/token-information/index.tsx
index 6697caa48..c482add07 100644
--- a/system-contract-dapp-playground/src/components/contract-interaction/erc/erc-721/methods/token-information/index.tsx
+++ b/system-contract-dapp-playground/src/components/contract-interaction/erc/erc-721/methods/token-information/index.tsx
@@ -21,8 +21,8 @@
 import { useState } from 'react';
 import { Contract } from 'ethers';
 import { useToast } from '@chakra-ui/react';
-import OneLineMethod from '@/components/common/OneLineMethod';
 import { CommonErrorToast } from '@/components/toast/CommonToast';
+import OneLineMethod from '@/components/common/components/OneLineMethod';
 import { getERC721TokenInformation } from '@/api/hedera/erc721-interactions';
 import { HEDERA_COMMON_WALLET_REVERT_REASONS } from '@/utils/common/constants';
 
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/erc/erc-721/methods/token-transfer/index.tsx b/system-contract-dapp-playground/src/components/contract-interaction/erc/erc-721/methods/token-transfer/index.tsx
index e7b63a950..94fac5423 100644
--- a/system-contract-dapp-playground/src/components/contract-interaction/erc/erc-721/methods/token-transfer/index.tsx
+++ b/system-contract-dapp-playground/src/components/contract-interaction/erc/erc-721/methods/token-transfer/index.tsx
@@ -24,14 +24,14 @@ import { isAddress } from 'ethers';
 import { useToast } from '@chakra-ui/react';
 import { useEffect, useState } from 'react';
 import { CommonErrorToast } from '@/components/toast/CommonToast';
-import MultiLineMethod from '@/components/common/MultiLineMethod';
 import { erc721Transfers } from '@/api/hedera/erc721-interactions';
-import { TransactionResult } from '@/types/contract-interactions/HTS';
+import { ITransactionResult } from '@/types/contract-interactions/shared';
 import { convertCalmelCaseFunctionName } from '@/utils/common/helpers';
+import MultiLineMethod from '@/components/common/components/MultiLineMethod';
+import { handleAPIErrors } from '@/components/common/methods/handleAPIErrors';
+import { useUpdateTransactionResultsToLocalStorage } from '@/hooks/useUpdateLocalStorage';
 import { CONTRACT_NAMES, HEDERA_TRANSACTION_RESULT_STORAGE_KEYS } from '@/utils/common/constants';
-import { handleAPIErrors } from '@/components/contract-interaction/hts/shared/methods/handleAPIErrors';
-import { useUpdateTransactionResultsToLocalStorage } from '@/components/contract-interaction/hts/shared/hooks/useUpdateLocalStorage';
-import { handleRetrievingTransactionResultsFromLocalStorage } from '@/components/contract-interaction/hts/shared/methods/handleRetrievingTransactionResultsFromLocalStorage';
+import { handleRetrievingTransactionResultsFromLocalStorage } from '@/components/common/methods/handleRetrievingTransactionResultsFromLocalStorage';
 import {
   transferFromERC721ParamFields,
   safeTransferFromERC721ParamFields,
@@ -46,7 +46,7 @@ const ERC721Transfer = ({ baseContract }: PageProps) => {
   const transactionResultStorageKey =
     HEDERA_TRANSACTION_RESULT_STORAGE_KEYS['ERC721-RESULT']['TOKEN-TRANSFER'];
   const currentContractAddress = Cookies.get(CONTRACT_NAMES.ERC721) as string;
-  const [transactionResults, setTransactionResults] = useState<TransactionResult[]>([]);
+  const [transactionResults, setTransactionResults] = useState<ITransactionResult[]>([]);
 
   const [transferFromParams, setTransferFromParams] = useState({
     sender: '',
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/erc/erc-721/methods/token-uri/index.tsx b/system-contract-dapp-playground/src/components/contract-interaction/erc/erc-721/methods/token-uri/index.tsx
index 668f00d76..06bb08d4b 100644
--- a/system-contract-dapp-playground/src/components/contract-interaction/erc/erc-721/methods/token-uri/index.tsx
+++ b/system-contract-dapp-playground/src/components/contract-interaction/erc/erc-721/methods/token-uri/index.tsx
@@ -23,10 +23,10 @@ import { Contract } from 'ethers';
 import { ReactNode, useCallback, useState } from 'react';
 import { CommonErrorToast } from '@/components/toast/CommonToast';
 import { erc721TokenURI } from '@/api/hedera/erc721-interactions';
-import HederaCommonTextField from '@/components/common/HederaCommonTextField';
+import HederaCommonTextField from '@/components/common/components/HederaCommonTextField';
 import { Table, TableContainer, Tbody, Th, Thead, Tr, useToast } from '@chakra-ui/react';
-import useUpdateMapStateUILocalStorage from '../../../shared/hooks/useUpdateMapStateUILocalStorage';
-import useRetrieveMapValueFromLocalStorage from '../../../shared/hooks/useRetrieveMapValueFromLocalStorage';
+import useUpdateMapStateUILocalStorage from '../../../../../../hooks/useUpdateMapStateUILocalStorage';
+import useRetrieveMapValueFromLocalStorage from '../../../../../../hooks/useRetrieveMapValueFromLocalStorage';
 import {
   HEDERA_BRANDING_COLORS,
   HEDERA_CHAKRA_TABLE_VARIANTS,
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/exchange-rate/deployment/ExchangeRateDeployField.tsx b/system-contract-dapp-playground/src/components/contract-interaction/exchange-rate/deployment/ExchangeRateDeployField.tsx
index 6a5759175..3c3e70ed0 100644
--- a/system-contract-dapp-playground/src/components/contract-interaction/exchange-rate/deployment/ExchangeRateDeployField.tsx
+++ b/system-contract-dapp-playground/src/components/contract-interaction/exchange-rate/deployment/ExchangeRateDeployField.tsx
@@ -22,7 +22,7 @@ import Image from 'next/image';
 import { useToast } from '@chakra-ui/react';
 import { Dispatch, SetStateAction, useState } from 'react';
 import { CommonErrorToast } from '../../../toast/CommonToast';
-import HederaCommonTextField from '../../../common/HederaCommonTextField';
+import HederaCommonTextField from '../../../common/components/HederaCommonTextField';
 
 interface PageProps {
   isDeploying: boolean;
@@ -30,11 +30,7 @@ interface PageProps {
   setDidDeployStart: Dispatch<SetStateAction<boolean>>;
 }
 
-const ExchangeRateDeployField = ({
-  isDeploying,
-  setDidDeployStart,
-  setDeployedParams,
-}: PageProps) => {
+const ExchangeRateDeployField = ({ isDeploying, setDidDeployStart, setDeployedParams }: PageProps) => {
   const toaster = useToast();
   const [value, setValue] = useState('');
 
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/exchange-rate/methods/index.tsx b/system-contract-dapp-playground/src/components/contract-interaction/exchange-rate/methods/index.tsx
index 7e1bae6f7..be3fdb4ca 100644
--- a/system-contract-dapp-playground/src/components/contract-interaction/exchange-rate/methods/index.tsx
+++ b/system-contract-dapp-playground/src/components/contract-interaction/exchange-rate/methods/index.tsx
@@ -23,18 +23,18 @@ import { Contract } from 'ethers';
 import { useToast } from '@chakra-ui/react';
 import { useEffect, useState } from 'react';
 import { CommonErrorToast } from '@/components/toast/CommonToast';
-import { TransactionResult } from '@/types/contract-interactions/HTS';
-import { handleAPIErrors } from '../../hts/shared/methods/handleAPIErrors';
+import { ITransactionResult } from '@/types/contract-interactions/shared';
+import { handleAPIErrors } from '../../../common/methods/handleAPIErrors';
+import { useToastSuccessful } from '../../../../hooks/useToastSuccessful';
 import { handleExchangeRate } from '@/api/hedera/exchange-rate-interactions';
 import { TRANSACTION_PAGE_SIZE } from '../../hts/shared/states/commonStates';
-import { useToastSuccessful } from '../../hts/shared/hooks/useToastSuccessful';
-import { usePaginatedTxResults } from '../../hts/shared/hooks/usePaginatedTxResults';
-import { TransactionResultTable } from '../../hts/shared/components/TransactionResultTable';
-import { handleSanitizeHederaFormInputs } from '../../hts/shared/methods/handleSanitizeFormInputs';
+import { usePaginatedTxResults } from '../../../../hooks/usePaginatedTxResults';
+import { TransactionResultTable } from '../../../common/components/TransactionResultTable';
+import { handleSanitizeHederaFormInputs } from '../../../common/methods/handleSanitizeFormInputs';
+import { useUpdateTransactionResultsToLocalStorage } from '../../../../hooks/useUpdateLocalStorage';
 import { SharedExecuteButton, SharedFormInputField } from '../../hts/shared/components/ParamInputForm';
-import { useUpdateTransactionResultsToLocalStorage } from '../../hts/shared/hooks/useUpdateLocalStorage';
-import useFilterTransactionsByContractAddress from '../../hts/shared/hooks/useFilterTransactionsByContractAddress';
-import { handleRetrievingTransactionResultsFromLocalStorage } from '../../hts/shared/methods/handleRetrievingTransactionResultsFromLocalStorage';
+import useFilterTransactionsByContractAddress from '../../../../hooks/useFilterTransactionsByContractAddress';
+import { handleRetrievingTransactionResultsFromLocalStorage } from '../../../common/methods/handleRetrievingTransactionResultsFromLocalStorage';
 import {
   CONTRACT_NAMES,
   HEDERA_BRANDING_COLORS,
@@ -58,7 +58,7 @@ const HederaExchangeRateMethods = ({ baseContract }: PageProps) => {
   const hederaNetwork = JSON.parse(Cookies.get('_network') as string);
   const [currentTransactionPage, setCurrentTransactionPage] = useState(1);
   const currentContractAddress = Cookies.get(CONTRACT_NAMES.EXCHANGE_RATE) as string;
-  const [transactionResults, setTransactionResults] = useState<TransactionResult[]>([]);
+  const [transactionResults, setTransactionResults] = useState<ITransactionResult[]>([]);
   const transactionResultStorageKey =
     HEDERA_TRANSACTION_RESULT_STORAGE_KEYS['EXCHANGE-RATE-RESULT']['EXCHANGE-RATE'];
   const [isLoading, setIsLoading] = useState({
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/hts/shared/components/SigningKeysForm.tsx b/system-contract-dapp-playground/src/components/contract-interaction/hts/shared/components/SigningKeysForm.tsx
index b538da94c..fb200a2ad 100644
--- a/system-contract-dapp-playground/src/components/contract-interaction/hts/shared/components/SigningKeysForm.tsx
+++ b/system-contract-dapp-playground/src/components/contract-interaction/hts/shared/components/SigningKeysForm.tsx
@@ -28,11 +28,6 @@ import {
   HEDERA_CHAKRA_INPUT_BOX_SIZES,
   HEDERA_CHAKRA_INPUT_BOX_SHARED_CLASSNAME,
 } from '@/utils/common/constants';
-import {
-  CommonKeyObject,
-  IHederaTokenServiceKeyType,
-  IHederaTokenServiceKeyValueType,
-} from '@/types/contract-interactions/HTS';
 import {
   handleUpdateKeyValue,
   handleKeyTypeOnChange,
@@ -43,11 +38,11 @@ import {
 /** @dev shared component presenting signing keys*/
 interface SigningKeyPageProps {
   buttonTitle: string;
-  keys: CommonKeyObject[];
+  keys: ICommonKeyObject[];
   chosenKeys: Set<IHederaTokenServiceKeyType>;
   keyTypesToShow: Set<IHederaTokenServiceKeyType>;
   HederaTokenKeyTypes: IHederaTokenServiceKeyType[];
-  setKeys: Dispatch<SetStateAction<CommonKeyObject[]>>;
+  setKeys: Dispatch<SetStateAction<ICommonKeyObject[]>>;
   HederaTokenKeyValueType: IHederaTokenServiceKeyValueType[];
   setChosenKeys: Dispatch<SetStateAction<Set<IHederaTokenServiceKeyType>>>;
   setKeyTypesToShow: Dispatch<SetStateAction<Set<IHederaTokenServiceKeyType>>>;
@@ -70,11 +65,7 @@ export const SharedSigningKeysComponent = ({
         {/* Add more key */}
         <div className="flex flex-col gap-0">
           {keys.length < 7 && (
-            <Tooltip
-              label={keys.length !== 0 && 'Add more keys'}
-              placement="top"
-              fontWeight={'medium'}
-            >
+            <Tooltip label={keys.length !== 0 && 'Add more keys'} placement="top" fontWeight={'medium'}>
               <button
                 onClick={() =>
                   handleAddingOrRemovingKeys(
@@ -104,9 +95,7 @@ export const SharedSigningKeysComponent = ({
                 _focus={{ borderColor: HEDERA_BRANDING_COLORS.purple }}
                 placeholder={key.keyType}
                 className="w-[120px] hover:cursor-pointer rounded-md border-white/30"
-                onChange={(e) =>
-                  handleKeyTypeOnChange(e, key, setKeys, setChosenKeys, setKeyTypesToShow)
-                }
+                onChange={(e) => handleKeyTypeOnChange(e, key, setKeys, setChosenKeys, setKeyTypesToShow)}
               >
                 {Array.from(keyTypesToShow).map((keyType) => {
                   return (
@@ -151,8 +140,7 @@ export const SharedSigningKeysComponent = ({
                   type={'text'}
                   onChange={(e) => handleUpdateKeyValue(e, key, setKeys)}
                   placeholder={
-                    key.keyValueType === 'contractId' ||
-                    key.keyValueType === 'delegatableContractId'
+                    key.keyValueType === 'contractId' || key.keyValueType === 'delegatableContractId'
                       ? 'ID of a smart contract instance...'
                       : `${key.keyValueType.split('_')[0].toUpperCase()} compressed public key...`
                   }
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/hts/shared/components/TokenGeneralInfoModal.tsx b/system-contract-dapp-playground/src/components/contract-interaction/hts/shared/components/TokenGeneralInfoModal.tsx
index 5074b4a86..ca7bfdc28 100644
--- a/system-contract-dapp-playground/src/components/contract-interaction/hts/shared/components/TokenGeneralInfoModal.tsx
+++ b/system-contract-dapp-playground/src/components/contract-interaction/hts/shared/components/TokenGeneralInfoModal.tsx
@@ -21,7 +21,7 @@
 import Link from 'next/link';
 import React, { Dispatch, SetStateAction } from 'react';
 import { convertCalmelCaseFunctionName } from '@/utils/common/helpers';
-import { prepareInfoValuesToShow } from '../methods/prepareInfoValuesToShow';
+import { prepareInfoValuesToShow } from '../../../../common/methods/prepareInfoValuesToShow';
 import {
   HEDERA_BRANDING_COLORS,
   HEDERA_CHAKRA_TABLE_VARIANTS,
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/hts/shared/components/TokenSpecificInfoModal.tsx b/system-contract-dapp-playground/src/components/contract-interaction/hts/shared/components/TokenSpecificInfoModal.tsx
index 63aeca2ce..26966846f 100644
--- a/system-contract-dapp-playground/src/components/contract-interaction/hts/shared/components/TokenSpecificInfoModal.tsx
+++ b/system-contract-dapp-playground/src/components/contract-interaction/hts/shared/components/TokenSpecificInfoModal.tsx
@@ -21,8 +21,7 @@
 import Link from 'next/link';
 import { Dispatch, SetStateAction } from 'react';
 import { convertCalmelCaseFunctionName } from '@/utils/common/helpers';
-import { prepareInfoValuesToShow } from '../methods/prepareInfoValuesToShow';
-import { IHederaTokenServiceKeyType } from '@/types/contract-interactions/HTS';
+import { prepareInfoValuesToShow } from '../../../../common/methods/prepareInfoValuesToShow';
 import {
   HEDERA_BRANDING_COLORS,
   HEDERA_CHAKRA_TABLE_VARIANTS,
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/hts/shared/methods/signingKeys.tsx b/system-contract-dapp-playground/src/components/contract-interaction/hts/shared/methods/signingKeys.tsx
index bdf708da4..dba2768ad 100644
--- a/system-contract-dapp-playground/src/components/contract-interaction/hts/shared/methods/signingKeys.tsx
+++ b/system-contract-dapp-playground/src/components/contract-interaction/hts/shared/methods/signingKeys.tsx
@@ -19,14 +19,13 @@
  */
 
 import { Dispatch, SetStateAction } from 'react';
-import { IHederaTokenServiceKeyType, CommonKeyObject } from '@/types/contract-interactions/HTS';
 
 /** @dev handle updating number of keys*/
 export const handleAddingOrRemovingKeys = (
   type: 'ADD' | 'REMOVE',
   chosenKeys: Set<IHederaTokenServiceKeyType>,
   HederaTokenKeyTypes: IHederaTokenServiceKeyType[],
-  setKeys: Dispatch<SetStateAction<CommonKeyObject[]>>,
+  setKeys: Dispatch<SetStateAction<ICommonKeyObject[]>>,
   setChosenKeys: Dispatch<SetStateAction<Set<IHederaTokenServiceKeyType>>>,
   setKeyTypesToShow: Dispatch<SetStateAction<Set<IHederaTokenServiceKeyType>>>,
   removingKeyType?: IHederaTokenServiceKeyType
@@ -34,10 +33,7 @@ export const handleAddingOrRemovingKeys = (
   if (type === 'ADD') {
     HederaTokenKeyTypes.some((keyType) => {
       if (!chosenKeys.has(keyType)) {
-        setKeys((prev) => [
-          ...prev,
-          { keyType: keyType, keyValueType: 'inheritAccountKey', keyValue: '' },
-        ]);
+        setKeys((prev) => [...prev, { keyType: keyType, keyValueType: 'inheritAccountKey', keyValue: '' }]);
 
         setChosenKeys((prev) => new Set(prev).add(keyType));
 
@@ -62,8 +58,8 @@ export const handleAddingOrRemovingKeys = (
 /** @dev handle key type on change by selecting an option from drop-down*/
 export const handleKeyTypeOnChange = (
   e: any,
-  currentKey: CommonKeyObject,
-  setKeys: Dispatch<SetStateAction<CommonKeyObject[]>>,
+  currentKey: ICommonKeyObject,
+  setKeys: Dispatch<SetStateAction<ICommonKeyObject[]>>,
   setChosenKeys: Dispatch<SetStateAction<Set<IHederaTokenServiceKeyType>>>,
   setKeyTypesToShow: Dispatch<SetStateAction<Set<IHederaTokenServiceKeyType>>>
 ) => {
@@ -97,8 +93,8 @@ export const handleKeyTypeOnChange = (
 /** @dev handle key value type on change by selecting an option from drop-down */
 export const handleKeyValueTypeOnChange = (
   e: any,
-  currentKey: CommonKeyObject,
-  setKeys: Dispatch<SetStateAction<CommonKeyObject[]>>
+  currentKey: ICommonKeyObject,
+  setKeys: Dispatch<SetStateAction<ICommonKeyObject[]>>
 ) => {
   setKeys((prev) =>
     prev.map((key) => {
@@ -114,8 +110,8 @@ export const handleKeyValueTypeOnChange = (
 /** @dev handle updating key values */
 export const handleUpdateKeyValue = (
   e: any,
-  currentKey: CommonKeyObject,
-  setKeys: Dispatch<SetStateAction<CommonKeyObject[]>>
+  currentKey: ICommonKeyObject,
+  setKeys: Dispatch<SetStateAction<ICommonKeyObject[]>>
 ) => {
   setKeys((prev) =>
     prev.map((key) => {
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/hts/shared/states/commonStates.ts b/system-contract-dapp-playground/src/components/contract-interaction/hts/shared/states/commonStates.ts
index 7882759ed..4907b71b2 100644
--- a/system-contract-dapp-playground/src/components/contract-interaction/hts/shared/states/commonStates.ts
+++ b/system-contract-dapp-playground/src/components/contract-interaction/hts/shared/states/commonStates.ts
@@ -18,11 +18,6 @@
  *
  */
 
-import {
-  IHederaTokenServiceKeyType,
-  IHederaTokenServiceKeyValueType,
-} from '@/types/contract-interactions/HTS';
-
 // Page Size
 export const TRANSACTION_PAGE_SIZE = 10;
 
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/hts/token-create-custom/methods/AssociateHederaToken.tsx b/system-contract-dapp-playground/src/components/contract-interaction/hts/token-create-custom/methods/AssociateHederaToken/index.tsx
similarity index 89%
rename from system-contract-dapp-playground/src/components/contract-interaction/hts/token-create-custom/methods/AssociateHederaToken.tsx
rename to system-contract-dapp-playground/src/components/contract-interaction/hts/token-create-custom/methods/AssociateHederaToken/index.tsx
index 7fc54d027..758bc16fa 100644
--- a/system-contract-dapp-playground/src/components/contract-interaction/hts/token-create-custom/methods/AssociateHederaToken.tsx
+++ b/system-contract-dapp-playground/src/components/contract-interaction/hts/token-create-custom/methods/AssociateHederaToken/index.tsx
@@ -24,21 +24,21 @@ import { useToast } from '@chakra-ui/react';
 import { useState, useEffect } from 'react';
 import { CommonErrorToast } from '@/components/toast/CommonToast';
 import { generatedRandomUniqueKey } from '@/utils/common/helpers';
-import { TransactionResult } from '@/types/contract-interactions/HTS';
-import { handleAPIErrors } from '../../shared/methods/handleAPIErrors';
-import { TRANSACTION_PAGE_SIZE } from '../../shared/states/commonStates';
-import { useToastSuccessful } from '../../shared/hooks/useToastSuccessful';
-import { usePaginatedTxResults } from '../../shared/hooks/usePaginatedTxResults';
-import TokenAddressesInputForm from '../../shared/components/TokenAddressesInputForm';
-import { TransactionResultTable } from '../../shared/components/TransactionResultTable';
-import { handleSanitizeHederaFormInputs } from '../../shared/methods/handleSanitizeFormInputs';
+import { ITransactionResult } from '@/types/contract-interactions/shared';
+import { TRANSACTION_PAGE_SIZE } from '../../../shared/states/commonStates';
+import { useToastSuccessful } from '../../../../../../hooks/useToastSuccessful';
+import { handleAPIErrors } from '../../../../../common/methods/handleAPIErrors';
+import { usePaginatedTxResults } from '../../../../../../hooks/usePaginatedTxResults';
+import TokenAddressesInputForm from '../../../shared/components/TokenAddressesInputForm';
+import { TransactionResultTable } from '../../../../../common/components/TransactionResultTable';
+import { handleSanitizeHederaFormInputs } from '../../../../../common/methods/handleSanitizeFormInputs';
 import { CONTRACT_NAMES, HEDERA_TRANSACTION_RESULT_STORAGE_KEYS } from '@/utils/common/constants';
-import { SharedFormInputField, SharedExecuteButton } from '../../shared/components/ParamInputForm';
-import { useUpdateTransactionResultsToLocalStorage } from '../../shared/hooks/useUpdateLocalStorage';
+import { SharedFormInputField, SharedExecuteButton } from '../../../shared/components/ParamInputForm';
+import { useUpdateTransactionResultsToLocalStorage } from '../../../../../../hooks/useUpdateLocalStorage';
 import { htsTokenAssociateParamFields } from '@/utils/contract-interactions/HTS/token-create-custom/constant';
 import { associateHederaTokensToAccounts } from '@/api/hedera/hts-interactions/tokenCreateCustom-interactions';
-import useFilterTransactionsByContractAddress from '../../shared/hooks/useFilterTransactionsByContractAddress';
-import { handleRetrievingTransactionResultsFromLocalStorage } from '../../shared/methods/handleRetrievingTransactionResultsFromLocalStorage';
+import useFilterTransactionsByContractAddress from '../../../../../../hooks/useFilterTransactionsByContractAddress';
+import { handleRetrievingTransactionResultsFromLocalStorage } from '../../../../../common/methods/handleRetrievingTransactionResultsFromLocalStorage';
 
 interface PageProps {
   baseContract: Contract;
@@ -54,7 +54,7 @@ const AssociateHederaToken = ({ baseContract }: PageProps) => {
   const [currentTransactionPage, setCurrentTransactionPage] = useState(1);
   const [paramValues, setParamValues] = useState<any>(initialParamValues);
   const currentContractAddress = Cookies.get(CONTRACT_NAMES.TOKEN_CREATE) as string;
-  const [transactionResults, setTransactionResults] = useState<TransactionResult[]>([]);
+  const [transactionResults, setTransactionResults] = useState<ITransactionResult[]>([]);
   const initialTokenAddressesValues = { fieldKey: generatedRandomUniqueKey(9), fieldValue: '' };
   const transactionResultStorageKey =
     HEDERA_TRANSACTION_RESULT_STORAGE_KEYS['TOKEN-CREATE']['ASSOCIATE-TOKEN'];
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/hts/token-create-custom/methods/FungibleTokenCreate.tsx b/system-contract-dapp-playground/src/components/contract-interaction/hts/token-create-custom/methods/FungibleTokenCreate/index.tsx
similarity index 92%
rename from system-contract-dapp-playground/src/components/contract-interaction/hts/token-create-custom/methods/FungibleTokenCreate.tsx
rename to system-contract-dapp-playground/src/components/contract-interaction/hts/token-create-custom/methods/FungibleTokenCreate/index.tsx
index d020d7afc..765637002 100644
--- a/system-contract-dapp-playground/src/components/contract-interaction/hts/token-create-custom/methods/FungibleTokenCreate.tsx
+++ b/system-contract-dapp-playground/src/components/contract-interaction/hts/token-create-custom/methods/FungibleTokenCreate/index.tsx
@@ -23,33 +23,29 @@ import { Contract } from 'ethers';
 import { useToast } from '@chakra-ui/react';
 import { useState, useEffect } from 'react';
 import { CommonErrorToast } from '@/components/toast/CommonToast';
-import { handleAPIErrors } from '../../shared/methods/handleAPIErrors';
-import { useToastSuccessful } from '../../shared/hooks/useToastSuccessful';
-import { usePaginatedTxResults } from '../../shared/hooks/usePaginatedTxResults';
-import { SharedSigningKeysComponent } from '../../shared/components/SigningKeysForm';
-import { TransactionResultTable } from '../../shared/components/TransactionResultTable';
-import { handleSanitizeHederaFormInputs } from '../../shared/methods/handleSanitizeFormInputs';
+import { ITransactionResult } from '@/types/contract-interactions/shared';
+import { handleAPIErrors } from '../../../../../common/methods/handleAPIErrors';
+import { useToastSuccessful } from '../../../../../../hooks/useToastSuccessful';
+import { usePaginatedTxResults } from '../../../../../../hooks/usePaginatedTxResults';
+import { SharedSigningKeysComponent } from '../../../shared/components/SigningKeysForm';
+import { TransactionResultTable } from '../../../../../common/components/TransactionResultTable';
 import { CONTRACT_NAMES, HEDERA_TRANSACTION_RESULT_STORAGE_KEYS } from '@/utils/common/constants';
-import { useUpdateTransactionResultsToLocalStorage } from '../../shared/hooks/useUpdateLocalStorage';
+import { handleSanitizeHederaFormInputs } from '../../../../../common/methods/handleSanitizeFormInputs';
+import { useUpdateTransactionResultsToLocalStorage } from '../../../../../../hooks/useUpdateLocalStorage';
 import { createHederaFungibleToken } from '@/api/hedera/hts-interactions/tokenCreateCustom-interactions';
 import { htsTokenCreateParamFields } from '@/utils/contract-interactions/HTS/token-create-custom/constant';
-import useFilterTransactionsByContractAddress from '../../shared/hooks/useFilterTransactionsByContractAddress';
-import { handleRetrievingTransactionResultsFromLocalStorage } from '../../shared/methods/handleRetrievingTransactionResultsFromLocalStorage';
+import useFilterTransactionsByContractAddress from '../../../../../../hooks/useFilterTransactionsByContractAddress';
+import { handleRetrievingTransactionResultsFromLocalStorage } from '../../../../../common/methods/handleRetrievingTransactionResultsFromLocalStorage';
 import {
   SharedFormInputField,
   SharedFormButton,
   SharedExecuteButtonWithFee,
-} from '../../shared/components/ParamInputForm';
-import {
-  CommonKeyObject,
-  TransactionResult,
-  IHederaTokenServiceKeyType,
-} from '@/types/contract-interactions/HTS';
+} from '../../../shared/components/ParamInputForm';
 import {
   HederaTokenKeyTypes,
   TRANSACTION_PAGE_SIZE,
   HederaTokenKeyValueType,
-} from '../../shared/states/commonStates';
+} from '../../../shared/states/commonStates';
 
 interface PageProps {
   baseContract: Contract;
@@ -65,7 +61,7 @@ const FungibleTokenCreate = ({ baseContract }: PageProps) => {
   const HEDERA_NETWORK = JSON.parse(Cookies.get('_network') as string);
   const [currentTransactionPage, setCurrentTransactionPage] = useState(1);
   const currentContractAddress = Cookies.get(CONTRACT_NAMES.TOKEN_CREATE) as string;
-  const [transactionResults, setTransactionResults] = useState<TransactionResult[]>([]);
+  const [transactionResults, setTransactionResults] = useState<ITransactionResult[]>([]);
   const transactionResultStorageKey =
     HEDERA_TRANSACTION_RESULT_STORAGE_KEYS['TOKEN-CREATE']['FUNGIBLE-TOKEN'];
   const tokenCreateFields = {
@@ -94,7 +90,7 @@ const FungibleTokenCreate = ({ baseContract }: PageProps) => {
   );
 
   // Keys states
-  const [keys, setKeys] = useState<CommonKeyObject[]>([]); // keeps track of keys array to pass to the API
+  const [keys, setKeys] = useState<ICommonKeyObject[]>([]); // keeps track of keys array to pass to the API
   const [chosenKeys, setChosenKeys] = useState(new Set<IHederaTokenServiceKeyType>()); // keeps track of keyTypes which have already been chosen in the list
   const [keyTypesToShow, setKeyTypesToShow] = useState(new Set(HederaTokenKeyTypes)); // keeps track of the left over keyTypes to show in the drop down
 
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/hts/token-create-custom/methods/GrantTokenKYC.tsx b/system-contract-dapp-playground/src/components/contract-interaction/hts/token-create-custom/methods/GrantTokenKYC/index.tsx
similarity index 88%
rename from system-contract-dapp-playground/src/components/contract-interaction/hts/token-create-custom/methods/GrantTokenKYC.tsx
rename to system-contract-dapp-playground/src/components/contract-interaction/hts/token-create-custom/methods/GrantTokenKYC/index.tsx
index c7ea29ca9..4861f8f6d 100644
--- a/system-contract-dapp-playground/src/components/contract-interaction/hts/token-create-custom/methods/GrantTokenKYC.tsx
+++ b/system-contract-dapp-playground/src/components/contract-interaction/hts/token-create-custom/methods/GrantTokenKYC/index.tsx
@@ -23,20 +23,20 @@ import { Contract } from 'ethers';
 import { useToast } from '@chakra-ui/react';
 import { useEffect, useState } from 'react';
 import { CommonErrorToast } from '@/components/toast/CommonToast';
-import { TransactionResult } from '@/types/contract-interactions/HTS';
-import { handleAPIErrors } from '../../shared/methods/handleAPIErrors';
-import { TRANSACTION_PAGE_SIZE } from '../../shared/states/commonStates';
-import { useToastSuccessful } from '../../shared/hooks/useToastSuccessful';
-import { usePaginatedTxResults } from '../../shared/hooks/usePaginatedTxResults';
-import { TransactionResultTable } from '../../shared/components/TransactionResultTable';
-import { handleSanitizeHederaFormInputs } from '../../shared/methods/handleSanitizeFormInputs';
+import { ITransactionResult } from '@/types/contract-interactions/shared';
+import { handleAPIErrors } from '../../../../../common/methods/handleAPIErrors';
+import { TRANSACTION_PAGE_SIZE } from '../../../shared/states/commonStates';
+import { useToastSuccessful } from '../../../../../../hooks/useToastSuccessful';
+import { usePaginatedTxResults } from '../../../../../../hooks/usePaginatedTxResults';
+import { TransactionResultTable } from '../../../../../common/components/TransactionResultTable';
+import { handleSanitizeHederaFormInputs } from '../../../../../common/methods/handleSanitizeFormInputs';
 import { CONTRACT_NAMES, HEDERA_TRANSACTION_RESULT_STORAGE_KEYS } from '@/utils/common/constants';
-import { SharedFormInputField, SharedExecuteButton } from '../../shared/components/ParamInputForm';
-import { useUpdateTransactionResultsToLocalStorage } from '../../shared/hooks/useUpdateLocalStorage';
+import { SharedFormInputField, SharedExecuteButton } from '../../../shared/components/ParamInputForm';
 import { grantTokenKYCToAccount } from '@/api/hedera/hts-interactions/tokenCreateCustom-interactions';
+import { useUpdateTransactionResultsToLocalStorage } from '../../../../../../hooks/useUpdateLocalStorage';
 import { htsGrantTokenKYCParamFields } from '@/utils/contract-interactions/HTS/token-create-custom/constant';
-import useFilterTransactionsByContractAddress from '../../shared/hooks/useFilterTransactionsByContractAddress';
-import { handleRetrievingTransactionResultsFromLocalStorage } from '../../shared/methods/handleRetrievingTransactionResultsFromLocalStorage';
+import useFilterTransactionsByContractAddress from '../../../../../../hooks/useFilterTransactionsByContractAddress';
+import { handleRetrievingTransactionResultsFromLocalStorage } from '../../../../../common/methods/handleRetrievingTransactionResultsFromLocalStorage';
 
 interface PageProps {
   baseContract: Contract;
@@ -51,7 +51,7 @@ const GrantTokenKYC = ({ baseContract }: PageProps) => {
   const [currentTransactionPage, setCurrentTransactionPage] = useState(1);
   const grantKYCFields = ['hederaTokenAddress', 'grantingKYCAccountAddress'];
   const currentContractAddress = Cookies.get(CONTRACT_NAMES.TOKEN_CREATE) as string;
-  const [transactionResults, setTransactionResults] = useState<TransactionResult[]>([]);
+  const [transactionResults, setTransactionResults] = useState<ITransactionResult[]>([]);
   const transactionResultStorageKey = HEDERA_TRANSACTION_RESULT_STORAGE_KEYS['TOKEN-CREATE']['TOKEN-KYC'];
   const initialParamValues = {
     hederaTokenAddress: '',
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/hts/token-create-custom/methods/MintHederaToken.tsx b/system-contract-dapp-playground/src/components/contract-interaction/hts/token-create-custom/methods/MintHederaToken/index.tsx
similarity index 90%
rename from system-contract-dapp-playground/src/components/contract-interaction/hts/token-create-custom/methods/MintHederaToken.tsx
rename to system-contract-dapp-playground/src/components/contract-interaction/hts/token-create-custom/methods/MintHederaToken/index.tsx
index b8f31a8a1..f33edfabd 100644
--- a/system-contract-dapp-playground/src/components/contract-interaction/hts/token-create-custom/methods/MintHederaToken.tsx
+++ b/system-contract-dapp-playground/src/components/contract-interaction/hts/token-create-custom/methods/MintHederaToken/index.tsx
@@ -24,24 +24,24 @@ import { useToast } from '@chakra-ui/react';
 import { useEffect, useMemo, useState } from 'react';
 import { CommonErrorToast } from '@/components/toast/CommonToast';
 import { generatedRandomUniqueKey } from '@/utils/common/helpers';
-import { TransactionResult } from '@/types/contract-interactions/HTS';
-import { handleAPIErrors } from '../../shared/methods/handleAPIErrors';
-import { TRANSACTION_PAGE_SIZE } from '../../shared/states/commonStates';
-import MetadataInputForm from '../../shared/components/MetadataInputForm';
-import { useToastSuccessful } from '../../shared/hooks/useToastSuccessful';
-import { usePaginatedTxResults } from '../../shared/hooks/usePaginatedTxResults';
-import { TransactionResultTable } from '../../shared/components/TransactionResultTable';
-import { handleSanitizeHederaFormInputs } from '../../shared/methods/handleSanitizeFormInputs';
+import { ITransactionResult } from '@/types/contract-interactions/shared';
+import { TRANSACTION_PAGE_SIZE } from '../../../shared/states/commonStates';
+import MetadataInputForm from '../../../shared/components/MetadataInputForm';
+import { handleAPIErrors } from '../../../../../common/methods/handleAPIErrors';
+import { useToastSuccessful } from '../../../../../../hooks/useToastSuccessful';
+import { usePaginatedTxResults } from '../../../../../../hooks/usePaginatedTxResults';
+import { TransactionResultTable } from '../../../../../common/components/TransactionResultTable';
+import { handleSanitizeHederaFormInputs } from '../../../../../common/methods/handleSanitizeFormInputs';
 import { CONTRACT_NAMES, HEDERA_TRANSACTION_RESULT_STORAGE_KEYS } from '@/utils/common/constants';
-import { useUpdateTransactionResultsToLocalStorage } from '../../shared/hooks/useUpdateLocalStorage';
+import { useUpdateTransactionResultsToLocalStorage } from '../../../../../../hooks/useUpdateLocalStorage';
 import { htsTokenMintParamFields } from '@/utils/contract-interactions/HTS/token-create-custom/constant';
-import useFilterTransactionsByContractAddress from '../../shared/hooks/useFilterTransactionsByContractAddress';
-import { handleRetrievingTransactionResultsFromLocalStorage } from '../../shared/methods/handleRetrievingTransactionResultsFromLocalStorage';
+import useFilterTransactionsByContractAddress from '../../../../../../hooks/useFilterTransactionsByContractAddress';
+import { handleRetrievingTransactionResultsFromLocalStorage } from '../../../../../common/methods/handleRetrievingTransactionResultsFromLocalStorage';
 import {
   SharedFormButton,
   SharedExecuteButton,
   SharedFormInputField,
-} from '../../shared/components/ParamInputForm';
+} from '../../../shared/components/ParamInputForm';
 import {
   mintHederaToken,
   mintHederaTokenToAddress,
@@ -62,7 +62,7 @@ const MintHederaToken = ({ baseContract }: PageProps) => {
   const HEDERA_NETWORK = JSON.parse(Cookies.get('_network') as string);
   const [currentTransactionPage, setCurrentTransactionPage] = useState(1);
   const currentContractAddress = Cookies.get(CONTRACT_NAMES.TOKEN_CREATE) as string;
-  const [transactionResults, setTransactionResults] = useState<TransactionResult[]>([]);
+  const [transactionResults, setTransactionResults] = useState<ITransactionResult[]>([]);
   const [metadata, setMetadata] = useState<{ metaKey: string; metaValue: string }[]>([]);
   const transactionResultStorageKey = HEDERA_TRANSACTION_RESULT_STORAGE_KEYS['TOKEN-CREATE']['MINT-TOKEN'];
   const tokenMintFields = useMemo(() => {
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/hts/token-create-custom/methods/NonFungibleTokenCreate.tsx b/system-contract-dapp-playground/src/components/contract-interaction/hts/token-create-custom/methods/NonFungibleTokenCreate/index.tsx
similarity index 90%
rename from system-contract-dapp-playground/src/components/contract-interaction/hts/token-create-custom/methods/NonFungibleTokenCreate.tsx
rename to system-contract-dapp-playground/src/components/contract-interaction/hts/token-create-custom/methods/NonFungibleTokenCreate/index.tsx
index 774fb3bb0..06c45e632 100644
--- a/system-contract-dapp-playground/src/components/contract-interaction/hts/token-create-custom/methods/NonFungibleTokenCreate.tsx
+++ b/system-contract-dapp-playground/src/components/contract-interaction/hts/token-create-custom/methods/NonFungibleTokenCreate/index.tsx
@@ -23,33 +23,29 @@ import { Contract } from 'ethers';
 import { useToast } from '@chakra-ui/react';
 import { useEffect, useState } from 'react';
 import { CommonErrorToast } from '@/components/toast/CommonToast';
-import { handleAPIErrors } from '../../shared/methods/handleAPIErrors';
-import { useToastSuccessful } from '../../shared/hooks/useToastSuccessful';
-import { usePaginatedTxResults } from '../../shared/hooks/usePaginatedTxResults';
-import { SharedSigningKeysComponent } from '../../shared/components/SigningKeysForm';
-import { TransactionResultTable } from '../../shared/components/TransactionResultTable';
-import { handleSanitizeHederaFormInputs } from '../../shared/methods/handleSanitizeFormInputs';
+import { ITransactionResult } from '@/types/contract-interactions/shared';
+import { handleAPIErrors } from '../../../../../common/methods/handleAPIErrors';
+import { useToastSuccessful } from '../../../../../../hooks/useToastSuccessful';
+import { usePaginatedTxResults } from '../../../../../../hooks/usePaginatedTxResults';
+import { SharedSigningKeysComponent } from '../../../shared/components/SigningKeysForm';
+import { TransactionResultTable } from '../../../../../common/components/TransactionResultTable';
+import { handleSanitizeHederaFormInputs } from '../../../../../common/methods/handleSanitizeFormInputs';
 import { CONTRACT_NAMES, HEDERA_TRANSACTION_RESULT_STORAGE_KEYS } from '@/utils/common/constants';
-import { useUpdateTransactionResultsToLocalStorage } from '../../shared/hooks/useUpdateLocalStorage';
+import { useUpdateTransactionResultsToLocalStorage } from '../../../../../../hooks/useUpdateLocalStorage';
 import { htsTokenCreateParamFields } from '@/utils/contract-interactions/HTS/token-create-custom/constant';
 import { createHederaNonFungibleToken } from '@/api/hedera/hts-interactions/tokenCreateCustom-interactions';
-import useFilterTransactionsByContractAddress from '../../shared/hooks/useFilterTransactionsByContractAddress';
-import { handleRetrievingTransactionResultsFromLocalStorage } from '../../shared/methods/handleRetrievingTransactionResultsFromLocalStorage';
+import useFilterTransactionsByContractAddress from '../../../../../../hooks/useFilterTransactionsByContractAddress';
+import { handleRetrievingTransactionResultsFromLocalStorage } from '../../../../../common/methods/handleRetrievingTransactionResultsFromLocalStorage';
 import {
   SharedFormInputField,
   SharedFormButton,
   SharedExecuteButtonWithFee,
-} from '../../shared/components/ParamInputForm';
-import {
-  TransactionResult,
-  IHederaTokenServiceKeyType,
-  CommonKeyObject,
-} from '@/types/contract-interactions/HTS';
+} from '../../../shared/components/ParamInputForm';
 import {
   HederaTokenKeyTypes,
   HederaTokenKeyValueType,
   TRANSACTION_PAGE_SIZE,
-} from '../../shared/states/commonStates';
+} from '../../../shared/states/commonStates';
 
 interface PageProps {
   baseContract: Contract;
@@ -64,7 +60,7 @@ const NonFungibleTokenCreate = ({ baseContract }: PageProps) => {
   const HEDERA_NETWORK = JSON.parse(Cookies.get('_network') as string);
   const [currentTransactionPage, setCurrentTransactionPage] = useState(1);
   const currentContractAddress = Cookies.get(CONTRACT_NAMES.TOKEN_CREATE) as string;
-  const [transactionResults, setTransactionResults] = useState<TransactionResult[]>([]);
+  const [transactionResults, setTransactionResults] = useState<ITransactionResult[]>([]);
   const transactionResultStorageKey =
     HEDERA_TRANSACTION_RESULT_STORAGE_KEYS['TOKEN-CREATE']['NON-FUNGIBLE-TOKEN'];
   const tokenCreateFields = {
@@ -88,7 +84,7 @@ const NonFungibleTokenCreate = ({ baseContract }: PageProps) => {
   );
 
   // keys states
-  const [keys, setKeys] = useState<CommonKeyObject[]>([]); // keeps track of keys array to pass to the API
+  const [keys, setKeys] = useState<ICommonKeyObject[]>([]); // keeps track of keys array to pass to the API
   const [chosenKeys, setChosenKeys] = useState(new Set<IHederaTokenServiceKeyType>()); // keeps track of keyTypes which have already been chosen in the list
   const [keyTypesToShow, setKeyTypesToShow] = useState(new Set(HederaTokenKeyTypes)); // keeps track of the left over keyTypes to show in the drop down
 
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/hts/token-create-custom/methods/index.tsx b/system-contract-dapp-playground/src/components/contract-interaction/hts/token-create-custom/methods/index.tsx
index e9b2dd052..91d66d24e 100644
--- a/system-contract-dapp-playground/src/components/contract-interaction/hts/token-create-custom/methods/index.tsx
+++ b/system-contract-dapp-playground/src/components/contract-interaction/hts/token-create-custom/methods/index.tsx
@@ -37,9 +37,7 @@ const HederaTokenCreateMethods = ({ baseContract, method }: PageProps) => {
       {method === 'grantKYC' && <GrantTokenKYC baseContract={baseContract} />}
       {method === 'tokenAssociation' && <AssociateHederaToken baseContract={baseContract} />}
       {method === 'fungibleTokenCreate' && <FungibleTokenCreate baseContract={baseContract} />}
-      {method === 'non-fungibleTokenCreate' && (
-        <NonFungibleTokenCreate baseContract={baseContract} />
-      )}
+      {method === 'non-fungibleTokenCreate' && <NonFungibleTokenCreate baseContract={baseContract} />}
     </>
   );
 };
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/hts/token-management-contract/methods/manageTokenDelete/index.tsx b/system-contract-dapp-playground/src/components/contract-interaction/hts/token-management-contract/methods/manageTokenDelete/index.tsx
index ab6e0bac4..ac8b8be0e 100644
--- a/system-contract-dapp-playground/src/components/contract-interaction/hts/token-management-contract/methods/manageTokenDelete/index.tsx
+++ b/system-contract-dapp-playground/src/components/contract-interaction/hts/token-management-contract/methods/manageTokenDelete/index.tsx
@@ -23,20 +23,20 @@ import { Contract } from 'ethers';
 import { useToast } from '@chakra-ui/react';
 import { useState, useEffect } from 'react';
 import { CommonErrorToast } from '@/components/toast/CommonToast';
-import { TransactionResult } from '@/types/contract-interactions/HTS';
-import { handleAPIErrors } from '../../../shared/methods/handleAPIErrors';
+import { ITransactionResult } from '@/types/contract-interactions/shared';
 import { TRANSACTION_PAGE_SIZE } from '../../../shared/states/commonStates';
-import { useToastSuccessful } from '../../../shared/hooks/useToastSuccessful';
-import { usePaginatedTxResults } from '../../../shared/hooks/usePaginatedTxResults';
-import { TransactionResultTable } from '../../../shared/components/TransactionResultTable';
-import { handleSanitizeHederaFormInputs } from '../../../shared/methods/handleSanitizeFormInputs';
+import { handleAPIErrors } from '../../../../../common/methods/handleAPIErrors';
+import { useToastSuccessful } from '../../../../../../hooks/useToastSuccessful';
+import { usePaginatedTxResults } from '../../../../../../hooks/usePaginatedTxResults';
+import { TransactionResultTable } from '../../../../../common/components/TransactionResultTable';
+import { handleSanitizeHederaFormInputs } from '../../../../../common/methods/handleSanitizeFormInputs';
 import { manageTokenDeduction } from '@/api/hedera/hts-interactions/tokenManagement-interactions';
 import { CONTRACT_NAMES, HEDERA_TRANSACTION_RESULT_STORAGE_KEYS } from '@/utils/common/constants';
-import { useUpdateTransactionResultsToLocalStorage } from '../../../shared/hooks/useUpdateLocalStorage';
+import { useUpdateTransactionResultsToLocalStorage } from '../../../../../../hooks/useUpdateLocalStorage';
 import { htsTokenDeductionParamFields } from '@/utils/contract-interactions/HTS/token-management/constant';
 import { SharedFormInputField, SharedExecuteButtonWithFee } from '../../../shared/components/ParamInputForm';
-import useFilterTransactionsByContractAddress from '../../../shared/hooks/useFilterTransactionsByContractAddress';
-import { handleRetrievingTransactionResultsFromLocalStorage } from '../../../shared/methods/handleRetrievingTransactionResultsFromLocalStorage';
+import useFilterTransactionsByContractAddress from '../../../../../../hooks/useFilterTransactionsByContractAddress';
+import { handleRetrievingTransactionResultsFromLocalStorage } from '../../../../../common/methods/handleRetrievingTransactionResultsFromLocalStorage';
 
 interface PageProps {
   baseContract: Contract;
@@ -50,7 +50,7 @@ const ManageTokenDelete = ({ baseContract }: PageProps) => {
   const hederaNetwork = JSON.parse(Cookies.get('_network') as string);
   const [currentTransactionPage, setCurrentTransactionPage] = useState(1);
   const currentContractAddress = Cookies.get(CONTRACT_NAMES.TOKEN_MANAGE) as string;
-  const [transactionResults, setTransactionResults] = useState<TransactionResult[]>([]);
+  const [transactionResults, setTransactionResults] = useState<ITransactionResult[]>([]);
   const transactionResultStorageKey = HEDERA_TRANSACTION_RESULT_STORAGE_KEYS['TOKEN-MANAGE']['TOKEN-DELETE'];
   const initialParamValues = {
     feeValue: '',
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/hts/token-management-contract/methods/manageTokenInfo/TokenKeysForm.tsx b/system-contract-dapp-playground/src/components/contract-interaction/hts/token-management-contract/methods/manageTokenInfo/TokenKeysForm.tsx
index 5c25e58fd..5ab5a000a 100644
--- a/system-contract-dapp-playground/src/components/contract-interaction/hts/token-management-contract/methods/manageTokenInfo/TokenKeysForm.tsx
+++ b/system-contract-dapp-playground/src/components/contract-interaction/hts/token-management-contract/methods/manageTokenInfo/TokenKeysForm.tsx
@@ -26,21 +26,13 @@ import {
   HEDERA_CHAKRA_INPUT_BOX_SIZES,
   HEDERA_CHAKRA_INPUT_BOX_SHARED_CLASSNAME,
 } from '@/utils/common/constants';
-import {
-  handleKeyValueTypeOnChange,
-  handleUpdateKeyValue,
-} from '../../../shared/methods/signingKeys';
-import {
-  CommonKeyObject,
-  IHederaTokenServiceKeyType,
-  IHederaTokenServiceKeyValueType,
-} from '@/types/contract-interactions/HTS';
+import { handleKeyValueTypeOnChange, handleUpdateKeyValue } from '../../../shared/methods/signingKeys';
 
 interface PageProps {
   isSuccessful?: boolean;
-  keys: CommonKeyObject[];
+  keys: ICommonKeyObject[];
   keyTypeArrays?: IHederaTokenServiceKeyType[];
-  setKeys: Dispatch<SetStateAction<CommonKeyObject[]>>;
+  setKeys: Dispatch<SetStateAction<ICommonKeyObject[]>>;
   HederaTokenKeyValueType: IHederaTokenServiceKeyValueType[];
 }
 
@@ -145,8 +137,7 @@ const TokenKeysForm = ({
                   type={'text'}
                   onChange={(e) => handleUpdateKeyValue(e, key, setKeys)}
                   placeholder={
-                    key.keyValueType === 'contractId' ||
-                    key.keyValueType === 'delegatableContractId'
+                    key.keyValueType === 'contractId' || key.keyValueType === 'delegatableContractId'
                       ? 'ID of a smart contract instance...'
                       : `${key.keyValueType.split('_')[0].toUpperCase()} compressed public key...`
                   }
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/hts/token-management-contract/methods/manageTokenInfo/index.tsx b/system-contract-dapp-playground/src/components/contract-interaction/hts/token-management-contract/methods/manageTokenInfo/index.tsx
index fa02c13af..c08f5d2da 100644
--- a/system-contract-dapp-playground/src/components/contract-interaction/hts/token-management-contract/methods/manageTokenInfo/index.tsx
+++ b/system-contract-dapp-playground/src/components/contract-interaction/hts/token-management-contract/methods/manageTokenInfo/index.tsx
@@ -25,36 +25,29 @@ import { useToast } from '@chakra-ui/react';
 import TokenExpiryForm from './TokenExpiryForm';
 import { useState, useMemo, useEffect } from 'react';
 import { CommonErrorToast } from '@/components/toast/CommonToast';
-import { handleAPIErrors } from '../../../shared/methods/handleAPIErrors';
-import { useToastSuccessful } from '../../../shared/hooks/useToastSuccessful';
-import { usePaginatedTxResults } from '../../../shared/hooks/usePaginatedTxResults';
+import { ITransactionResult } from '@/types/contract-interactions/shared';
+import { handleAPIErrors } from '../../../../../common/methods/handleAPIErrors';
+import { useToastSuccessful } from '../../../../../../hooks/useToastSuccessful';
+import { usePaginatedTxResults } from '../../../../../../hooks/usePaginatedTxResults';
 import { SharedSigningKeysComponent } from '../../../shared/components/SigningKeysForm';
-import { TransactionResultTable } from '../../../shared/components/TransactionResultTable';
+import { TransactionResultTable } from '../../../../../common/components/TransactionResultTable';
 import { HederaTokenKeyTypes, TRANSACTION_PAGE_SIZE } from '../../../shared/states/commonStates';
 import { CONTRACT_NAMES, HEDERA_TRANSACTION_RESULT_STORAGE_KEYS } from '@/utils/common/constants';
-import { handleSanitizeHederaFormInputs } from '../../../shared/methods/handleSanitizeFormInputs';
+import { handleSanitizeHederaFormInputs } from '../../../../../common/methods/handleSanitizeFormInputs';
 import { manageTokenInfomation } from '@/api/hedera/hts-interactions/tokenManagement-interactions';
-import { useUpdateTransactionResultsToLocalStorage } from '../../../shared/hooks/useUpdateLocalStorage';
-import useFilterTransactionsByContractAddress from '../../../shared/hooks/useFilterTransactionsByContractAddress';
-import { handleRetrievingTransactionResultsFromLocalStorage } from '../../../shared/methods/handleRetrievingTransactionResultsFromLocalStorage';
+import { useUpdateTransactionResultsToLocalStorage } from '../../../../../../hooks/useUpdateLocalStorage';
+import useFilterTransactionsByContractAddress from '../../../../../../hooks/useFilterTransactionsByContractAddress';
+import { handleRetrievingTransactionResultsFromLocalStorage } from '../../../../../common/methods/handleRetrievingTransactionResultsFromLocalStorage';
 import {
-  DEFAULT_HEDERA_TOKEN_INFO_VALUE,
   DEFAULT_TOKEN_EXIPIRY_VALUE,
   htsUpdateTokenInfoParamFields,
+  DEFAULT_HEDERA_TOKEN_INFO_VALUE,
 } from '@/utils/contract-interactions/HTS/token-management/constant';
 import {
   SharedFormButton,
   SharedFormInputField,
   SharedExecuteButtonWithFee,
 } from '../../../shared/components/ParamInputForm';
-import {
-  CommonKeyObject,
-  TransactionResult,
-  IHederaTokenServiceKeyType,
-  IHederaTokenServiceKeyValueType,
-  IHederaTokenServiceExpiry,
-  IHederaTokenServiceHederaToken,
-} from '@/types/contract-interactions/HTS';
 
 interface PageProps {
   baseContract: Contract;
@@ -71,7 +64,7 @@ const ManageTokenInfo = ({ baseContract }: PageProps) => {
   const [APIMethods, setAPIMethods] = useState<API_NAMES>('UPDATE_INFO');
   const [currentTransactionPage, setCurrentTransactionPage] = useState(1);
   const currentContractAddress = Cookies.get(CONTRACT_NAMES.TOKEN_MANAGE) as string;
-  const [transactionResults, setTransactionResults] = useState<TransactionResult[]>([]);
+  const [transactionResults, setTransactionResults] = useState<ITransactionResult[]>([]);
   const transactionResultStorageKey = HEDERA_TRANSACTION_RESULT_STORAGE_KEYS['TOKEN-MANAGE']['TOKEN-INFO'];
   const APIButtonTitles: { API: API_NAMES; apiSwitchTitle: string; executeTitle: string }[] = [
     {
@@ -136,10 +129,10 @@ const ManageTokenInfo = ({ baseContract }: PageProps) => {
     keyType: keyType,
     keyValueType: 'inheritAccountKey',
     keyValue: '',
-  })) as CommonKeyObject[];
+  })) as ICommonKeyObject[];
 
   // Keys states
-  const [keys, setKeys] = useState<CommonKeyObject[]>([]); // keeps track of keys array to pass to the API
+  const [keys, setKeys] = useState<ICommonKeyObject[]>([]); // keeps track of keys array to pass to the API
   const [chosenKeys, setChosenKeys] = useState(new Set<IHederaTokenServiceKeyType>()); // keeps track of keyTypes which have already been chosen in the list
   const [keyTypesToShow, setKeyTypesToShow] = useState(new Set(HederaTokenKeyTypes)); // keeps track of the left over keyTypes to show in the drop down
 
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/hts/token-management-contract/methods/manageTokenPermission/index.tsx b/system-contract-dapp-playground/src/components/contract-interaction/hts/token-management-contract/methods/manageTokenPermission/index.tsx
index 995f549aa..460b78ad7 100644
--- a/system-contract-dapp-playground/src/components/contract-interaction/hts/token-management-contract/methods/manageTokenPermission/index.tsx
+++ b/system-contract-dapp-playground/src/components/contract-interaction/hts/token-management-contract/methods/manageTokenPermission/index.tsx
@@ -23,19 +23,19 @@ import { Contract } from 'ethers';
 import { useToast } from '@chakra-ui/react';
 import { useEffect, useState } from 'react';
 import { CommonErrorToast } from '@/components/toast/CommonToast';
-import { TransactionResult } from '@/types/contract-interactions/HTS';
-import { handleAPIErrors } from '../../../shared/methods/handleAPIErrors';
+import { ITransactionResult } from '@/types/contract-interactions/shared';
 import { TRANSACTION_PAGE_SIZE } from '../../../shared/states/commonStates';
-import { useToastSuccessful } from '../../../shared/hooks/useToastSuccessful';
-import { usePaginatedTxResults } from '../../../shared/hooks/usePaginatedTxResults';
-import { TransactionResultTable } from '../../../shared/components/TransactionResultTable';
+import { handleAPIErrors } from '../../../../../common/methods/handleAPIErrors';
+import { useToastSuccessful } from '../../../../../../hooks/useToastSuccessful';
+import { usePaginatedTxResults } from '../../../../../../hooks/usePaginatedTxResults';
+import { TransactionResultTable } from '../../../../../common/components/TransactionResultTable';
 import { CONTRACT_NAMES, HEDERA_TRANSACTION_RESULT_STORAGE_KEYS } from '@/utils/common/constants';
-import { handleSanitizeHederaFormInputs } from '../../../shared/methods/handleSanitizeFormInputs';
+import { handleSanitizeHederaFormInputs } from '../../../../../common/methods/handleSanitizeFormInputs';
 import { manageTokenPermission } from '@/api/hedera/hts-interactions/tokenManagement-interactions';
-import { useUpdateTransactionResultsToLocalStorage } from '../../../shared/hooks/useUpdateLocalStorage';
+import { useUpdateTransactionResultsToLocalStorage } from '../../../../../../hooks/useUpdateLocalStorage';
 import { htsTokenPermissionParamFields } from '@/utils/contract-interactions/HTS/token-management/constant';
-import useFilterTransactionsByContractAddress from '../../../shared/hooks/useFilterTransactionsByContractAddress';
-import { handleRetrievingTransactionResultsFromLocalStorage } from '../../../shared/methods/handleRetrievingTransactionResultsFromLocalStorage';
+import useFilterTransactionsByContractAddress from '../../../../../../hooks/useFilterTransactionsByContractAddress';
+import { handleRetrievingTransactionResultsFromLocalStorage } from '../../../../../common/methods/handleRetrievingTransactionResultsFromLocalStorage';
 import {
   SharedFormButton,
   SharedFormInputField,
@@ -58,7 +58,7 @@ const ManageTokenPermission = ({ baseContract }: PageProps) => {
   const tokenCommonFields = ['hederaTokenAddress', 'targetApprovedAddress'];
   const [APIMethods, setAPIMethods] = useState<API_NAMES>('APPROVED_FUNGIBLE');
   const currentContractAddress = Cookies.get(CONTRACT_NAMES.TOKEN_MANAGE) as string;
-  const [transactionResults, setTransactionResults] = useState<TransactionResult[]>([]);
+  const [transactionResults, setTransactionResults] = useState<ITransactionResult[]>([]);
   const transactionResultStorageKey =
     HEDERA_TRANSACTION_RESULT_STORAGE_KEYS['TOKEN-MANAGE']['TOKEN-PERMISSION'];
   const initialParamValues = {
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/hts/token-management-contract/methods/manageTokenRelation/index.tsx b/system-contract-dapp-playground/src/components/contract-interaction/hts/token-management-contract/methods/manageTokenRelation/index.tsx
index d5b9d551d..d02a80839 100644
--- a/system-contract-dapp-playground/src/components/contract-interaction/hts/token-management-contract/methods/manageTokenRelation/index.tsx
+++ b/system-contract-dapp-playground/src/components/contract-interaction/hts/token-management-contract/methods/manageTokenRelation/index.tsx
@@ -24,19 +24,19 @@ import { useToast } from '@chakra-ui/react';
 import { useEffect, useMemo, useState } from 'react';
 import { CommonErrorToast } from '@/components/toast/CommonToast';
 import { generatedRandomUniqueKey } from '@/utils/common/helpers';
-import { TransactionResult } from '@/types/contract-interactions/HTS';
-import { handleAPIErrors } from '../../../shared/methods/handleAPIErrors';
+import { ITransactionResult } from '@/types/contract-interactions/shared';
 import { TRANSACTION_PAGE_SIZE } from '../../../shared/states/commonStates';
-import { useToastSuccessful } from '../../../shared/hooks/useToastSuccessful';
-import { usePaginatedTxResults } from '../../../shared/hooks/usePaginatedTxResults';
+import { useToastSuccessful } from '../../../../../../hooks/useToastSuccessful';
+import { handleAPIErrors } from '../../../../../common/methods/handleAPIErrors';
+import { usePaginatedTxResults } from '../../../../../../hooks/usePaginatedTxResults';
 import TokenAddressesInputForm from '../../../shared/components/TokenAddressesInputForm';
-import { TransactionResultTable } from '../../../shared/components/TransactionResultTable';
+import { TransactionResultTable } from '../../../../../common/components/TransactionResultTable';
 import { manageTokenRelation } from '@/api/hedera/hts-interactions/tokenManagement-interactions';
-import { handleSanitizeHederaFormInputs } from '../../../shared/methods/handleSanitizeFormInputs';
-import { useUpdateTransactionResultsToLocalStorage } from '../../../shared/hooks/useUpdateLocalStorage';
+import { handleSanitizeHederaFormInputs } from '../../../../../common/methods/handleSanitizeFormInputs';
+import { useUpdateTransactionResultsToLocalStorage } from '../../../../../../hooks/useUpdateLocalStorage';
 import { htsTokenRelationParamFields } from '@/utils/contract-interactions/HTS/token-management/constant';
-import useFilterTransactionsByContractAddress from '../../../shared/hooks/useFilterTransactionsByContractAddress';
-import { handleRetrievingTransactionResultsFromLocalStorage } from '../../../shared/methods/handleRetrievingTransactionResultsFromLocalStorage';
+import useFilterTransactionsByContractAddress from '../../../../../../hooks/useFilterTransactionsByContractAddress';
+import { handleRetrievingTransactionResultsFromLocalStorage } from '../../../../../common/methods/handleRetrievingTransactionResultsFromLocalStorage';
 import {
   CONTRACT_NAMES,
   HEDERA_BRANDING_COLORS,
@@ -65,7 +65,7 @@ const ManageTokenRelation = ({ baseContract }: PageProps) => {
   const [APIMethods, setAPIMethods] = useState<API_NAMES>('REVOKE_KYC');
   const [currentTransactionPage, setCurrentTransactionPage] = useState(1);
   const currentContractAddress = Cookies.get(CONTRACT_NAMES.TOKEN_MANAGE) as string;
-  const [transactionResults, setTransactionResults] = useState<TransactionResult[]>([]);
+  const [transactionResults, setTransactionResults] = useState<ITransactionResult[]>([]);
   const transactionResultStorageKey =
     HEDERA_TRANSACTION_RESULT_STORAGE_KEYS['TOKEN-MANAGE']['TOKEN-RELATION'];
   const [isFreezeLoading, setIsFreezeLoading] = useState({
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/hts/token-management-contract/methods/manageTokenStatus/index.tsx b/system-contract-dapp-playground/src/components/contract-interaction/hts/token-management-contract/methods/manageTokenStatus/index.tsx
index 97f34c5db..72d9fd113 100644
--- a/system-contract-dapp-playground/src/components/contract-interaction/hts/token-management-contract/methods/manageTokenStatus/index.tsx
+++ b/system-contract-dapp-playground/src/components/contract-interaction/hts/token-management-contract/methods/manageTokenStatus/index.tsx
@@ -23,19 +23,19 @@ import { useEffect, useState } from 'react';
 import { useToast } from '@chakra-ui/react';
 import { Contract, isAddress } from 'ethers';
 import { CommonErrorToast } from '@/components/toast/CommonToast';
-import { TransactionResult } from '@/types/contract-interactions/HTS';
-import { handleAPIErrors } from '../../../shared/methods/handleAPIErrors';
+import { ITransactionResult } from '@/types/contract-interactions/shared';
 import { TRANSACTION_PAGE_SIZE } from '../../../shared/states/commonStates';
-import { useToastSuccessful } from '../../../shared/hooks/useToastSuccessful';
-import { usePaginatedTxResults } from '../../../shared/hooks/usePaginatedTxResults';
-import { TransactionResultTable } from '../../../shared/components/TransactionResultTable';
+import { handleAPIErrors } from '../../../../../common/methods/handleAPIErrors';
+import { useToastSuccessful } from '../../../../../../hooks/useToastSuccessful';
+import { usePaginatedTxResults } from '../../../../../../hooks/usePaginatedTxResults';
+import { TransactionResultTable } from '../../../../../common/components/TransactionResultTable';
 import { manageTokenStatus } from '@/api/hedera/hts-interactions/tokenManagement-interactions';
 import { CONTRACT_NAMES, HEDERA_TRANSACTION_RESULT_STORAGE_KEYS } from '@/utils/common/constants';
 import { SharedExecuteButton, SharedFormInputField } from '../../../shared/components/ParamInputForm';
-import { useUpdateTransactionResultsToLocalStorage } from '../../../shared/hooks/useUpdateLocalStorage';
+import { useUpdateTransactionResultsToLocalStorage } from '../../../../../../hooks/useUpdateLocalStorage';
 import { htsTokenStatusParamFields } from '@/utils/contract-interactions/HTS/token-management/constant';
-import useFilterTransactionsByContractAddress from '../../../shared/hooks/useFilterTransactionsByContractAddress';
-import { handleRetrievingTransactionResultsFromLocalStorage } from '../../../shared/methods/handleRetrievingTransactionResultsFromLocalStorage';
+import useFilterTransactionsByContractAddress from '../../../../../../hooks/useFilterTransactionsByContractAddress';
+import { handleRetrievingTransactionResultsFromLocalStorage } from '../../../../../common/methods/handleRetrievingTransactionResultsFromLocalStorage';
 
 interface PageProps {
   baseContract: Contract;
@@ -52,7 +52,7 @@ const ManageTokenStatus = ({ baseContract }: PageProps) => {
   const hederaNetwork = JSON.parse(Cookies.get('_network') as string);
   const [currentTransactionPage, setCurrentTransactionPage] = useState(1);
   const currentContractAddress = Cookies.get(CONTRACT_NAMES.TOKEN_MANAGE) as string;
-  const [transactionResults, setTransactionResults] = useState<TransactionResult[]>([]);
+  const [transactionResults, setTransactionResults] = useState<ITransactionResult[]>([]);
   const transactionResultStorageKey = HEDERA_TRANSACTION_RESULT_STORAGE_KEYS['TOKEN-MANAGE']['TOKEN-STATUS'];
   const [isLoading, setIsLoading] = useState({
     pauseLoading: false,
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/hts/token-management-contract/methods/manageTokenSupplyReduction/index.tsx b/system-contract-dapp-playground/src/components/contract-interaction/hts/token-management-contract/methods/manageTokenSupplyReduction/index.tsx
index 37fea6c62..d2fe71fab 100644
--- a/system-contract-dapp-playground/src/components/contract-interaction/hts/token-management-contract/methods/manageTokenSupplyReduction/index.tsx
+++ b/system-contract-dapp-playground/src/components/contract-interaction/hts/token-management-contract/methods/manageTokenSupplyReduction/index.tsx
@@ -23,19 +23,19 @@ import { Contract } from 'ethers';
 import { useToast } from '@chakra-ui/react';
 import { useState, useMemo, useEffect } from 'react';
 import { CommonErrorToast } from '@/components/toast/CommonToast';
-import { TransactionResult } from '@/types/contract-interactions/HTS';
-import { handleAPIErrors } from '../../../shared/methods/handleAPIErrors';
+import { ITransactionResult } from '@/types/contract-interactions/shared';
 import { TRANSACTION_PAGE_SIZE } from '../../../shared/states/commonStates';
-import { useToastSuccessful } from '../../../shared/hooks/useToastSuccessful';
-import { usePaginatedTxResults } from '../../../shared/hooks/usePaginatedTxResults';
-import { TransactionResultTable } from '../../../shared/components/TransactionResultTable';
+import { handleAPIErrors } from '../../../../../common/methods/handleAPIErrors';
+import { useToastSuccessful } from '../../../../../../hooks/useToastSuccessful';
+import { usePaginatedTxResults } from '../../../../../../hooks/usePaginatedTxResults';
+import { TransactionResultTable } from '../../../../../common/components/TransactionResultTable';
 import { manageTokenDeduction } from '@/api/hedera/hts-interactions/tokenManagement-interactions';
 import { CONTRACT_NAMES, HEDERA_TRANSACTION_RESULT_STORAGE_KEYS } from '@/utils/common/constants';
-import { handleSanitizeHederaFormInputs } from '../../../shared/methods/handleSanitizeFormInputs';
-import { useUpdateTransactionResultsToLocalStorage } from '../../../shared/hooks/useUpdateLocalStorage';
+import { handleSanitizeHederaFormInputs } from '../../../../../common/methods/handleSanitizeFormInputs';
+import { useUpdateTransactionResultsToLocalStorage } from '../../../../../../hooks/useUpdateLocalStorage';
 import { htsTokenDeductionParamFields } from '@/utils/contract-interactions/HTS/token-management/constant';
-import useFilterTransactionsByContractAddress from '../../../shared/hooks/useFilterTransactionsByContractAddress';
-import { handleRetrievingTransactionResultsFromLocalStorage } from '../../../shared/methods/handleRetrievingTransactionResultsFromLocalStorage';
+import useFilterTransactionsByContractAddress from '../../../../../../hooks/useFilterTransactionsByContractAddress';
+import { handleRetrievingTransactionResultsFromLocalStorage } from '../../../../../common/methods/handleRetrievingTransactionResultsFromLocalStorage';
 import {
   SharedFormButton,
   SharedFormInputField,
@@ -57,7 +57,7 @@ const ManageTokenDeduction = ({ baseContract }: PageProps) => {
   const [currentTransactionPage, setCurrentTransactionPage] = useState(1);
   const [APIMethods, setAPIMethods] = useState<API_NAMES>('WIPE_FUNGIBLE');
   const currentContractAddress = Cookies.get(CONTRACT_NAMES.TOKEN_MANAGE) as string;
-  const [transactionResults, setTransactionResults] = useState<TransactionResult[]>([]);
+  const [transactionResults, setTransactionResults] = useState<ITransactionResult[]>([]);
   const transactionResultStorageKey =
     HEDERA_TRANSACTION_RESULT_STORAGE_KEYS['TOKEN-MANAGE']['TOKEN-REDUCTION'];
   const initialParamValues = {
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/hts/token-query-contract/methods/querySpecificToken/index.tsx b/system-contract-dapp-playground/src/components/contract-interaction/hts/token-query-contract/methods/querySpecificToken/index.tsx
index 6c0601cd6..f74764013 100644
--- a/system-contract-dapp-playground/src/components/contract-interaction/hts/token-query-contract/methods/querySpecificToken/index.tsx
+++ b/system-contract-dapp-playground/src/components/contract-interaction/hts/token-query-contract/methods/querySpecificToken/index.tsx
@@ -23,17 +23,17 @@ import { useState, useEffect } from 'react';
 import { Contract, isAddress } from 'ethers';
 import { CommonErrorToast } from '@/components/toast/CommonToast';
 import { Select, useDisclosure, useToast } from '@chakra-ui/react';
-import { handleAPIErrors } from '../../../shared/methods/handleAPIErrors';
-import { usePaginatedTxResults } from '../../../shared/hooks/usePaginatedTxResults';
+import { ITransactionResult } from '@/types/contract-interactions/shared';
+import { handleAPIErrors } from '../../../../../common/methods/handleAPIErrors';
+import { usePaginatedTxResults } from '../../../../../../hooks/usePaginatedTxResults';
 import TokenSpecificInfoModal from '../../../shared/components/TokenSpecificInfoModal';
-import { TransactionResultTable } from '../../../shared/components/TransactionResultTable';
+import { TransactionResultTable } from '../../../../../common/components/TransactionResultTable';
 import { HederaTokenKeyTypes, TRANSACTION_PAGE_SIZE } from '../../../shared/states/commonStates';
-import { IHederaTokenServiceKeyType, TransactionResult } from '@/types/contract-interactions/HTS';
 import { queryTokenSpecificInfomation } from '@/api/hedera/hts-interactions/tokenQuery-interactions';
 import { htsQueryTokenInfoParamFields } from '@/utils/contract-interactions/HTS/token-query/constant';
-import { useUpdateTransactionResultsToLocalStorage } from '../../../shared/hooks/useUpdateLocalStorage';
-import useFilterTransactionsByContractAddress from '../../../shared/hooks/useFilterTransactionsByContractAddress';
-import { handleRetrievingTransactionResultsFromLocalStorage } from '../../../shared/methods/handleRetrievingTransactionResultsFromLocalStorage';
+import { useUpdateTransactionResultsToLocalStorage } from '../../../../../../hooks/useUpdateLocalStorage';
+import useFilterTransactionsByContractAddress from '../../../../../../hooks/useFilterTransactionsByContractAddress';
+import { handleRetrievingTransactionResultsFromLocalStorage } from '../../../../../common/methods/handleRetrievingTransactionResultsFromLocalStorage';
 import {
   SharedFormButton,
   SharedExecuteButton,
@@ -82,7 +82,7 @@ const QueryTokenSpecificInfomation = ({ baseContract }: PageProps) => {
   const [tokenAddressFromTxResult, setTokenAddressFromTxResult] = useState('');
   const [APIMethods, setAPIMethods] = useState<API_NAMES>('DEFAULT_FREEZE_STATUS');
   const currentContractAddress = Cookies.get(CONTRACT_NAMES.TOKEN_QUERY) as string;
-  const [transactionResults, setTransactionResults] = useState<TransactionResult[]>([]);
+  const [transactionResults, setTransactionResults] = useState<ITransactionResult[]>([]);
   const [keyTypeFromTxResult, setKeyTypeFromTxResult] = useState<IHederaTokenServiceKeyType>('ADMIN');
   const [APIMethodsFromTxResult, setAPIMethodsFromTxResult] = useState<API_NAMES>('DEFAULT_FREEZE_STATUS');
   const transactionResultStorageKey =
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/hts/token-query-contract/methods/queryTokenGeneralInfo/index.tsx b/system-contract-dapp-playground/src/components/contract-interaction/hts/token-query-contract/methods/queryTokenGeneralInfo/index.tsx
index afadd22f5..1a1d199b6 100644
--- a/system-contract-dapp-playground/src/components/contract-interaction/hts/token-query-contract/methods/queryTokenGeneralInfo/index.tsx
+++ b/system-contract-dapp-playground/src/components/contract-interaction/hts/token-query-contract/methods/queryTokenGeneralInfo/index.tsx
@@ -23,19 +23,19 @@ import { Contract } from 'ethers';
 import { useEffect, useMemo, useState } from 'react';
 import { useDisclosure, useToast } from '@chakra-ui/react';
 import { CommonErrorToast } from '@/components/toast/CommonToast';
-import { TransactionResult } from '@/types/contract-interactions/HTS';
-import { handleAPIErrors } from '../../../shared/methods/handleAPIErrors';
+import { ITransactionResult } from '@/types/contract-interactions/shared';
 import { TRANSACTION_PAGE_SIZE } from '../../../shared/states/commonStates';
-import { usePaginatedTxResults } from '../../../shared/hooks/usePaginatedTxResults';
+import { handleAPIErrors } from '../../../../../common/methods/handleAPIErrors';
 import TokenGeneralInfoModal from '../../../shared/components/TokenGeneralInfoModal';
-import { TransactionResultTable } from '../../../shared/components/TransactionResultTable';
-import { handleSanitizeHederaFormInputs } from '../../../shared/methods/handleSanitizeFormInputs';
+import { usePaginatedTxResults } from '../../../../../../hooks/usePaginatedTxResults';
+import { TransactionResultTable } from '../../../../../common/components/TransactionResultTable';
+import { handleSanitizeHederaFormInputs } from '../../../../../common/methods/handleSanitizeFormInputs';
 import { CONTRACT_NAMES, HEDERA_TRANSACTION_RESULT_STORAGE_KEYS } from '@/utils/common/constants';
 import { queryTokenGeneralInfomation } from '@/api/hedera/hts-interactions/tokenQuery-interactions';
 import { htsQueryTokenInfoParamFields } from '@/utils/contract-interactions/HTS/token-query/constant';
-import { useUpdateTransactionResultsToLocalStorage } from '../../../shared/hooks/useUpdateLocalStorage';
-import useFilterTransactionsByContractAddress from '../../../shared/hooks/useFilterTransactionsByContractAddress';
-import { handleRetrievingTransactionResultsFromLocalStorage } from '../../../shared/methods/handleRetrievingTransactionResultsFromLocalStorage';
+import { useUpdateTransactionResultsToLocalStorage } from '../../../../../../hooks/useUpdateLocalStorage';
+import useFilterTransactionsByContractAddress from '../../../../../../hooks/useFilterTransactionsByContractAddress';
+import { handleRetrievingTransactionResultsFromLocalStorage } from '../../../../../common/methods/handleRetrievingTransactionResultsFromLocalStorage';
 import {
   SharedFormButton,
   SharedExecuteButton,
@@ -63,7 +63,7 @@ const QueryTokenGeneralInfomation = ({ baseContract }: PageProps) => {
   const [tokenInfoFromTxResult, setTokenInfoFromTxResult] = useState<any>();
   const [tokenAddressFromTxResult, setTokenAddressFromTxResult] = useState('');
   const currentContractAddress = Cookies.get(CONTRACT_NAMES.TOKEN_QUERY) as string;
-  const [transactionResults, setTransactionResults] = useState<TransactionResult[]>([]);
+  const [transactionResults, setTransactionResults] = useState<ITransactionResult[]>([]);
   const transactionResultStorageKey =
     HEDERA_TRANSACTION_RESULT_STORAGE_KEYS['TOKEN-QUERY']['TOKEN-GENERAL-INFO'];
   const [APIMethodsFromTxResult, setAPIMethodsFromTxResult] = useState<API_NAMES>('TOKEN');
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/hts/token-query-contract/methods/queryTokenPermission/index.tsx b/system-contract-dapp-playground/src/components/contract-interaction/hts/token-query-contract/methods/queryTokenPermission/index.tsx
index 062360952..0fbc20ae8 100644
--- a/system-contract-dapp-playground/src/components/contract-interaction/hts/token-query-contract/methods/queryTokenPermission/index.tsx
+++ b/system-contract-dapp-playground/src/components/contract-interaction/hts/token-query-contract/methods/queryTokenPermission/index.tsx
@@ -23,19 +23,19 @@ import { Contract } from 'ethers';
 import { useEffect, useMemo, useState } from 'react';
 import { useDisclosure, useToast } from '@chakra-ui/react';
 import { CommonErrorToast } from '@/components/toast/CommonToast';
-import { TransactionResult } from '@/types/contract-interactions/HTS';
-import { handleAPIErrors } from '../../../shared/methods/handleAPIErrors';
+import { ITransactionResult } from '@/types/contract-interactions/shared';
 import { TRANSACTION_PAGE_SIZE } from '../../../shared/states/commonStates';
-import { usePaginatedTxResults } from '../../../shared/hooks/usePaginatedTxResults';
+import { handleAPIErrors } from '../../../../../common/methods/handleAPIErrors';
+import { usePaginatedTxResults } from '../../../../../../hooks/usePaginatedTxResults';
 import TokenPermissionInfoModal from '../../../shared/components/TokenPermissionInfoModal';
-import { TransactionResultTable } from '../../../shared/components/TransactionResultTable';
-import { handleSanitizeHederaFormInputs } from '../../../shared/methods/handleSanitizeFormInputs';
+import { TransactionResultTable } from '../../../../../common/components/TransactionResultTable';
+import { handleSanitizeHederaFormInputs } from '../../../../../common/methods/handleSanitizeFormInputs';
 import { CONTRACT_NAMES, HEDERA_TRANSACTION_RESULT_STORAGE_KEYS } from '@/utils/common/constants';
-import { useUpdateTransactionResultsToLocalStorage } from '../../../shared/hooks/useUpdateLocalStorage';
 import { queryTokenPermissionInformation } from '@/api/hedera/hts-interactions/tokenQuery-interactions';
+import { useUpdateTransactionResultsToLocalStorage } from '../../../../../../hooks/useUpdateLocalStorage';
 import { htsQueryTokenPermissionParamFields } from '@/utils/contract-interactions/HTS/token-query/constant';
-import useFilterTransactionsByContractAddress from '../../../shared/hooks/useFilterTransactionsByContractAddress';
-import { handleRetrievingTransactionResultsFromLocalStorage } from '../../../shared/methods/handleRetrievingTransactionResultsFromLocalStorage';
+import useFilterTransactionsByContractAddress from '../../../../../../hooks/useFilterTransactionsByContractAddress';
+import { handleRetrievingTransactionResultsFromLocalStorage } from '../../../../../common/methods/handleRetrievingTransactionResultsFromLocalStorage';
 import {
   SharedExecuteButton,
   SharedFormButton,
@@ -62,7 +62,7 @@ const QueryTokenPermissionInfomation = ({ baseContract }: PageProps) => {
   const [currentTransactionPage, setCurrentTransactionPage] = useState(1);
   const [tokenInfoFromTxResult, setTokenInfoFromTxResult] = useState<any>();
   const currentContractAddress = Cookies.get(CONTRACT_NAMES.TOKEN_QUERY) as string;
-  const [transactionResults, setTransactionResults] = useState<TransactionResult[]>([]);
+  const [transactionResults, setTransactionResults] = useState<ITransactionResult[]>([]);
   const [APIMethodsFromTxResult, setAPIMethodsFromTxResult] = useState<API_NAMES>('ALLOWANCE');
   const transactionResultStorageKey =
     HEDERA_TRANSACTION_RESULT_STORAGE_KEYS['TOKEN-QUERY']['TOKEN-PERMISSION'];
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/hts/token-query-contract/methods/queryTokenStatus/index.tsx b/system-contract-dapp-playground/src/components/contract-interaction/hts/token-query-contract/methods/queryTokenStatus/index.tsx
index e12d2fbf6..7bc0220bc 100644
--- a/system-contract-dapp-playground/src/components/contract-interaction/hts/token-query-contract/methods/queryTokenStatus/index.tsx
+++ b/system-contract-dapp-playground/src/components/contract-interaction/hts/token-query-contract/methods/queryTokenStatus/index.tsx
@@ -23,20 +23,20 @@ import { Contract } from 'ethers';
 import { useEffect, useState } from 'react';
 import { useToast } from '@chakra-ui/react';
 import { CommonErrorToast } from '@/components/toast/CommonToast';
-import { TransactionResult } from '@/types/contract-interactions/HTS';
-import { handleAPIErrors } from '../../../shared/methods/handleAPIErrors';
+import { ITransactionResult } from '@/types/contract-interactions/shared';
 import { TRANSACTION_PAGE_SIZE } from '../../../shared/states/commonStates';
-import { useToastSuccessful } from '../../../shared/hooks/useToastSuccessful';
-import { usePaginatedTxResults } from '../../../shared/hooks/usePaginatedTxResults';
-import { TransactionResultTable } from '../../../shared/components/TransactionResultTable';
-import { handleSanitizeHederaFormInputs } from '../../../shared/methods/handleSanitizeFormInputs';
+import { handleAPIErrors } from '../../../../../common/methods/handleAPIErrors';
+import { useToastSuccessful } from '../../../../../../hooks/useToastSuccessful';
+import { usePaginatedTxResults } from '../../../../../../hooks/usePaginatedTxResults';
+import { TransactionResultTable } from '../../../../../common/components/TransactionResultTable';
+import { handleSanitizeHederaFormInputs } from '../../../../../common/methods/handleSanitizeFormInputs';
 import { CONTRACT_NAMES, HEDERA_TRANSACTION_RESULT_STORAGE_KEYS } from '@/utils/common/constants';
 import { queryTokenStatusInformation } from '@/api/hedera/hts-interactions/tokenQuery-interactions';
 import { SharedExecuteButton, SharedFormInputField } from '../../../shared/components/ParamInputForm';
-import { useUpdateTransactionResultsToLocalStorage } from '../../../shared/hooks/useUpdateLocalStorage';
 import { htsQueryTokenStatusParamFields } from '@/utils/contract-interactions/HTS/token-query/constant';
-import useFilterTransactionsByContractAddress from '../../../shared/hooks/useFilterTransactionsByContractAddress';
-import { handleRetrievingTransactionResultsFromLocalStorage } from '../../../shared/methods/handleRetrievingTransactionResultsFromLocalStorage';
+import { useUpdateTransactionResultsToLocalStorage } from '../../../../../../hooks/useUpdateLocalStorage';
+import useFilterTransactionsByContractAddress from '../../../../../../hooks/useFilterTransactionsByContractAddress';
+import { handleRetrievingTransactionResultsFromLocalStorage } from '../../../../../common/methods/handleRetrievingTransactionResultsFromLocalStorage';
 
 interface PageProps {
   baseContract: Contract;
@@ -53,7 +53,7 @@ const QueryTokenStatusInfomation = ({ baseContract }: PageProps) => {
   const hederaNetwork = JSON.parse(Cookies.get('_network') as string);
   const [currentTransactionPage, setCurrentTransactionPage] = useState(1);
   const currentContractAddress = Cookies.get(CONTRACT_NAMES.TOKEN_QUERY) as string;
-  const [transactionResults, setTransactionResults] = useState<TransactionResult[]>([]);
+  const [transactionResults, setTransactionResults] = useState<ITransactionResult[]>([]);
   const transactionResultStorageKey =
     HEDERA_TRANSACTION_RESULT_STORAGE_KEYS['TOKEN-QUERY']['TOKEN-STATUS-INFO'];
   const initialParamValues = {
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/hts/token-query-contract/methods/queryTokenValidity/index.tsx b/system-contract-dapp-playground/src/components/contract-interaction/hts/token-query-contract/methods/queryTokenValidity/index.tsx
index f08a1d535..065178d08 100644
--- a/system-contract-dapp-playground/src/components/contract-interaction/hts/token-query-contract/methods/queryTokenValidity/index.tsx
+++ b/system-contract-dapp-playground/src/components/contract-interaction/hts/token-query-contract/methods/queryTokenValidity/index.tsx
@@ -23,17 +23,17 @@ import { useToast } from '@chakra-ui/react';
 import { useEffect, useState } from 'react';
 import { Contract, isAddress } from 'ethers';
 import { CommonErrorToast } from '@/components/toast/CommonToast';
-import { TransactionResult } from '@/types/contract-interactions/HTS';
-import { handleAPIErrors } from '../../../shared/methods/handleAPIErrors';
+import { ITransactionResult } from '@/types/contract-interactions/shared';
 import { TRANSACTION_PAGE_SIZE } from '../../../shared/states/commonStates';
-import { useToastSuccessful } from '../../../shared/hooks/useToastSuccessful';
-import { usePaginatedTxResults } from '../../../shared/hooks/usePaginatedTxResults';
-import { TransactionResultTable } from '../../../shared/components/TransactionResultTable';
+import { handleAPIErrors } from '../../../../../common/methods/handleAPIErrors';
+import { useToastSuccessful } from '../../../../../../hooks/useToastSuccessful';
+import { usePaginatedTxResults } from '../../../../../../hooks/usePaginatedTxResults';
+import { TransactionResultTable } from '../../../../../common/components/TransactionResultTable';
 import { queryTokenValidity } from '@/api/hedera/hts-interactions/tokenQuery-interactions';
 import { SharedExecuteButton, SharedFormInputField } from '../../../shared/components/ParamInputForm';
-import { useUpdateTransactionResultsToLocalStorage } from '../../../shared/hooks/useUpdateLocalStorage';
-import useFilterTransactionsByContractAddress from '../../../shared/hooks/useFilterTransactionsByContractAddress';
-import { handleRetrievingTransactionResultsFromLocalStorage } from '../../../shared/methods/handleRetrievingTransactionResultsFromLocalStorage';
+import { useUpdateTransactionResultsToLocalStorage } from '../../../../../../hooks/useUpdateLocalStorage';
+import useFilterTransactionsByContractAddress from '../../../../../../hooks/useFilterTransactionsByContractAddress';
+import { handleRetrievingTransactionResultsFromLocalStorage } from '../../../../../common/methods/handleRetrievingTransactionResultsFromLocalStorage';
 import {
   CONTRACT_NAMES,
   HEDERA_BRANDING_COLORS,
@@ -56,7 +56,7 @@ const QueryTokenValidity = ({ baseContract }: PageProps) => {
   const hederaNetwork = JSON.parse(Cookies.get('_network') as string);
   const [currentTransactionPage, setCurrentTransactionPage] = useState(1);
   const currentContractAddress = Cookies.get(CONTRACT_NAMES.TOKEN_QUERY) as string;
-  const [transactionResults, setTransactionResults] = useState<TransactionResult[]>([]);
+  const [transactionResults, setTransactionResults] = useState<ITransactionResult[]>([]);
   const transactionResultStorageKey = HEDERA_TRANSACTION_RESULT_STORAGE_KEYS['TOKEN-QUERY']['TOKEN-VALIDITY'];
   const transactionResultsToShow = useFilterTransactionsByContractAddress(
     transactionResults,
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/hts/token-transfer-contract/method/transferCrypto/helpers/prepareCryptoTransferValues.ts b/system-contract-dapp-playground/src/components/contract-interaction/hts/token-transfer-contract/method/transferCrypto/helpers/prepareCryptoTransferValues.ts
index 41c818e86..c10ccbd15 100644
--- a/system-contract-dapp-playground/src/components/contract-interaction/hts/token-transfer-contract/method/transferCrypto/helpers/prepareCryptoTransferValues.ts
+++ b/system-contract-dapp-playground/src/components/contract-interaction/hts/token-transfer-contract/method/transferCrypto/helpers/prepareCryptoTransferValues.ts
@@ -18,11 +18,6 @@
  *
  */
 
-import {
-  IHederaTokenServiceNftTransfer,
-  IHederaTokenServiceAccountAmount,
-  IHederaTokenServiceTokenTransferList,
-} from '@/types/contract-interactions/HTS';
 import { CryptoTransferParam, TokenTransferParam } from './generateInitialValues';
 
 interface CryptoTransferPageProps {
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/hts/token-transfer-contract/method/transferCrypto/index.tsx b/system-contract-dapp-playground/src/components/contract-interaction/hts/token-transfer-contract/method/transferCrypto/index.tsx
index fe88cf2cf..a3999f6b6 100644
--- a/system-contract-dapp-playground/src/components/contract-interaction/hts/token-transfer-contract/method/transferCrypto/index.tsx
+++ b/system-contract-dapp-playground/src/components/contract-interaction/hts/token-transfer-contract/method/transferCrypto/index.tsx
@@ -24,23 +24,19 @@ import { useEffect, useState } from 'react';
 import { useToast } from '@chakra-ui/react';
 import TokenTransferForm from './TokenTransferForm';
 import CryptoTransferForm from './CryptoTransferForm';
-import { handleAPIErrors } from '../../../shared/methods/handleAPIErrors';
+import { ITransactionResult } from '@/types/contract-interactions/shared';
 import { TRANSACTION_PAGE_SIZE } from '../../../shared/states/commonStates';
-import { useToastSuccessful } from '../../../shared/hooks/useToastSuccessful';
-import { usePaginatedTxResults } from '../../../shared/hooks/usePaginatedTxResults';
+import { useToastSuccessful } from '../../../../../../hooks/useToastSuccessful';
+import { handleAPIErrors } from '../../../../../common/methods/handleAPIErrors';
+import { usePaginatedTxResults } from '../../../../../../hooks/usePaginatedTxResults';
 import { SharedExecuteButtonWithFee } from '../../../shared/components/ParamInputForm';
 import { transferCrypto } from '@/api/hedera/hts-interactions/tokenTransfer-interactions';
-import { TransactionResultTable } from '../../../shared/components/TransactionResultTable';
+import { TransactionResultTable } from '../../../../../common/components/TransactionResultTable';
 import { CONTRACT_NAMES, HEDERA_TRANSACTION_RESULT_STORAGE_KEYS } from '@/utils/common/constants';
-import { useUpdateTransactionResultsToLocalStorage } from '../../../shared/hooks/useUpdateLocalStorage';
+import { useUpdateTransactionResultsToLocalStorage } from '../../../../../../hooks/useUpdateLocalStorage';
 import { prepareCryptoTransferList, prepareTokenTransferList } from './helpers/prepareCryptoTransferValues';
-import useFilterTransactionsByContractAddress from '../../../shared/hooks/useFilterTransactionsByContractAddress';
-import { handleRetrievingTransactionResultsFromLocalStorage } from '../../../shared/methods/handleRetrievingTransactionResultsFromLocalStorage';
-import {
-  IHederaTokenServiceTokenTransferList,
-  IHederaTokenServiceTransferList,
-  TransactionResult,
-} from '@/types/contract-interactions/HTS';
+import useFilterTransactionsByContractAddress from '../../../../../../hooks/useFilterTransactionsByContractAddress';
+import { handleRetrievingTransactionResultsFromLocalStorage } from '../../../../../common/methods/handleRetrievingTransactionResultsFromLocalStorage';
 import {
   CryptoTransferParam,
   TokenTransferParam,
@@ -61,7 +57,7 @@ const CryptoTransfer = ({ baseContract }: PageProps) => {
   const [currentTransactionPage, setCurrentTransactionPage] = useState(1);
   const contractCaller = JSON.parse(Cookies.get('_connectedAccounts') as string)[0];
   const currentContractAddress = Cookies.get(CONTRACT_NAMES.TOKEN_TRANSFER) as string;
-  const [transactionResults, setTransactionResults] = useState<TransactionResult[]>([]);
+  const [transactionResults, setTransactionResults] = useState<ITransactionResult[]>([]);
   const [tokenTransferParamValues, setTokenTransferParamValues] = useState<TokenTransferParam[]>([]);
   const [cryptoTransferParamValues, setCryptoTransferParamValues] = useState<CryptoTransferParam[]>([]);
   const transactionResultStorageKey =
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/hts/token-transfer-contract/method/transferMultipleTokens/index.tsx b/system-contract-dapp-playground/src/components/contract-interaction/hts/token-transfer-contract/method/transferMultipleTokens/index.tsx
index d74f3a344..d62c99ffe 100644
--- a/system-contract-dapp-playground/src/components/contract-interaction/hts/token-transfer-contract/method/transferMultipleTokens/index.tsx
+++ b/system-contract-dapp-playground/src/components/contract-interaction/hts/token-transfer-contract/method/transferMultipleTokens/index.tsx
@@ -24,18 +24,18 @@ import { useToast } from '@chakra-ui/react';
 import { useEffect, useMemo, useState } from 'react';
 import TransferRecordForm from './TransferRecordForm';
 import { CommonErrorToast } from '@/components/toast/CommonToast';
-import { handleAPIErrors } from '../../../shared/methods/handleAPIErrors';
 import { TRANSACTION_PAGE_SIZE } from '../../../shared/states/commonStates';
-import { useToastSuccessful } from '../../../shared/hooks/useToastSuccessful';
-import { usePaginatedTxResults } from '../../../shared/hooks/usePaginatedTxResults';
-import { TransactionResultTable } from '../../../shared/components/TransactionResultTable';
+import { handleAPIErrors } from '../../../../../common/methods/handleAPIErrors';
+import { useToastSuccessful } from '../../../../../../hooks/useToastSuccessful';
+import { usePaginatedTxResults } from '../../../../../../hooks/usePaginatedTxResults';
+import { TransactionResultTable } from '../../../../../common/components/TransactionResultTable';
 import { CONTRACT_NAMES, HEDERA_TRANSACTION_RESULT_STORAGE_KEYS } from '@/utils/common/constants';
-import { handleSanitizeHederaFormInputs } from '../../../shared/methods/handleSanitizeFormInputs';
-import { SmartContractExecutionResult, TransactionResult } from '@/types/contract-interactions/HTS';
-import { useUpdateTransactionResultsToLocalStorage } from '../../../shared/hooks/useUpdateLocalStorage';
-import useFilterTransactionsByContractAddress from '../../../shared/hooks/useFilterTransactionsByContractAddress';
+import { handleSanitizeHederaFormInputs } from '../../../../../common/methods/handleSanitizeFormInputs';
+import { ISmartContractExecutionResult, ITransactionResult } from '@/types/contract-interactions/shared';
+import { useUpdateTransactionResultsToLocalStorage } from '../../../../../../hooks/useUpdateLocalStorage';
+import useFilterTransactionsByContractAddress from '../../../../../../hooks/useFilterTransactionsByContractAddress';
 import { htsMultiTokensTransferParamFields } from '@/utils/contract-interactions/HTS/token-transfer/paramFieldConstant';
-import { handleRetrievingTransactionResultsFromLocalStorage } from '../../../shared/methods/handleRetrievingTransactionResultsFromLocalStorage';
+import { handleRetrievingTransactionResultsFromLocalStorage } from '../../../../../common/methods/handleRetrievingTransactionResultsFromLocalStorage';
 import {
   transferFungibleTokens,
   transferNonFungibleTokens,
@@ -67,7 +67,7 @@ const TransferMultipleTokens = ({ baseContract }: PageProps) => {
   const [currentTransactionPage, setCurrentTransactionPage] = useState(1);
   const contractCaller = JSON.parse(Cookies.get('_connectedAccounts') as string)[0];
   const currentContractAddress = Cookies.get(CONTRACT_NAMES.TOKEN_TRANSFER) as string;
-  const [transactionResults, setTransactionResults] = useState<TransactionResult[]>([]);
+  const [transactionResults, setTransactionResults] = useState<ITransactionResult[]>([]);
   const [isLoading, setIsLoading] = useState({
     FUNGIBLE: false,
     NON_FUNGIBLE: false,
@@ -208,7 +208,7 @@ const TransferMultipleTokens = ({ baseContract }: PageProps) => {
       NON_FUNGIBLE: API === 'NON_FUNGIBLE',
     });
 
-    let transactionResult: SmartContractExecutionResult;
+    let transactionResult: ISmartContractExecutionResult;
     if (API === 'FUNGIBLE') {
       transactionResult = await transferFungibleTokens(
         baseContract,
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/hts/token-transfer-contract/method/transferSingleToken/index.tsx b/system-contract-dapp-playground/src/components/contract-interaction/hts/token-transfer-contract/method/transferSingleToken/index.tsx
index aa5cddfdf..63321c635 100644
--- a/system-contract-dapp-playground/src/components/contract-interaction/hts/token-transfer-contract/method/transferSingleToken/index.tsx
+++ b/system-contract-dapp-playground/src/components/contract-interaction/hts/token-transfer-contract/method/transferSingleToken/index.tsx
@@ -23,20 +23,20 @@ import { Contract } from 'ethers';
 import { useToast } from '@chakra-ui/react';
 import { useEffect, useState } from 'react';
 import { CommonErrorToast } from '@/components/toast/CommonToast';
-import { TransactionResult } from '@/types/contract-interactions/HTS';
-import { handleAPIErrors } from '../../../shared/methods/handleAPIErrors';
+import { ITransactionResult } from '@/types/contract-interactions/shared';
 import { TRANSACTION_PAGE_SIZE } from '../../../shared/states/commonStates';
-import { useToastSuccessful } from '../../../shared/hooks/useToastSuccessful';
-import { usePaginatedTxResults } from '../../../shared/hooks/usePaginatedTxResults';
-import { TransactionResultTable } from '../../../shared/components/TransactionResultTable';
+import { handleAPIErrors } from '../../../../../common/methods/handleAPIErrors';
+import { useToastSuccessful } from '../../../../../../hooks/useToastSuccessful';
+import { usePaginatedTxResults } from '../../../../../../hooks/usePaginatedTxResults';
+import { TransactionResultTable } from '../../../../../common/components/TransactionResultTable';
 import { transferSingleToken } from '@/api/hedera/hts-interactions/tokenTransfer-interactions';
-import { handleSanitizeHederaFormInputs } from '../../../shared/methods/handleSanitizeFormInputs';
+import { handleSanitizeHederaFormInputs } from '../../../../../common/methods/handleSanitizeFormInputs';
 import { CONTRACT_NAMES, HEDERA_TRANSACTION_RESULT_STORAGE_KEYS } from '@/utils/common/constants';
 import { SharedExecuteButton, SharedFormInputField } from '../../../shared/components/ParamInputForm';
-import { useUpdateTransactionResultsToLocalStorage } from '../../../shared/hooks/useUpdateLocalStorage';
-import useFilterTransactionsByContractAddress from '../../../shared/hooks/useFilterTransactionsByContractAddress';
+import { useUpdateTransactionResultsToLocalStorage } from '../../../../../../hooks/useUpdateLocalStorage';
+import useFilterTransactionsByContractAddress from '../../../../../../hooks/useFilterTransactionsByContractAddress';
 import { htsTokenTransferParamFields } from '@/utils/contract-interactions/HTS/token-transfer/paramFieldConstant';
-import { handleRetrievingTransactionResultsFromLocalStorage } from '../../../shared/methods/handleRetrievingTransactionResultsFromLocalStorage';
+import { handleRetrievingTransactionResultsFromLocalStorage } from '../../../../../common/methods/handleRetrievingTransactionResultsFromLocalStorage';
 
 interface PageProps {
   baseContract: Contract;
@@ -51,7 +51,7 @@ const TransferSingleToken = ({ baseContract }: PageProps) => {
   const hederaNetwork = JSON.parse(Cookies.get('_network') as string);
   const [currentTransactionPage, setCurrentTransactionPage] = useState(1);
   const currentContractAddress = Cookies.get(CONTRACT_NAMES.TOKEN_TRANSFER) as string;
-  const [transactionResults, setTransactionResults] = useState<TransactionResult[]>([]);
+  const [transactionResults, setTransactionResults] = useState<ITransactionResult[]>([]);
   const tokenInfoFields = ['hederaTokenAddress', 'senderAddress', 'receiverAddress', 'quantity', 'feeValue'];
   const transactionResultStorageKey =
     HEDERA_TRANSACTION_RESULT_STORAGE_KEYS['TOKEN-TRANSFER']['SINGLE-TOKEN'];
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/ihrc/methods/index.tsx b/system-contract-dapp-playground/src/components/contract-interaction/ihrc/methods/index.tsx
index c8fa16204..365b5cac5 100644
--- a/system-contract-dapp-playground/src/components/contract-interaction/ihrc/methods/index.tsx
+++ b/system-contract-dapp-playground/src/components/contract-interaction/ihrc/methods/index.tsx
@@ -24,15 +24,15 @@ import { useToast } from '@chakra-ui/react';
 import { getWalletProvider } from '@/api/wallet';
 import { CommonErrorToast } from '@/components/toast/CommonToast';
 import { handleIHRC719APIs } from '@/api/hedera/ihrc-interactions';
-import { TransactionResult } from '@/types/contract-interactions/HTS';
-import { handleAPIErrors } from '../../hts/shared/methods/handleAPIErrors';
+import { ITransactionResult } from '@/types/contract-interactions/shared';
+import { handleAPIErrors } from '../../../common/methods/handleAPIErrors';
+import { useToastSuccessful } from '../../../../hooks/useToastSuccessful';
 import { TRANSACTION_PAGE_SIZE } from '../../hts/shared/states/commonStates';
-import { useToastSuccessful } from '../../hts/shared/hooks/useToastSuccessful';
-import { usePaginatedTxResults } from '../../hts/shared/hooks/usePaginatedTxResults';
-import { TransactionResultTable } from '../../hts/shared/components/TransactionResultTable';
+import { usePaginatedTxResults } from '../../../../hooks/usePaginatedTxResults';
+import { TransactionResultTable } from '../../../common/components/TransactionResultTable';
+import { useUpdateTransactionResultsToLocalStorage } from '../../../../hooks/useUpdateLocalStorage';
 import { SharedExecuteButton, SharedFormInputField } from '../../hts/shared/components/ParamInputForm';
-import { useUpdateTransactionResultsToLocalStorage } from '../../hts/shared/hooks/useUpdateLocalStorage';
-import { handleRetrievingTransactionResultsFromLocalStorage } from '../../hts/shared/methods/handleRetrievingTransactionResultsFromLocalStorage';
+import { handleRetrievingTransactionResultsFromLocalStorage } from '../../../common/methods/handleRetrievingTransactionResultsFromLocalStorage';
 import {
   HEDERA_TRANSACTION_RESULT_STORAGE_KEYS,
   HEDERA_BRANDING_COLORS,
@@ -57,7 +57,7 @@ const HederaIHRC719Methods = ({ network }: PageProps) => {
   const initialParamValues = { hederaTokenAddress: '', feeValue: '' };
   const [paramValues, setParamValues] = useState(initialParamValues);
   const [currentTransactionPage, setCurrentTransactionPage] = useState(1);
-  const [transactionResults, setTransactionResults] = useState<TransactionResult[]>([]);
+  const [transactionResults, setTransactionResults] = useState<ITransactionResult[]>([]);
   const transactionResultStorageKey = HEDERA_TRANSACTION_RESULT_STORAGE_KEYS['IHRC719-RESULTS'];
 
   /** @dev retrieve token creation results from localStorage to maintain data on re-renders */
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/index.tsx b/system-contract-dapp-playground/src/components/contract-interaction/index.tsx
index b13ef3f7a..b5d7f0563 100644
--- a/system-contract-dapp-playground/src/components/contract-interaction/index.tsx
+++ b/system-contract-dapp-playground/src/components/contract-interaction/index.tsx
@@ -25,17 +25,18 @@ import { BsTrash } from 'react-icons/bs';
 import HederaPRNGMethods from './prng/methods';
 import { FiExternalLink } from 'react-icons/fi';
 import ERC20Methods from './erc/erc-20/methods';
-import ConfirmModal from '../common/ConfirmModal';
 import ERC721Methods from './erc/erc-721/methods';
 import HederaIHRC719Methods from './ihrc/methods';
 import { deploySmartContract } from '@/api/hedera';
-import HederaAlertDialog from '../common/AlertDialog';
 import { useCallback, useEffect, useState } from 'react';
 import { generateBaseContractInstance } from '@/api/ethers';
+import ConfirmModal from '../common/components/ConfirmModal';
 import { clearCachedTransactions } from '@/api/localStorage';
 import ERC20DeployField from './erc/deployment/ERCDeployField';
 import HederaExchangeRateMethods from './exchange-rate/methods';
-import { HederaContractAsset, NetworkName } from '@/types/common';
+import HederaAlertDialog from '../common/components/AlertDialog';
+import { copyContentToClipboard } from '../common/methods/common';
+import { IHederaContractAsset, TNetworkName } from '@/types/common';
 import { getHederaNativeIDFromEvmAddress } from '@/api/mirror-node';
 import { CommonErrorToast, NoWalletToast } from '../toast/CommonToast';
 import { convertCalmelCaseFunctionName } from '@/utils/common/helpers';
@@ -68,7 +69,7 @@ import {
 } from '@/utils/common/constants';
 
 interface PageProps {
-  contract: HederaContractAsset;
+  contract: IHederaContractAsset;
 }
 
 const ContractInteraction = ({ contract }: PageProps) => {
@@ -78,7 +79,7 @@ const ContractInteraction = ({ contract }: PageProps) => {
   const { isOpen, onOpen, onClose } = useDisclosure();
   const [isDeployed, setIsDeployed] = useState(false);
   const [isDeploying, setIsDeploying] = useState(false);
-  const [network, setNetwork] = useState<NetworkName>();
+  const [network, setNetwork] = useState<TNetworkName>();
   const [contractAddress, setContractAddress] = useState('');
   const [didDeployStart, setDidDeployStart] = useState(false);
   const [baseContract, setBaseContract] = useState<Contract>();
@@ -188,7 +189,7 @@ const ContractInteraction = ({ contract }: PageProps) => {
         setContractAddress(contractAddr);
       }
       if (network) {
-        setNetwork(JSON.parse(network) as NetworkName);
+        setNetwork(JSON.parse(network) as TNetworkName);
       }
     })();
   }, [contract.name, toaster]);
@@ -200,7 +201,7 @@ const ContractInteraction = ({ contract }: PageProps) => {
         // handle getting Hedera native contractId from EvmAddress
         const { contractId, err: getContractIdErr } = await getHederaNativeIDFromEvmAddress(
           contractAddress,
-          network as NetworkName,
+          network as TNetworkName,
           'contracts'
         );
         // handle error
@@ -304,7 +305,7 @@ const ContractInteraction = ({ contract }: PageProps) => {
                           <div className="flex items-center gap-1">
                             <div
                               className="cursor-pointer"
-                              onClick={() => navigator.clipboard.writeText(contractId)}
+                              onClick={() => copyContentToClipboard(contractId)}
                             >
                               <Popover>
                                 <PopoverTrigger>
@@ -342,7 +343,7 @@ const ContractInteraction = ({ contract }: PageProps) => {
                           <div className="flex items-center gap-1">
                             <div
                               className="cursor-pointer"
-                              onClick={() => navigator.clipboard.writeText(contractAddress)}
+                              onClick={() => copyContentToClipboard(contractAddress)}
                             >
                               <Popover>
                                 <PopoverTrigger>
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/prng/methods/index.tsx b/system-contract-dapp-playground/src/components/contract-interaction/prng/methods/index.tsx
index 033f25f64..44665d200 100644
--- a/system-contract-dapp-playground/src/components/contract-interaction/prng/methods/index.tsx
+++ b/system-contract-dapp-playground/src/components/contract-interaction/prng/methods/index.tsx
@@ -24,17 +24,17 @@ import { useToast } from '@chakra-ui/react';
 import { useEffect, useState } from 'react';
 import { handlePRGNAPI } from '@/api/hedera/prng-interactions';
 import { CommonErrorToast } from '@/components/toast/CommonToast';
-import { TransactionResult } from '@/types/contract-interactions/HTS';
-import { handleAPIErrors } from '../../hts/shared/methods/handleAPIErrors';
+import { ITransactionResult } from '@/types/contract-interactions/shared';
+import { handleAPIErrors } from '../../../common/methods/handleAPIErrors';
+import { useToastSuccessful } from '../../../../hooks/useToastSuccessful';
 import { TRANSACTION_PAGE_SIZE } from '../../hts/shared/states/commonStates';
-import { useToastSuccessful } from '../../hts/shared/hooks/useToastSuccessful';
-import { usePaginatedTxResults } from '../../hts/shared/hooks/usePaginatedTxResults';
+import { usePaginatedTxResults } from '../../../../hooks/usePaginatedTxResults';
 import { SharedExecuteButtonWithFee } from '../../hts/shared/components/ParamInputForm';
-import { TransactionResultTable } from '../../hts/shared/components/TransactionResultTable';
+import { TransactionResultTable } from '../../../common/components/TransactionResultTable';
 import { CONTRACT_NAMES, HEDERA_TRANSACTION_RESULT_STORAGE_KEYS } from '@/utils/common/constants';
-import { useUpdateTransactionResultsToLocalStorage } from '../../hts/shared/hooks/useUpdateLocalStorage';
-import useFilterTransactionsByContractAddress from '../../hts/shared/hooks/useFilterTransactionsByContractAddress';
-import { handleRetrievingTransactionResultsFromLocalStorage } from '../../hts/shared/methods/handleRetrievingTransactionResultsFromLocalStorage';
+import { useUpdateTransactionResultsToLocalStorage } from '../../../../hooks/useUpdateLocalStorage';
+import useFilterTransactionsByContractAddress from '../../../../hooks/useFilterTransactionsByContractAddress';
+import { handleRetrievingTransactionResultsFromLocalStorage } from '../../../common/methods/handleRetrievingTransactionResultsFromLocalStorage';
 
 interface PageProps {
   baseContract: Contract;
@@ -50,7 +50,7 @@ const HederaPRNGMethods = ({ baseContract }: PageProps) => {
   const hederaNetwork = JSON.parse(Cookies.get('_network') as string);
   const [currentTransactionPage, setCurrentTransactionPage] = useState(1);
   const currentContractAddress = Cookies.get(CONTRACT_NAMES.PRNG) as string;
-  const [transactionResults, setTransactionResults] = useState<TransactionResult[]>([]);
+  const [transactionResults, setTransactionResults] = useState<ITransactionResult[]>([]);
   const transactionResultStorageKey = HEDERA_TRANSACTION_RESULT_STORAGE_KEYS['PRNG-RESULT']['PSEUDO-RANDOM'];
   const transactionResultsToShow = useFilterTransactionsByContractAddress(
     transactionResults,
diff --git a/system-contract-dapp-playground/src/components/navbar/index.tsx b/system-contract-dapp-playground/src/components/navbar/index.tsx
index 6f1423db1..40803333b 100644
--- a/system-contract-dapp-playground/src/components/navbar/index.tsx
+++ b/system-contract-dapp-playground/src/components/navbar/index.tsx
@@ -26,7 +26,7 @@ import { motion } from 'framer-motion';
 import WalletPopup from '../wallet-popup';
 import { useToast } from '@chakra-ui/react';
 import { useEffect, useState } from 'react';
-import { NetworkName } from '@/types/common';
+import { TNetworkName } from '@/types/common';
 import { usePathname } from 'next/navigation';
 import { BsChevronDown } from 'react-icons/bs';
 import { CommonErrorToast } from '../toast/CommonToast';
@@ -42,7 +42,7 @@ const Navbar = () => {
   const [accounts, setAccounts] = useState<string[]>([]);
   const [isConnected, setIsConnected] = useState(false);
   const [didWalletPop, setDidWalletPop] = useState(false);
-  const [network, setNetwork] = useState<NetworkName>('testnet');
+  const [network, setNetwork] = useState<TNetworkName>('testnet');
 
   // listen to pathname change event to retrieve account information cookies
   useEffect(() => {
@@ -68,7 +68,7 @@ const Navbar = () => {
       // update states
       setAccounts(JSON.parse(accountsInfo.accounts));
       setIsConnected(JSON.parse(accountsInfo.isConnected));
-      setNetwork(JSON.parse(accountsInfo.network) as NetworkName);
+      setNetwork(JSON.parse(accountsInfo.network) as TNetworkName);
     }
   }, [pathname, toaster]);
 
diff --git a/system-contract-dapp-playground/src/components/leftSideBar/index.tsx b/system-contract-dapp-playground/src/components/sidebar/index.tsx
similarity index 90%
rename from system-contract-dapp-playground/src/components/leftSideBar/index.tsx
rename to system-contract-dapp-playground/src/components/sidebar/index.tsx
index e7f04f4fb..23db860e3 100644
--- a/system-contract-dapp-playground/src/components/leftSideBar/index.tsx
+++ b/system-contract-dapp-playground/src/components/sidebar/index.tsx
@@ -23,9 +23,9 @@
 import Link from 'next/link';
 import { motion } from 'framer-motion';
 import { usePathname } from 'next/navigation';
-import { LEFT_SIDE_BAR_ITEMS } from '@/utils/common/constants';
+import { NAV_SIDE_BAR_ITEMS } from '@/utils/common/constants';
 
-const LeftSideBar = () => {
+const NavSideBar = () => {
   const pathname = usePathname();
 
   return (
@@ -39,7 +39,7 @@ const LeftSideBar = () => {
       viewport={{ once: true }}
       className="w-72 h-full border-r border-white/30 text-white flex flex-col gap-3 pt-7 text-lg font-light tracking-tight leading-6 pr-2"
     >
-      {LEFT_SIDE_BAR_ITEMS.map((item) => (
+      {NAV_SIDE_BAR_ITEMS.map((item) => (
         <Link
           key={item.name}
           href={item.path}
@@ -54,4 +54,4 @@ const LeftSideBar = () => {
   );
 };
 
-export default LeftSideBar;
+export default NavSideBar;
diff --git a/system-contract-dapp-playground/src/components/wallet-popup/index.tsx b/system-contract-dapp-playground/src/components/wallet-popup/index.tsx
index caeeb9850..d5107d0ca 100644
--- a/system-contract-dapp-playground/src/components/wallet-popup/index.tsx
+++ b/system-contract-dapp-playground/src/components/wallet-popup/index.tsx
@@ -22,11 +22,12 @@ import Link from 'next/link';
 import Image from 'next/image';
 import { ethers } from 'ethers';
 import { clearCookies } from '@/api/cookies';
-import { NetworkName } from '@/types/common';
-import ConfirmModal from '../common/ConfirmModal';
+import { TNetworkName } from '@/types/common';
 import { BiCopy, BiCheckDouble } from 'react-icons/bi';
+import ConfirmModal from '../common/components/ConfirmModal';
 import { clearCachedTransactions } from '@/api/localStorage';
 import { getBalance, getWalletProvider } from '@/api/wallet';
+import { copyContentToClipboard } from '../common/methods/common';
 import { getHederaNativeIDFromEvmAddress } from '@/api/mirror-node';
 import { Dispatch, SetStateAction, useEffect, useState } from 'react';
 import { CommonErrorToast, NoWalletToast } from '../toast/CommonToast';
@@ -35,7 +36,7 @@ import { BsChevronDown, BsFillQuestionOctagonFill } from 'react-icons/bs';
 import { HASHSCAN_BASE_URL, HEDERA_COMMON_WALLET_REVERT_REASONS } from '@/utils/common/constants';
 
 interface PageProps {
-  network: NetworkName;
+  network: TNetworkName;
   userAddress: string;
   setIsOpen: Dispatch<SetStateAction<boolean>>;
 }
@@ -105,11 +106,11 @@ const WalletPopup = ({ setIsOpen, userAddress, network }: PageProps) => {
     switch (type) {
       case 'ACCOUNTID':
         setIsCopied((prev) => ({ ...prev, accountId: true }));
-        navigator.clipboard.writeText(hederaAccountId as string);
+        copyContentToClipboard(hederaAccountId as string);
         break;
       default:
         setIsCopied((prev) => ({ ...prev, evmAddress: true }));
-        navigator.clipboard.writeText(userAddress);
+        copyContentToClipboard(userAddress);
     }
     setTimeout(() => {
       setIsCopied({ accountId: false, evmAddress: false });
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/hts/shared/hooks/useFilterTransactionsByContractAddress.tsx b/system-contract-dapp-playground/src/hooks/useFilterTransactionsByContractAddress.tsx
similarity index 89%
rename from system-contract-dapp-playground/src/components/contract-interaction/hts/shared/hooks/useFilterTransactionsByContractAddress.tsx
rename to system-contract-dapp-playground/src/hooks/useFilterTransactionsByContractAddress.tsx
index 1b50f2ba1..18a820ee3 100644
--- a/system-contract-dapp-playground/src/components/contract-interaction/hts/shared/hooks/useFilterTransactionsByContractAddress.tsx
+++ b/system-contract-dapp-playground/src/hooks/useFilterTransactionsByContractAddress.tsx
@@ -19,12 +19,12 @@
  */
 
 import { useMemo } from 'react';
-import { TransactionResult } from '@/types/contract-interactions/HTS';
+import { ITransactionResult } from '@/types/contract-interactions/shared';
 
 /** @dev custom hook to filter transactions by contract address */
 
 const useFilterTransactionsByContractAddress = (
-  transactionResults: TransactionResult[],
+  transactionResults: ITransactionResult[],
   contractAddress: string
 ) => {
   return useMemo(
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/hts/shared/hooks/usePaginatedTxResults.tsx b/system-contract-dapp-playground/src/hooks/usePaginatedTxResults.tsx
similarity index 87%
rename from system-contract-dapp-playground/src/components/contract-interaction/hts/shared/hooks/usePaginatedTxResults.tsx
rename to system-contract-dapp-playground/src/hooks/usePaginatedTxResults.tsx
index 981b1b9be..6a7750b14 100644
--- a/system-contract-dapp-playground/src/components/contract-interaction/hts/shared/hooks/usePaginatedTxResults.tsx
+++ b/system-contract-dapp-playground/src/hooks/usePaginatedTxResults.tsx
@@ -19,13 +19,13 @@
  */
 
 import { useMemo } from 'react';
-import { TRANSACTION_PAGE_SIZE } from '../states/commonStates';
-import { TransactionResult } from '@/types/contract-interactions/HTS';
+import { TRANSACTION_PAGE_SIZE } from '../components/contract-interaction/hts/shared/states/commonStates';
+import { ITransactionResult } from '@/types/contract-interactions/shared';
 
 /** @dev custom hook which declares a paginatedTransactionResults array */
 export const usePaginatedTxResults = (
   currentTransactionPage: number,
-  transactionResults: TransactionResult[],
+  transactionResults: ITransactionResult[],
   customePageSize?: number,
   order?: any
 ) => {
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/erc/shared/hooks/useRetrieveMapValueFromLocalStorage.tsx b/system-contract-dapp-playground/src/hooks/useRetrieveMapValueFromLocalStorage.tsx
similarity index 100%
rename from system-contract-dapp-playground/src/components/contract-interaction/erc/shared/hooks/useRetrieveMapValueFromLocalStorage.tsx
rename to system-contract-dapp-playground/src/hooks/useRetrieveMapValueFromLocalStorage.tsx
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/hts/shared/hooks/useToastSuccessful.tsx b/system-contract-dapp-playground/src/hooks/useToastSuccessful.tsx
similarity index 89%
rename from system-contract-dapp-playground/src/components/contract-interaction/hts/shared/hooks/useToastSuccessful.tsx
rename to system-contract-dapp-playground/src/hooks/useToastSuccessful.tsx
index 89929c320..0a557ce46 100644
--- a/system-contract-dapp-playground/src/components/contract-interaction/hts/shared/hooks/useToastSuccessful.tsx
+++ b/system-contract-dapp-playground/src/hooks/useToastSuccessful.tsx
@@ -18,17 +18,16 @@
  *
  */
 
-import {
-  CommonKeyObject,
-  TransactionResult,
-  IHederaTokenServiceKeyType,
-} from '@/types/contract-interactions/HTS';
 import { Dispatch, SetStateAction, useEffect } from 'react';
-import { HederaTokenKeyTypes, TRANSACTION_PAGE_SIZE } from '../states/commonStates';
+import {
+  HederaTokenKeyTypes,
+  TRANSACTION_PAGE_SIZE,
+} from '../components/contract-interaction/hts/shared/states/commonStates';
 import {
   generateInitialFungibleParamValue,
   generateInitialNonFungibleParamValue,
-} from '../../token-transfer-contract/method/transferMultipleTokens/helpers/generateInitialValues';
+} from '../components/contract-interaction/hts/token-transfer-contract/method/transferMultipleTokens/helpers/generateInitialValues';
+import { ITransactionResult } from '@/types/contract-interactions/shared';
 
 interface HookProps {
   toaster: any;
@@ -44,11 +43,11 @@ interface HookProps {
   initialTokenAddressesValues?: any;
   setTokenTransferParamValues?: any;
   setCryptoTransferParamValues?: any;
-  initialKeyValues?: CommonKeyObject[];
-  transactionResults: TransactionResult[];
+  initialKeyValues?: ICommonKeyObject[];
+  transactionResults: ITransactionResult[];
   setIsSuccessful: Dispatch<SetStateAction<boolean>>;
   setWithCustomFee?: Dispatch<SetStateAction<boolean>>;
-  setKeys?: Dispatch<SetStateAction<CommonKeyObject[]>>;
+  setKeys?: Dispatch<SetStateAction<ICommonKeyObject[]>>;
   setCurrentTransactionPage: Dispatch<SetStateAction<number>>;
   setChosenKeys?: Dispatch<SetStateAction<Set<IHederaTokenServiceKeyType>>>;
   setKeyTypesToShow?: Dispatch<SetStateAction<Set<IHederaTokenServiceKeyType>>>;
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/hts/shared/hooks/useUpdateLocalStorage.tsx b/system-contract-dapp-playground/src/hooks/useUpdateLocalStorage.tsx
similarity index 90%
rename from system-contract-dapp-playground/src/components/contract-interaction/hts/shared/hooks/useUpdateLocalStorage.tsx
rename to system-contract-dapp-playground/src/hooks/useUpdateLocalStorage.tsx
index 9e63da544..2f898ecda 100644
--- a/system-contract-dapp-playground/src/components/contract-interaction/hts/shared/hooks/useUpdateLocalStorage.tsx
+++ b/system-contract-dapp-playground/src/hooks/useUpdateLocalStorage.tsx
@@ -19,11 +19,11 @@
  */
 
 import { useEffect } from 'react';
-import { TransactionResult } from '@/types/contract-interactions/HTS';
+import { ITransactionResult } from '@/types/contract-interactions/shared';
 
 /** @dev listen to change event on transactionResults state => load to localStorage */
 export const useUpdateTransactionResultsToLocalStorage = (
-  transactionResults: TransactionResult[],
+  transactionResults: ITransactionResult[],
   transactionResultStorageKey: string
 ) => {
   useEffect(() => {
diff --git a/system-contract-dapp-playground/src/components/contract-interaction/erc/shared/hooks/useUpdateMapStateUILocalStorage.tsx b/system-contract-dapp-playground/src/hooks/useUpdateMapStateUILocalStorage.tsx
similarity index 96%
rename from system-contract-dapp-playground/src/components/contract-interaction/erc/shared/hooks/useUpdateMapStateUILocalStorage.tsx
rename to system-contract-dapp-playground/src/hooks/useUpdateMapStateUILocalStorage.tsx
index 3df48a217..455aa08e7 100644
--- a/system-contract-dapp-playground/src/components/contract-interaction/erc/shared/hooks/useUpdateMapStateUILocalStorage.tsx
+++ b/system-contract-dapp-playground/src/hooks/useUpdateMapStateUILocalStorage.tsx
@@ -26,8 +26,8 @@ import { IoRefreshOutline } from 'react-icons/io5';
 import { CommonErrorToast } from '@/components/toast/CommonToast';
 import { erc721TokenApprove } from '@/api/hedera/erc721-interactions';
 import { HEDERA_COMMON_WALLET_REVERT_REASONS } from '@/utils/common/constants';
-import { copyContentToClipboard, handleRemoveRecord } from '../methods/common';
 import { Tr, Td, Popover, PopoverTrigger, PopoverContent, Tooltip } from '@chakra-ui/react';
+import { copyContentToClipboard, handleRemoveMapRecord } from '../components/common/methods/common';
 
 interface PageProps {
   toaster: any;
@@ -106,7 +106,7 @@ const useUpdateMapStateUILocalStorage = ({
                 <Tooltip label="delete this record" placement="top">
                   <button
                     onClick={() => {
-                      handleRemoveRecord(itTokenID, setMapValues, transactionResultStorageKey);
+                      handleRemoveMapRecord(itTokenID, setMapValues, transactionResultStorageKey);
                     }}
                     className={`border border-white/30 px-1 py-1 rounded-lg flex items-center justify-center cursor-pointer hover:bg-red-400 transition duration-300`}
                   >
@@ -158,7 +158,7 @@ const useUpdateMapStateUILocalStorage = ({
                 <Tooltip label="delete this record" placement="top">
                   <button
                     onClick={() => {
-                      handleRemoveRecord(account, setMapValues, transactionResultStorageKey);
+                      handleRemoveMapRecord(account, setMapValues, transactionResultStorageKey);
                     }}
                     className={`border border-white/30 px-1 py-1 rounded-lg flex items-center justify-center cursor-pointer hover:bg-red-400 transition duration-300`}
                   >
@@ -222,7 +222,7 @@ const useUpdateMapStateUILocalStorage = ({
                 <Tooltip label="delete this record" placement="top">
                   <button
                     onClick={() => {
-                      handleRemoveRecord(itTokenID, setMapValues, transactionResultStorageKey);
+                      handleRemoveMapRecord(itTokenID, setMapValues, transactionResultStorageKey);
                     }}
                     className={`border border-white/30 px-1 py-1 rounded-lg flex items-center justify-center cursor-pointer hover:bg-red-400 transition duration-300`}
                   >
@@ -310,7 +310,7 @@ const useUpdateMapStateUILocalStorage = ({
                 <Tooltip label="delete this record" placement="top">
                   <button
                     onClick={() => {
-                      handleRemoveRecord(itTokenID, setMapValues, transactionResultStorageKey);
+                      handleRemoveMapRecord(itTokenID, setMapValues, transactionResultStorageKey);
                     }}
                     className={`border border-white/30 px-1 py-1 rounded-lg flex items-center justify-center cursor-pointer hover:bg-red-400 transition duration-300`}
                   >
diff --git a/system-contract-dapp-playground/src/sections/activity/index.tsx b/system-contract-dapp-playground/src/sections/activity/index.tsx
index f564705de..3f84d2f78 100644
--- a/system-contract-dapp-playground/src/sections/activity/index.tsx
+++ b/system-contract-dapp-playground/src/sections/activity/index.tsx
@@ -25,13 +25,14 @@ import { motion } from 'framer-motion';
 import { AiOutlineMinus } from 'react-icons/ai';
 import { FiExternalLink } from 'react-icons/fi';
 import { useEffect, useMemo, useState } from 'react';
-import ConfirmModal from '@/components/common/ConfirmModal';
 import { prepareTransactionList } from '@/utils/common/helpers';
 import { MdNavigateBefore, MdNavigateNext } from 'react-icons/md';
 import { CommonErrorToast } from '@/components/toast/CommonToast';
-import { TransactionResult } from '@/types/contract-interactions/HTS';
+import { usePaginatedTxResults } from '@/hooks/usePaginatedTxResults';
+import ConfirmModal from '@/components/common/components/ConfirmModal';
+import { ITransactionResult } from '@/types/contract-interactions/shared';
+import { copyContentToClipboard } from '@/components/common/methods/common';
 import { clearCachedTransactions, getArrayTypedValuesFromLocalStorage } from '@/api/localStorage';
-import { usePaginatedTxResults } from '@/components/contract-interaction/hts/shared/hooks/usePaginatedTxResults';
 import {
   HEDERA_BRANDING_COLORS,
   HEDERA_CHAKRA_TABLE_VARIANTS,
@@ -86,7 +87,7 @@ const ActivitySection = () => {
   );
 
   /** @dev handle removing record */
-  const handleRemoveRecord = (targetTransactionResult: TransactionResult) => {
+  const handleRemoveRecord = (targetTransactionResult: ITransactionResult) => {
     // get the cached array stored in localStoraged
     const { storageResult, err: localStorageBalanceErr } = getArrayTypedValuesFromLocalStorage(
       targetTransactionResult.transactionResultStorageKey
@@ -104,7 +105,7 @@ const ActivitySection = () => {
 
     // remove record out of the storageResult array
     const filteredTransactionResults = storageResult.filter(
-      (transactionResult: TransactionResult) => transactionResult.txHash !== targetTransactionResult.txHash
+      (transactionResult: ITransactionResult) => transactionResult.txHash !== targetTransactionResult.txHash
     );
 
     // storage the filteredTransactionResults back to storage
@@ -240,7 +241,7 @@ const ActivitySection = () => {
                       {/* txHash */}
                       <Td className="cursor-pointer">
                         <div className="flex gap-1 items-center justify-between">
-                          <div onClick={() => navigator.clipboard.writeText(transaction.txHash)}>
+                          <div onClick={() => copyContentToClipboard(transaction.txHash)}>
                             <Popover>
                               <PopoverTrigger>
                                 <div className="flex gap-1 items-center">
diff --git a/system-contract-dapp-playground/src/sections/overview/index.tsx b/system-contract-dapp-playground/src/sections/overview/index.tsx
index 5926961a5..cc9e1d5de 100644
--- a/system-contract-dapp-playground/src/sections/overview/index.tsx
+++ b/system-contract-dapp-playground/src/sections/overview/index.tsx
@@ -22,7 +22,7 @@
 
 import Link from 'next/link';
 import { motion } from 'framer-motion';
-import { LEFT_SIDE_BAR_ITEMS } from '@/utils/common/constants';
+import { NAV_SIDE_BAR_ITEMS } from '@/utils/common/constants';
 
 const OverviewSection = () => {
   return (
@@ -107,7 +107,7 @@ const OverviewSection = () => {
           <div className="tracking-tight text-white/70">Here are the contracts exposed on this platform:</div>
 
           <div className="grid grid-rows-2 grid-cols-3 gap-x-6 gap-y-3">
-            {LEFT_SIDE_BAR_ITEMS.slice(1).map((item) => (
+            {NAV_SIDE_BAR_ITEMS.slice(1).map((item) => (
               <Link
                 key={item.name}
                 href={item.path}
diff --git a/system-contract-dapp-playground/src/types/common/index.d.ts b/system-contract-dapp-playground/src/types/common/index.d.ts
index c02180501..d4f483f22 100644
--- a/system-contract-dapp-playground/src/types/common/index.d.ts
+++ b/system-contract-dapp-playground/src/types/common/index.d.ts
@@ -23,12 +23,12 @@ import { BrowserProvider, Contract, ContractFactory } from 'ethers';
 /**
  * @dev a type for network name
  */
-type NetworkName = 'mainnet' | 'testnet' | 'previewnet' | 'localnet';
+type TNetworkName = 'mainnet' | 'testnet' | 'previewnet' | 'localnet';
 
 /**
  * @dev a type for contract names
  */
-type ContractName =
+type TContractName =
   | 'TokenCreateCustomContract'
   | 'TokenManagementContract'
   | 'ExchangeRatePrecompile'
@@ -50,7 +50,7 @@ type ContractName =
  *
  * @params err: any
  */
-interface WalletResult {
+interface IWalletResult {
   walletProvider?: BrowserProvider;
   accounts?: string[];
   currentChainId?: string;
@@ -65,7 +65,7 @@ interface WalletResult {
  *
  * @params err: any
  */
-interface EthersResult {
+interface IEthersResult {
   baseContract?: Contract;
   err?: any;
 }
@@ -77,7 +77,7 @@ interface EthersResult {
  *
  * @params err: any
  */
-interface MirrorNodeResult {
+interface IMirrorNodeResult {
   accountId?: string;
   contractId?: string;
   err?: any;
@@ -90,22 +90,22 @@ interface MirrorNodeResult {
  *
  * @params err: any
  */
-interface HederaSmartContractResult {
+interface IHederaSmartContractResult {
   contractAddress?: string;
   err?: any;
 }
 
 /**
- * @dev a type for solidity contract ABI
+ * @dev an interface for solidity contract ABI
  */
-type ContractABI = {
+interface IContractABI {
   anonymous?: boolean;
   inputs?: any;
   name?: string;
   outputs?: any;
   stateMutability?: string;
   type?: string;
-};
+}
 
 /**
  * @dev an interface for the Hedera contract assets
@@ -114,17 +114,17 @@ type ContractABI = {
  *
  * @params title: string
  *
- * @params contractABI: ContractABI[]
+ * @params contractABI: IContractABI[]
  *
  * @params contractBytecode: string
  *
  * @params githubUrl: string
  */
-interface HederaContractAsset {
-  name: ContractName;
+interface IHederaContractAsset {
+  name: TContractName;
   title: string;
   githubUrl: string;
   contractBytecode: string;
-  contractABI: ContractABI[];
+  contractABI: IContractABI[];
   methods: string[];
 }
diff --git a/system-contract-dapp-playground/src/types/contract-interactions/ExchangeRate/index.d.ts b/system-contract-dapp-playground/src/types/contract-interactions/ExchangeRate/index.d.ts
deleted file mode 100644
index 7106c51b1..000000000
--- a/system-contract-dapp-playground/src/types/contract-interactions/ExchangeRate/index.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-/*-
- *
- * Hedera Smart Contracts
- *
- * Copyright (C) 2023 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-/** @dev an interface for the results returned back from interacting with PRNG contract */
-interface ExchangeRateContractResult {
-  convertedAmount?: number;
-  transactionHash?: string;
-  err?: any;
-}
diff --git a/system-contract-dapp-playground/src/types/contract-interactions/HTS/index.d.ts b/system-contract-dapp-playground/src/types/contract-interactions/HTS/index.d.ts
index 35c358ea6..b623f127f 100644
--- a/system-contract-dapp-playground/src/types/contract-interactions/HTS/index.d.ts
+++ b/system-contract-dapp-playground/src/types/contract-interactions/HTS/index.d.ts
@@ -18,55 +18,6 @@
  *
  */
 
-/** @dev the type for HTS transaction results */
-export type TransactionResult = {
-  status: 'success' | 'fail';
-  txHash: string;
-  APICalled?: any;
-  tokenInfo?: any;
-  isToken?: boolean;
-  keyTypeCalled?: any;
-  recordIndex?: number;
-  tokenAddress?: string;
-  initialAmount?: string;
-  accountAddress?: string;
-  transactionType: string;
-  convertedAmount?: string;
-  receiverAddress?: string;
-  pseudoRandomSeed?: string;
-  tokenAddresses?: string[];
-  transactionTimeStamp: number;
-  sessionedContractAddress: string;
-  transactionResultStorageKey: string;
-};
-
-/** @dev an interface for the results returned back from interacting with Hedera System Smart Contracts */
-interface SmartContractExecutionResult {
-  Frozen?: any;
-  IsToken?: any;
-  Approved?: any;
-  TokenType?: any;
-  KycGranted?: any;
-  result?: boolean;
-  AllowanceValue?: any;
-  ApprovedAddress?: any;
-  tokenAddress?: string;
-  transactionHash?: string;
-  TokenDefaultKycStatus?: any;
-  TokenDefaultFreezeStatus?: any;
-  TokenInfo?: IHederaTokenServiceTokenInfo;
-  TokenKey?: IHederaTokenServiceKeyValueType;
-  TokenExpiryInfo?: IHederaTokenServiceExpiry;
-  FungibleTokenInfo?: IHederaTokenServiceFungibleTokenInfo;
-  NonFungibleTokenInfo?: IHederaTokenServiceNonFungibleTokenInfo;
-  TokenCustomFees?: {
-    fixedFees: IHederaTokenServiceFixedFee[];
-    royaltyFees: IHederaTokenServiceRoyaltyFee[];
-    fractionalFees: IHederaTokenServiceFractionalFee[];
-  };
-  err?: any;
-}
-
 /**
  * @dev a type for the IHederaTokenService.TokenKey.keyType
  *
@@ -104,7 +55,7 @@ type IHederaTokenServiceKeyValueType =
  *
  * @param err?: any
  */
-interface CommonKeyObject {
+interface ICommonKeyObject {
   keyType: IHederaTokenServiceKeyType;
   keyValueType: IHederaTokenServiceKeyValueType;
   keyValue: string | boolean;
diff --git a/system-contract-dapp-playground/src/types/contract-interactions/PRNG/index.d.ts b/system-contract-dapp-playground/src/types/contract-interactions/PRNG/index.d.ts
deleted file mode 100644
index eccbf3f3a..000000000
--- a/system-contract-dapp-playground/src/types/contract-interactions/PRNG/index.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-/*-
- *
- * Hedera Smart Contracts
- *
- * Copyright (C) 2023 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-/** @dev an interface for the results returned back from interacting with PRNG contract */
-interface PRNGContractResult {
-  pseudoRandomSeed?: string;
-  transactionHash?: string;
-  err?: any;
-}
diff --git a/system-contract-dapp-playground/src/types/contract-interactions/erc/index.d.ts b/system-contract-dapp-playground/src/types/contract-interactions/erc/index.d.ts
index 894a087b9..583fd4b68 100644
--- a/system-contract-dapp-playground/src/types/contract-interactions/erc/index.d.ts
+++ b/system-contract-dapp-playground/src/types/contract-interactions/erc/index.d.ts
@@ -21,7 +21,7 @@
 /**
  * @dev an interface for the results returned back from interacting with ERC20Mock & ERC721Mock smart contract
  */
-interface ERCSmartContractResult {
+interface IERCSmartContractResult {
   name?: string;
   symbol?: string;
   txHash?: string;
diff --git a/system-contract-dapp-playground/src/types/contract-interactions/shared/index.d.ts b/system-contract-dapp-playground/src/types/contract-interactions/shared/index.d.ts
new file mode 100644
index 000000000..cf14abd44
--- /dev/null
+++ b/system-contract-dapp-playground/src/types/contract-interactions/shared/index.d.ts
@@ -0,0 +1,70 @@
+/*-
+ *
+ * Hedera Smart Contracts
+ *
+ * Copyright (C) 2023 Hedera Hashgraph, LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+/** @dev the type for HTS transaction results */
+export type ITransactionResult = {
+  status: 'success' | 'fail';
+  txHash: string;
+  APICalled?: any;
+  tokenInfo?: any;
+  isToken?: boolean;
+  keyTypeCalled?: any;
+  recordIndex?: number;
+  tokenAddress?: string;
+  initialAmount?: string;
+  accountAddress?: string;
+  transactionType: string;
+  convertedAmount?: string;
+  receiverAddress?: string;
+  pseudoRandomSeed?: string;
+  tokenAddresses?: string[];
+  transactionResultStorageKey;
+  transactionTimeStamp: number;
+  sessionedContractAddress: string;
+};
+
+/** @dev an interface for the results returned back from interacting with Hedera System Smart Contracts */
+interface ISmartContractExecutionResult {
+  Frozen?: any;
+  IsToken?: any;
+  Approved?: any;
+  TokenType?: any;
+  KycGranted?: any;
+  result?: boolean;
+  AllowanceValue?: any;
+  ApprovedAddress?: any;
+  tokenAddress?: string;
+  convertedAmount?: number;
+  transactionHash?: string;
+  pseudoRandomSeed?: string;
+  TokenDefaultKycStatus?: any;
+  TokenDefaultFreezeStatus?: any;
+  TokenInfo?: IHederaTokenServiceTokenInfo;
+  TokenKey?: IHederaTokenServiceKeyValueType;
+  TokenExpiryInfo?: IHederaTokenServiceExpiry;
+  FungibleTokenInfo?: IHederaTokenServiceFungibleTokenInfo;
+  NonFungibleTokenInfo?: IHederaTokenServiceNonFungibleTokenInfo;
+  TokenCustomFees?: {
+    fixedFees: IHederaTokenServiceFixedFee[];
+    royaltyFees: IHederaTokenServiceRoyaltyFee[];
+    fractionalFees: IHederaTokenServiceFractionalFee[];
+  };
+  err?: any;
+}
diff --git a/system-contract-dapp-playground/src/utils/common/constants.ts b/system-contract-dapp-playground/src/utils/common/constants.ts
index 33ae1f54e..8703a98c5 100644
--- a/system-contract-dapp-playground/src/utils/common/constants.ts
+++ b/system-contract-dapp-playground/src/utils/common/constants.ts
@@ -18,7 +18,7 @@
  *
  */
 
-import { ContractName } from '@/types/common';
+import { TContractName } from '@/types/common';
 import ERC20Mock from '@hashgraph-smartcontract/artifacts/contracts/erc-20/ERC20Mock.sol/ERC20Mock.json';
 import IHRC729Contract from '@hashgraph-smartcontract/artifacts/contracts/hts-precompile/IHRC.sol/IHRC.json';
 import ERC721Mock from '@hashgraph-smartcontract/artifacts/contracts/erc-721/ERC721Mock.sol/ERC721Mock.json';
@@ -147,9 +147,9 @@ export const PROTECTED_ROUTES = [
 ];
 
 /**
- * @notice information for LeftSideBar items
+ * @notice information for NavSideBar items
  */
-export const LEFT_SIDE_BAR_ITEMS = [
+export const NAV_SIDE_BAR_ITEMS = [
   {
     name: 'Overview',
     path: PROTECTED_ROUTES[0],
@@ -183,7 +183,7 @@ export const LEFT_SIDE_BAR_ITEMS = [
 /**
  * @notice an object storing contract names
  */
-export const CONTRACT_NAMES: Record<string, ContractName> = {
+export const CONTRACT_NAMES: Record<string, TContractName> = {
   ERC20: 'ERC20Mock',
   ERC721: 'ERC721Mock',
   PRNG: 'PrngSystemContract',
@@ -201,7 +201,7 @@ export const CONTRACT_NAMES: Record<string, ContractName> = {
 export const HEDERA_SMART_CONTRACTS_ASSETS = {
   HTS_PRECOMPILED: [
     {
-      name: 'TokenCreateCustomContract' as ContractName,
+      name: 'TokenCreateCustomContract' as TContractName,
       title: 'Token Create Contract',
       contractABI: TokenCreateCustomContract.abi,
       contractBytecode: TokenCreateCustomContract.bytecode,
@@ -209,7 +209,7 @@ export const HEDERA_SMART_CONTRACTS_ASSETS = {
       methods: ['fungibleTokenCreate', 'non-fungibleTokenCreate', 'mint', 'tokenAssociation', 'grantKYC'],
     },
     {
-      name: 'TokenManagementContract' as ContractName,
+      name: 'TokenManagementContract' as TContractName,
       title: 'Token Management Contract',
       contractABI: TokenManagementContract.abi,
       contractBytecode: TokenManagementContract.bytecode,
@@ -224,7 +224,7 @@ export const HEDERA_SMART_CONTRACTS_ASSETS = {
       ],
     },
     {
-      name: 'TokenQueryContract' as ContractName,
+      name: 'TokenQueryContract' as TContractName,
       title: 'Token Query Contract',
       contractABI: TokenQueryContract.abi,
       contractBytecode: TokenQueryContract.bytecode,
@@ -232,7 +232,7 @@ export const HEDERA_SMART_CONTRACTS_ASSETS = {
       methods: ['tokenValidity', 'generalInfo', 'specificInfo', 'tokenPermission', 'tokenStatus'],
     },
     {
-      name: 'TokenTransferContract' as ContractName,
+      name: 'TokenTransferContract' as TContractName,
       title: 'Token Transfer Contract',
       contractABI: TokenTransferContract.abi,
       contractBytecode: TokenTransferContract.bytecode,
@@ -241,7 +241,7 @@ export const HEDERA_SMART_CONTRACTS_ASSETS = {
     },
   ],
   TOKEN_ASSOCIATION: {
-    name: 'IHRC729Contract' as ContractName,
+    name: 'IHRC729Contract' as TContractName,
     title: 'Token Associate Example Contract',
     contractABI: IHRC729Contract.abi,
     contractBytecode: IHRC729Contract.bytecode,
@@ -249,7 +249,7 @@ export const HEDERA_SMART_CONTRACTS_ASSETS = {
     methods: ['IHRC / HIP-719'],
   },
   EXCHANGE_RATE: {
-    name: 'ExchangeRatePrecompile' as ContractName,
+    name: 'ExchangeRatePrecompile' as TContractName,
     title: 'Exchange Rate Example Contract',
     contractABI: ExchangeRatePrecompile.abi,
     contractBytecode: ExchangeRatePrecompile.bytecode,
@@ -257,7 +257,7 @@ export const HEDERA_SMART_CONTRACTS_ASSETS = {
     methods: ['Exchange Rate'],
   },
   PRNG_PRECOMPILED: {
-    name: 'PrngSystemContract' as ContractName,
+    name: 'PrngSystemContract' as TContractName,
     title: 'Pseudo Random Number Example Contract',
     contractABI: PrngSystemContract.abi,
     contractBytecode: PrngSystemContract.bytecode,
@@ -265,7 +265,7 @@ export const HEDERA_SMART_CONTRACTS_ASSETS = {
     methods: ['getPseudoRandomSeed'],
   },
   ERC_20: {
-    name: 'ERC20Mock' as ContractName,
+    name: 'ERC20Mock' as TContractName,
     title: 'ERC-20 Example Contract',
     contractABI: ERC20Mock.abi,
     contractBytecode: ERC20Mock.bytecode,
@@ -273,7 +273,7 @@ export const HEDERA_SMART_CONTRACTS_ASSETS = {
     methods: ['tokenInformation', 'mint', 'balanceOf', 'tokenPermissions', 'transfer'],
   },
   ERC_721: {
-    name: 'ERC721Mock' as ContractName,
+    name: 'ERC721Mock' as TContractName,
     title: 'ERC-721 Example Contract',
     contractABI: ERC721Mock.abi,
     contractBytecode: ERC721Mock.bytecode,
@@ -332,7 +332,7 @@ export const HEDERA_SHARED_PARAM_INPUT_FIELDS = {
 /**
  * @notice a shared object maping contract name to storage key value
  */
-export const CONTRACT_NAME_TO_STORAGE_KEY_VALUE: Record<ContractName, string> = {
+export const CONTRACT_NAME_TO_STORAGE_KEY_VALUE: Record<TContractName, string> = {
   ERC20Mock: 'ERC-20',
   ERC721Mock: 'ERC-721',
   IHRC729Contract: 'IHRC719',
diff --git a/system-contract-dapp-playground/src/utils/common/helpers.ts b/system-contract-dapp-playground/src/utils/common/helpers.ts
index dc68afe0c..90613898a 100644
--- a/system-contract-dapp-playground/src/utils/common/helpers.ts
+++ b/system-contract-dapp-playground/src/utils/common/helpers.ts
@@ -19,10 +19,10 @@
  */
 
 import { ethers } from 'ethers';
-import { NetworkName } from '@/types/common';
+import { TNetworkName } from '@/types/common';
 import { getCurrentChainId } from '@/api/wallet';
 import { HEDERA_NETWORKS, PROTECTED_ROUTES } from './constants';
-import { TransactionResult } from '@/types/contract-interactions/HTS';
+import { ITransactionResult } from '@/types/contract-interactions/shared';
 
 /**
  * @dev validating if a route is protected
@@ -59,7 +59,7 @@ export const isCorrectHederaNetwork = async (walletProvider: ethers.BrowserProvi
  *
  * @returns string
  */
-export const chainIdToNetwork = (chainId: string): NetworkName => {
+export const chainIdToNetwork = (chainId: string): TNetworkName => {
   switch (chainId) {
     case '0x127':
       return 'mainnet';
@@ -109,11 +109,11 @@ export const generatedRandomUniqueKey = (byteLength: number) => {
 /*
  * @dev prepare a list of transaction in order from newest to oldest based on the timestamp when each transaction occurs
  *
- * @returns allTransactions: TransactionResult[]
+ * @returns allTransactions: ITransactionResult[]
  */
 export const prepareTransactionList = () => {
   // prepare
-  const transactions: TransactionResult[] = [];
+  const transactions: ITransactionResult[] = [];
 
   // loop through localStorage items
   if (typeof localStorage !== 'undefined') {
diff --git a/system-contract-dapp-playground/src/utils/contract-interactions/HTS/helpers.ts b/system-contract-dapp-playground/src/utils/contract-interactions/HTS/helpers.ts
index 12fca1df9..c2bb35955 100644
--- a/system-contract-dapp-playground/src/utils/contract-interactions/HTS/helpers.ts
+++ b/system-contract-dapp-playground/src/utils/contract-interactions/HTS/helpers.ts
@@ -29,20 +29,7 @@ import {
   TOKEN_INFO_ADVANCED_KEYS,
 } from './token-query/constant';
 import { isAddress } from 'ethers';
-import {
-  CommonKeyObject,
-  IHederaTokenServiceExpiry,
-  IHederaTokenServiceKeyType,
-  IHederaTokenServiceTokenKey,
-  IHederaTokenServiceFixedFee,
-  IHederaTokenServiceTokenInfo,
-  IHederaTokenServiceRoyaltyFee,
-  IHederaTokenServiceKeyValueType,
-  SmartContractExecutionResult,
-  IHederaTokenServiceFractionalFee,
-  IHederaTokenServiceFungibleTokenInfo,
-  IHederaTokenServiceNonFungibleTokenInfo,
-} from '@/types/contract-interactions/HTS';
+import { ISmartContractExecutionResult } from '@/types/contract-interactions/shared';
 import { KEY_TYPE_MAP, DEFAULT_IHTS_KEY_VALUE } from './token-create-custom/constant';
 
 /**
@@ -98,16 +85,16 @@ export const constructIHederaTokenKey = (
 };
 
 /**
- * @dev prepares a list of IHederaTokenService.TokenKey typed keys with a CommonKeyObject[] input
+ * @dev prepares a list of IHederaTokenService.TokenKey typed keys with a ICommonKeyObject[] input
  *
- * @param inputKeys: CommonKeyObject[]
+ * @param inputKeys: ICommonKeyObject[]
  *
  * @return IHederaTokenServiceTokenKey[]
  *
- * @return err: CommonKeyObject[]
+ * @return err: ICommonKeyObject[]
  */
-export const prepareHederaTokenKeyArray = (inputKeys: CommonKeyObject[]) => {
-  let constructingKeyError: CommonKeyObject[] = [];
+export const prepareHederaTokenKeyArray = (inputKeys: ICommonKeyObject[]) => {
+  let constructingKeyError: ICommonKeyObject[] = [];
   const hederaTokenKeys = inputKeys.map((inputKey) => {
     // construct IHederaTokenKey
     const hederaTokenKey = constructIHederaTokenKey(
@@ -147,7 +134,7 @@ export const prepareHederaTokenKeyArray = (inputKeys: CommonKeyObject[]) => {
 export const handleContractResponse = async (
   transactionResult: any,
   errMsg?: any
-): Promise<SmartContractExecutionResult> => {
+): Promise<ISmartContractExecutionResult> => {
   // return err if any
   if (errMsg) {
     console.error(errMsg);
@@ -178,7 +165,7 @@ export const handleContractResponseWithDynamicEventNames = async (
   transactionResult: any,
   eventMaps?: any,
   API?: any
-): Promise<SmartContractExecutionResult> => {
+): Promise<ISmartContractExecutionResult> => {
   // get transaction receipt
   const txReceipt = await transactionResult.wait();
 
diff --git a/system-contract-dapp-playground/src/utils/contract-interactions/HTS/token-create-custom/constant.ts b/system-contract-dapp-playground/src/utils/contract-interactions/HTS/token-create-custom/constant.ts
index b0481093c..fe8e72ae5 100644
--- a/system-contract-dapp-playground/src/utils/contract-interactions/HTS/token-create-custom/constant.ts
+++ b/system-contract-dapp-playground/src/utils/contract-interactions/HTS/token-create-custom/constant.ts
@@ -19,11 +19,6 @@
  */
 
 import { ethers } from 'ethers';
-import {
-  IHederaTokenServiceKeyType,
-  IHederaTokenServiceKeyValue,
-  IHederaTokenServiceKeyTypeBitValue,
-} from '@/types/contract-interactions/HTS';
 import { HEDERA_SHARED_PARAM_INPUT_FIELDS } from '@/utils/common/constants';
 
 /**
@@ -31,16 +26,15 @@ import { HEDERA_SHARED_PARAM_INPUT_FIELDS } from '@/utils/common/constants';
  *
  * @see https://github.com/hashgraph/hedera-smart-contracts/blob/main/contracts/hts-precompile/IHederaTokenService.sol#L128C22-L128C22
  */
-export const KEY_TYPE_MAP: Record<IHederaTokenServiceKeyType, IHederaTokenServiceKeyTypeBitValue> =
-  {
-    ADMIN: 1,
-    KYC: 2,
-    FREEZE: 4,
-    WIPE: 8,
-    SUPPLY: 16,
-    FEE: 32,
-    PAUSE: 64,
-  };
+export const KEY_TYPE_MAP: Record<IHederaTokenServiceKeyType, IHederaTokenServiceKeyTypeBitValue> = {
+  ADMIN: 1,
+  KYC: 2,
+  FREEZE: 4,
+  WIPE: 8,
+  SUPPLY: 16,
+  FEE: 32,
+  PAUSE: 64,
+};
 
 /**
  * @notice an object of the keyValue's default values which conform to IHederaTokenService.KeyValue
@@ -104,8 +98,7 @@ export const htsTokenCreateParamFields = {
     inputType: 'text',
     paramKey: 'treasury',
     inputPlaceholder: 'The token treasury account ID...',
-    explanation:
-      'represents the account will receive the specified initial supply or the newly minted NFTs',
+    explanation: 'represents the account will receive the specified initial supply or the newly minted NFTs',
   },
   feeTokenAddress: {
     ...HEDERA_SHARED_PARAM_INPUT_FIELDS,
diff --git a/system-contract-dapp-playground/src/utils/contract-interactions/HTS/token-management/constant.ts b/system-contract-dapp-playground/src/utils/contract-interactions/HTS/token-management/constant.ts
index ee2de0de5..f188ba87c 100644
--- a/system-contract-dapp-playground/src/utils/contract-interactions/HTS/token-management/constant.ts
+++ b/system-contract-dapp-playground/src/utils/contract-interactions/HTS/token-management/constant.ts
@@ -19,10 +19,6 @@
  */
 
 import { ethers } from 'ethers';
-import {
-  IHederaTokenServiceExpiry,
-  IHederaTokenServiceHederaToken,
-} from '@/types/contract-interactions/HTS';
 import { HEDERA_SHARED_PARAM_INPUT_FIELDS } from '@/utils/common/constants';
 
 /**
@@ -91,8 +87,7 @@ export const htsUpdateTokenInfoParamFields = {
     inputType: 'text',
     paramKey: 'treasury',
     inputPlaceholder: 'The token treasury account ID...',
-    explanation:
-      'represents the account will receive the specified initial supply or the newly minted NFTs',
+    explanation: 'represents the account will receive the specified initial supply or the newly minted NFTs',
   },
   tokenSupplyType: {
     paramKey: 'tokenSupplyType',