fix get account and network functions and move them into utils

packages/apps/tools/src/components/Common/Layout/index.tsx

@@ -15,6 +15,7 @@ import { kadenaConstants, Network } from '@/constants/kadena';
 import routes from '@/constants/routes';
 import { useLayoutContext } from '@/context';
 import { useWalletConnectClient } from '@/context/connect-wallet-context';
+import { getNetworks } from '@/utils/wallet';
 import classNames from 'classnames';
 import useTranslation from 'next-translate/useTranslation';
 import React, { type ReactNode, FC } from 'react';
@@ -44,20 +45,9 @@ export const Layout: FC<IProps> = ({ children }: IProps) => {
     },
   ];
 
-  const getNetworks = (): Network[] => {
-    if (!session) return ['mainnet01', 'testnet04'];
-
-    const result = new Set(
-      accounts
-        ?.map((account) => {
-          const [, network] = account.split(':');
-          return network;
-        })
-        ?.filter((network) => network !== 'development'),
-    );
-
-    return Array.from(result ?? []) as Network[];
-  };
+  const networks: Network[] = session
+    ? getNetworks(accounts)
+    : ['mainnet01', 'testnet04'];
 
   return (
     <div>
@@ -76,7 +66,7 @@ export const Layout: FC<IProps> = ({ children }: IProps) => {
                   }
                   icon={SystemIcon.Link}
                 >
-                  {getNetworks().map((network) => (
+                  {networks.map((network) => (
                     <Option key={network} value={network}>
                       {kadenaConstants?.[network].label}
                     </Option>

packages/apps/tools/src/components/Global/AccountNameField/index.tsx

@@ -14,6 +14,7 @@ import { accountInputWrapperStyle } from './styles.css';
 
 import { useWalletConnectClient } from '@/context/connect-wallet-context';
 import { useDidUpdateEffect } from '@/hooks';
+import { getAccounts } from '@/utils/wallet';
 import useTranslation from 'next-translate/useTranslation';
 import React, { ChangeEvent, FC, useState } from 'react';
 import { FieldError } from 'react-hook-form';
@@ -57,23 +58,6 @@ export const AccountNameField: FC<IAccountNameFieldProps> = ({
     else setMode('input');
   }, [session, accounts]);
 
-  const getAccounts = (): string[] => {
-    // eslint-disable-next-line @rushstack/security/no-unsafe-regexp
-    const regex = new RegExp(`kadena\:${selectedNetwork}.*`);
-    const result = new Set(
-      accounts
-        ?.filter((account) => {
-          if (account.match(regex)) return account;
-        })
-        ?.map((account) => {
-          const [, , accountName] = account.split(':');
-          return accountName;
-        }),
-    );
-
-    return Array.from(result) ?? [];
-  };
-
   const lookup = {
     select: (
       <Select
@@ -88,7 +72,7 @@ export const AccountNameField: FC<IAccountNameFieldProps> = ({
         id={elementId}
       >
         <Option value={''}>{t('Select Account')}</Option>
-        {getAccounts().map((account) => (
+        {getAccounts(accounts, selectedNetwork).map((account) => (
           <Option key={account} value={account}>
             {account.slice(0, 4)}****{account.slice(-4)}
           </Option>

packages/apps/tools/src/utils/wallet.ts

@@ -0,0 +1,24 @@
+import { Network } from '@/constants/kadena';
+
+export const getNetworks = (accounts: string[] = []): Network[] =>
+  Array.from(
+    new Set(
+      accounts
+        ?.map((account) => account.split(':')[1])
+        ?.filter((network) => network !== 'development'),
+    ),
+  ) as Network[];
+
+export const getAccounts = (
+  accounts: string[] = [],
+  selectedNetwork?: string,
+): string[] =>
+  Array.from(
+    new Set(
+      accounts
+        ?.filter((account: string): boolean =>
+          account.includes(`kadena:${selectedNetwork}`),
+        )
+        ?.map((account) => account.split(':')[2]),
+    ),
+  );