From 2fb1386d6ebdd4dda0b68f709f720d0ad46e88a1 Mon Sep 17 00:00:00 2001
From: Bruno Souza <brnosouza@gmail.com>
Date: Tue, 31 Oct 2023 10:40:57 -0300
Subject: [PATCH 01/10] Move from vuex to pinia

---
 .eslintrc.js                                  |  12 +
 package.json                                  |   6 +-
 src/components/AccountCard.vue                |  33 +-
 src/components/Header.vue                     |  13 +-
 src/components/LoginHandler.vue               |  10 +-
 src/components/LoginHandlerDropdown.vue       |  13 +-
 src/components/MapData.vue                    |  10 +-
 src/components/SendDialog.vue                 |  20 +-
 src/components/ViewTransanction.vue           |  12 +-
 src/components/WalletModal.vue                |   8 +-
 src/components/WorldMap.vue                   |  10 +-
 src/components/contract/ContractActions.vue   |  28 +-
 src/components/contract/ContractTables.vue    |  14 +-
 src/components/contract/ContractTabs.vue      |   6 +-
 src/components/resources/BuyRam.vue           |  14 +-
 src/components/resources/RefundTab.vue        |  22 +-
 src/components/resources/ResourcesInfo.vue    |  19 +-
 src/components/resources/SellRam.vue          |  27 +-
 src/components/resources/StakeTab.vue         |  28 +-
 src/components/resources/UnstakeTab.vue       |  46 +-
 src/components/staking/HistoryTab.vue         |   8 +-
 src/components/staking/ProcessingTab.vue      |  15 +-
 src/components/staking/SavingsTab.vue         |  36 +-
 src/components/staking/StakeFromResources.vue |  30 +-
 src/components/staking/StakingDialog.vue      |  27 +-
 src/components/staking/StakingInfo.vue        |  19 +-
 src/components/staking/StakingTab.vue         |  28 +-
 src/components/staking/UnstakingTab.vue       |  24 +-
 src/components/transaction/TraceTree.vue      |  28 +-
 .../transaction/TransactionCard.vue           |  22 +-
 src/components/validators/ValidatorData.vue   |  20 +-
 .../validators/ValidatorDataTable.vue         |  22 +-
 src/pages/Account.vue                         |   6 +-
 src/pages/Block.vue                           |   4 +-
 src/pages/Network.vue                         |   6 +-
 src/pages/Proposal.vue                        |   8 +-
 src/pages/ProposalItem.vue                    |  10 +-
 src/pages/ProposalNew.vue                     |  12 +-
 src/pages/TransactionPage.vue                 |  14 +-
 src/pages/Vote.vue                            |  21 +-
 src/router/index.ts                           |   2 +-
 src/store/account/actions.ts                  | 645 --------------
 src/store/account/getters.ts                  |  23 -
 src/store/account/index.ts                    |  14 -
 src/store/account/mutations.ts                |  77 --
 src/store/account/state.ts                    |  86 --
 src/store/antelope.store.ts                   |  49 --
 src/store/chain/actions.ts                    |  99 ---
 src/store/chain/getters.ts                    |  10 -
 src/store/chain/index.ts                      |  14 -
 src/store/chain/mutations.ts                  |  36 -
 src/store/chain/state.ts                      |  29 -
 src/store/contract/actions.ts                 |  14 -
 src/store/contract/getters.ts                 |   9 -
 src/store/contract/index.ts                   |  14 -
 src/store/contract/mutations.ts               |  11 -
 src/store/contract/state.ts                   |  11 -
 src/store/index.ts                            |  68 --
 src/store/resources/actions.ts                | 228 -----
 src/store/resources/getters.ts                |  48 -
 src/store/resources/index.ts                  |  18 -
 src/store/resources/mutations.ts              |  43 -
 src/store/resources/state.ts                  |  30 -
 src/store/transaction/actions.ts              |  18 -
 src/store/transaction/getters.ts              |  13 -
 src/store/transaction/index.ts                |  14 -
 src/store/transaction/mutations.ts            |  50 --
 src/store/transaction/state.ts                |  31 -
 src/stores/account.ts                         | 832 ++++++++++++++++++
 src/stores/chain.ts                           | 162 ++++
 src/stores/contract.ts                        |  37 +
 src/stores/index.ts                           |  38 +
 src/stores/resources.ts                       | 316 +++++++
 src/{store => stores}/store-flag.d.ts         |   0
 src/stores/transaction.ts                     | 101 +++
 src/types/Actions.ts                          |   8 +-
 .../__tests__/store/account/actions.spec.ts   |  30 +-
 .../__tests__/store/antelope.store.spec.ts    | 160 ----
 .../__tests__/store/resources/actions.spec.ts |   6 +-
 yarn.lock                                     |  55 +-
 80 files changed, 1926 insertions(+), 2234 deletions(-)
 delete mode 100644 src/store/account/actions.ts
 delete mode 100644 src/store/account/getters.ts
 delete mode 100644 src/store/account/index.ts
 delete mode 100644 src/store/account/mutations.ts
 delete mode 100644 src/store/account/state.ts
 delete mode 100644 src/store/antelope.store.ts
 delete mode 100644 src/store/chain/actions.ts
 delete mode 100644 src/store/chain/getters.ts
 delete mode 100644 src/store/chain/index.ts
 delete mode 100644 src/store/chain/mutations.ts
 delete mode 100644 src/store/chain/state.ts
 delete mode 100644 src/store/contract/actions.ts
 delete mode 100644 src/store/contract/getters.ts
 delete mode 100644 src/store/contract/index.ts
 delete mode 100644 src/store/contract/mutations.ts
 delete mode 100644 src/store/contract/state.ts
 delete mode 100644 src/store/index.ts
 delete mode 100644 src/store/resources/actions.ts
 delete mode 100644 src/store/resources/getters.ts
 delete mode 100644 src/store/resources/index.ts
 delete mode 100644 src/store/resources/mutations.ts
 delete mode 100644 src/store/resources/state.ts
 delete mode 100644 src/store/transaction/actions.ts
 delete mode 100644 src/store/transaction/getters.ts
 delete mode 100644 src/store/transaction/index.ts
 delete mode 100644 src/store/transaction/mutations.ts
 delete mode 100644 src/store/transaction/state.ts
 create mode 100644 src/stores/account.ts
 create mode 100644 src/stores/chain.ts
 create mode 100644 src/stores/contract.ts
 create mode 100644 src/stores/index.ts
 create mode 100644 src/stores/resources.ts
 rename src/{store => stores}/store-flag.d.ts (100%)
 create mode 100644 src/stores/transaction.ts
 delete mode 100644 test/jest/__tests__/store/antelope.store.spec.ts

diff --git a/.eslintrc.js b/.eslintrc.js
index 95190bd1..9df31e3e 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -46,6 +46,7 @@ module.exports = {
         // https://eslint.vuejs.org/user-guide/#why-doesn-t-it-work-on-vue-file
         // required to lint *.vue files
         'vue',
+        'unused-imports',
     ],
 
     globals: {
@@ -145,5 +146,16 @@ module.exports = {
         'vue/component-options-name-casing': ['error', 'PascalCase'],
         'vue/component-definition-name-casing': ['error', 'PascalCase'],
         'vue/component-name-in-template-casing': ['error', 'PascalCase'],
+        'no-unused-vars': 'off',
+        'unused-imports/no-unused-imports': 'error',
+        'unused-imports/no-unused-vars': [
+            'warn',
+            {
+                'vars': 'all',
+                'varsIgnorePattern': '^_',
+                'args': 'after-used',
+                'argsIgnorePattern': '^_'
+            }
+        ],
     }
 }
diff --git a/package.json b/package.json
index d4658e1d..5718525c 100644
--- a/package.json
+++ b/package.json
@@ -24,6 +24,8 @@
     "highcharts-vue": "^1.4.0",
     "moment": "^2.29.4",
     "ol": "^6.14.1",
+    "pinia": "^2.1.6",
+    "pm2": "^5.3.0",
     "quasar": "^2.6.2",
     "ual-anchor": "1.3.0",
     "universal-authenticator-library": "^0.3.0",
@@ -31,8 +33,7 @@
     "vue-class-component": "^7.2.6",
     "vue-json-viewer": "^3.0.4",
     "vue-router": "^4.0.0",
-    "vue3-openlayers": "^0.1.63",
-    "vuex": "^4.0.1"
+    "vue3-openlayers": "^0.1.63"
   },
   "devDependencies": {
     "@babel/eslint-parser": "^7.13.14",
@@ -45,6 +46,7 @@
     "dotenv": "^14.3.0",
     "eslint": "^7.14.0",
     "eslint-plugin-jest": "^25.2.2",
+    "eslint-plugin-unused-imports": "^3.0.0",
     "eslint-plugin-vue": "^9.0.0",
     "node-polyfill-webpack-plugin": "^1.1.4",
     "vue-property-decorator": "^9.1.2"
diff --git a/src/components/AccountCard.vue b/src/components/AccountCard.vue
index 87ec9bd6..003acf99 100644
--- a/src/components/AccountCard.vue
+++ b/src/components/AccountCard.vue
@@ -1,14 +1,12 @@
 <script lang="ts">
 import { Token, GetTableRowsParams, RexbalRows, RexPoolRows } from 'src/types';
 import { defineComponent, computed, ref, onMounted, watch } from 'vue';
-import { useAntelopeStore } from 'src/store/antelope.store';
 import PercentCircle from 'src/components/PercentCircle.vue';
 import SendDialog from 'src/components/SendDialog.vue';
 import ResourcesDialog from 'src/components/resources/ResourcesDialog.vue';
 import StakingDialog from 'src/components/staking/StakingDialog.vue';
 import DateField from 'src/components/DateField.vue';
-import { date, useQuasar } from 'quasar';
-import { copyToClipboard } from 'quasar';
+import { date, useQuasar, copyToClipboard } from 'quasar';
 import { getChain } from 'src/config/ConfigManager';
 import { api } from 'src/api';
 import { useRouter } from 'vue-router';
@@ -17,6 +15,9 @@ import { API, UInt64 } from '@greymass/eosio';
 import { formatCurrency } from 'src/utils/string-utils';
 import ConfigManager from 'src/config/ConfigManager';
 import { isSystemAccount } from 'src/utils/systemAccount';
+import { useResourceStore } from 'src/stores/resources';
+import { useChainStore } from 'src/stores/chain';
+import { useAccountStore } from 'src/stores/account';
 
 const chain = getChain();
 export default defineComponent({
@@ -37,7 +38,9 @@ export default defineComponent({
     setup(props) {
         const $q = useQuasar();
         const router = useRouter();
-        const store = useAntelopeStore();
+        const resourceStore = useResourceStore();
+        const chainStore = useChainStore();
+        const accountStore = useAccountStore();
 
         const accountPageSettings = computed(() => ConfigManager.get().getCurrentChain().getUiCustomization().accountPageSettings);
 
@@ -55,9 +58,7 @@ export default defineComponent({
         const ramUnit = ref<string>('kb');
         const resources = ref<number>(0);
         const delegatedByOthers = ref<number>(0.0);
-        const delegatedToOthers = computed(
-            (): number => store.resources.getDelegatedToOthersAggregated(),
-        );
+        const delegatedToOthers = computed(() => resourceStore.getDelegatedToOthersAggregated);
         const rexStaked = ref<number>(0);
         const rexProfits = ref<number>(0);
         const rexDeposits = ref<number>(0);
@@ -93,7 +94,7 @@ export default defineComponent({
 
         const staked = computed((): number => stakedRefund.value + stakedNET.value + stakedCPU.value);
 
-        const token = computed((): Token => store.state.chain.token);
+        const token = computed((): Token => chainStore.token);
 
         const liquidNative = computed((): number => accountData.value?.core_liquid_balance?.value
             ? accountData.value.core_liquid_balance.value
@@ -118,14 +119,14 @@ export default defineComponent({
             return result;
         });
 
-        const isAccount = computed((): boolean => store.state.account.accountName === props.account);
+        const isAccount = computed((): boolean => accountStore.accountName === props.account);
 
         const createTimeFormat = computed((): string =>
             date.formatDate(createTime.value, 'DD MMMM YYYY @ hh:mm A'),
         );
 
         const setToken = (value: Token) => {
-            void store.commit('chain/setToken', value);
+            void chainStore.setToken(value);
         };
 
         const loadAccountData = async (): Promise<void> => {
@@ -258,8 +259,7 @@ export default defineComponent({
             }
         };
 
-        const updateResources = (payload: {account:string, force: boolean}) =>
-            store.resources.updateResources(payload);
+        const updateResources = (payload: {account:string, force: boolean}) => resourceStore.updateResources(payload);
 
         const getRexFund = async () => {
             const paramsrexfund = {
@@ -393,11 +393,11 @@ export default defineComponent({
         onMounted(async () => {
             usdPrice.value = await chain.getUsdPrice();
             await loadAccountData();
-            await store.dispatch('account/updateRexData', {
+            await accountStore.updateRexData({
                 account: props.account,
             });
             loadSystemToken();
-            void store.dispatch('chain/updateRamPrice');
+            void chainStore.updateRamPrice();
         });
 
         watch(
@@ -405,14 +405,13 @@ export default defineComponent({
             async () => {
                 resetBalances();
                 await loadAccountData();
-                await store.dispatch('account/updateRexData', {
+                await accountStore.updateRexData({
                     account: props.account,
                 });
             },
         );
-
         watch(
-            () => store.resources.getDelegatedToOthersAggregated(),
+            () => resourceStore.getDelegatedToOthersAggregated(),
             () => {
                 setTotalBalance();
             },
diff --git a/src/components/Header.vue b/src/components/Header.vue
index 923895a4..35657905 100644
--- a/src/components/Header.vue
+++ b/src/components/Header.vue
@@ -5,9 +5,10 @@ import LoginHandler from 'components/LoginHandler.vue';
 import HeaderSearch from 'components/HeaderSearch.vue';
 import ChainsMenu from 'components/ChainsMenu.vue';
 import ConfigManager, { getChain } from 'src/config/ConfigManager';
-import { useStore } from 'src/store';
 import { useRouteDataNetwork } from 'src/router';
 import { HeaderSettings } from 'src/types/UiCustomization';
+import { useAccountStore } from 'src/stores/account';
+import { useChainStore } from 'src/stores/chain';
 
 export default defineComponent({
     name: 'AppHeader',
@@ -18,12 +19,14 @@ export default defineComponent({
     },
     setup() {
         const $q = useQuasar();
-        const store = useStore();
-        const headerSettings = computed(() : HeaderSettings => ConfigManager.get().getCurrentChain().getUiCustomization().headerSettings);
+        const accountStore = useAccountStore();
+        const chainStore = useChainStore();
+        const headerSettings = computed((): HeaderSettings => ConfigManager.get().getCurrentChain().getUiCustomization().headerSettings);
 
-        const account = computed(() => store.state.account.accountName);
-        const isLarge = computed((): boolean => $q.screen.gt.sm);
+        const account = computed(() => accountStore.accountName);
+        const isLarge = computed((): boolean => $q.screen.gt.md);
         const showMultichainSelector = computed(() => process.env.SHOW_MULTICHAIN_SELECTOR === 'true');
+        const headBlock = computed((): number => store.state.chain.head_block_num);
 
         const isTestnet = ref(getChain().isTestnet());
         const smallLogoPath = ref(getChain().getSmallLogoPath());
diff --git a/src/components/LoginHandler.vue b/src/components/LoginHandler.vue
index 7eb2d404..d572f959 100644
--- a/src/components/LoginHandler.vue
+++ b/src/components/LoginHandler.vue
@@ -3,30 +3,30 @@ import { defineComponent, ref, onMounted, computed } from 'vue';
 import LoginHandlerDropdown from 'src/components/LoginHandlerDropdown.vue';
 import WalletModal from 'src/components/WalletModal.vue';
 import { Authenticator } from 'universal-authenticator-library';
-import { useStore } from 'src/store';
 import { getAuthenticators } from 'src/boot/ual';
 import { getChain } from 'src/config/ConfigManager';
+import { useAccountStore } from 'src/stores/account';
 
 export default defineComponent({
     name: 'LoginHandler',
     components: { LoginHandlerDropdown, WalletModal },
     setup() {
         const authenticators = getAuthenticators();
-        const store = useStore();
+        const accountStore = useAccountStore();
 
         const showDropdown = ref(false);
         const showModal = ref(false);
-        const account = computed(() => store.state.account.accountName);
+        const account = computed(() => accountStore.accountName);
 
         onMounted(() => {
             const storedAccount = localStorage.getItem('account_' + getChain().getChainId());
             if (storedAccount) {
-                void store.commit('account/setAccountName', storedAccount);
+                void accountStore.setAccountName(storedAccount);
                 const ualName = localStorage.getItem('autoLogin_' + getChain().getChainId());
                 const ual: Authenticator = authenticators.find(
                     a => a.getName() === ualName,
                 );
-                void store.dispatch('account/login', {
+                void accountStore.login({
                     account: storedAccount,
                     authenticator: ual,
                 });
diff --git a/src/components/LoginHandlerDropdown.vue b/src/components/LoginHandlerDropdown.vue
index 4c57c235..ef6ef6f3 100644
--- a/src/components/LoginHandlerDropdown.vue
+++ b/src/components/LoginHandlerDropdown.vue
@@ -1,26 +1,25 @@
 <script lang="ts">
-import { defineComponent, ref, computed } from 'vue';
+import { computed, defineComponent, ref } from 'vue';
 import WalletModal from 'src/components/WalletModal.vue';
-import { useStore } from 'src/store';
 import { getAuthenticators } from 'src/boot/ual';
 import { Authenticator } from 'universal-authenticator-library';
 import { getChain } from 'src/config/ConfigManager';
+import { useAccountStore } from 'src/stores/account';
 
 export default defineComponent({
     name: 'LoginHandlerDropdown',
     components: { WalletModal },
     setup() {
         const authenticators = getAuthenticators();
-        const store = useStore();
-        const account = computed(() => store.state.account.accountName);
+        const accountStore = useAccountStore();
+        const account = computed(() => accountStore.accountName);
         const showModal = ref(false);
 
         const getAuthenticator = (): Authenticator => {
             const wallet = localStorage.getItem('autoLogin_' + getChain().getChainId());
-            const authenticator = authenticators.find(
+            return authenticators.find(
                 auth => auth.getName() === wallet,
             );
-            return authenticator;
         };
 
         const onLogout = async (): Promise<void> => {
@@ -35,7 +34,7 @@ export default defineComponent({
         };
 
         const clearAccount = (): void => {
-            void store.dispatch('account/logout');
+            void accountStore.logout();
         };
         return {
             account,
diff --git a/src/components/MapData.vue b/src/components/MapData.vue
index a98e7e9f..68bcec2b 100644
--- a/src/components/MapData.vue
+++ b/src/components/MapData.vue
@@ -1,6 +1,6 @@
 <script lang="ts">
 import { defineComponent, computed } from 'vue';
-import { useStore } from 'src/store';
+import { useChainStore } from 'src/stores/chain';
 
 export default defineComponent({
     name: 'MapData',
@@ -11,13 +11,13 @@ export default defineComponent({
         },
     },
     setup() {
-        const store = useStore();
+        const chainStore = useChainStore();
         const HeadBlockProducer = computed(
-            (): string => store.state.chain.head_block_producer,
+            (): string => chainStore.head_block_producer,
         );
-        const HeadBlock = computed((): number => store.state.chain.head_block_num);
+        const HeadBlock = computed((): number => chainStore.head_block_num);
         const lastIrreversibleBlock = computed(
-            (): number => store.state.chain.last_irreversible_block_num,
+            (): number => chainStore.last_irreversible_block_num,
         );
 
         return {
diff --git a/src/components/SendDialog.vue b/src/components/SendDialog.vue
index f3b9c337..77a4147d 100644
--- a/src/components/SendDialog.vue
+++ b/src/components/SendDialog.vue
@@ -4,8 +4,8 @@ import CoinSelectorDialog from 'src/components/CoinSelectorDialog.vue';
 import { Token } from 'src/types';
 import { isValidAccount } from 'src/utils/string-utils';
 import { getChain } from 'src/config/ConfigManager';
-import { useStore } from 'src/store';
 import { useRouter } from 'vue-router';
+import { useAccountStore } from 'src/stores/account';
 
 const chain = getChain();
 
@@ -22,7 +22,7 @@ export default defineComponent({
     },
     emits: ['update-token-balances'],
     setup(props, context) {
-        const store = useStore();
+        const accountStore = useAccountStore();
         const router = useRouter();
         const sendToken = ref<Token>(chain.getSystemToken());
         const availableTokens = toRef(props, 'availableTokens');
@@ -32,12 +32,12 @@ export default defineComponent({
         const sendAmount = ref<string>('');
         const memo = ref<string>('');
 
-        const account = computed(() => store.state.account.accountName);
+        const account = computed(() => accountStore.accountName);
         const transactionId = computed(
-            (): string => store.state.account.TransactionId,
+            (): string => accountStore.TransactionId,
         );
         const transactionError = computed(
-            () => store.state.account.TransactionError,
+            () => accountStore.TransactionError,
         );
         const transactionForm = computed(
             () => !(transactionError.value || transactionId.value),
@@ -48,7 +48,7 @@ export default defineComponent({
         );
 
         const sendTransaction = async (): Promise<void> => {
-            void store.dispatch('account/resetTransaction');
+            void accountStore.resetTransaction();
             const actionAccount = sendToken.value?.contract;
             const data = {
                 from: account.value,
@@ -56,17 +56,17 @@ export default defineComponent({
                 quantity: `${sendAmount.value} ${sendToken.value?.symbol}`,
                 memo: memo.value,
             };
-            await store.dispatch('account/sendAction', {
+            await accountStore.sendAction({
                 account: actionAccount,
                 data,
                 name: 'transfer',
             });
-            void store.dispatch('account/loadAccountData');
+            void accountStore.loadAccountData();
             context.emit('update-token-balances');
         };
 
         const setDefaults = () => {
-            void store.dispatch('account/resetTransaction');
+            void accountStore.resetTransaction();
             if (availableTokens.value.length > 0) {
                 sendToken.value = availableTokens.value.find(token => (
                     token.symbol === sendToken.value?.symbol &&
@@ -94,7 +94,7 @@ export default defineComponent({
                 params: { transaction: transactionId.value },
             });
             router.go(0);
-            void store.dispatch('account/resetTransaction');
+            void accountStore.resetTransaction();
         };
 
         const formatDec = () => {
diff --git a/src/components/ViewTransanction.vue b/src/components/ViewTransanction.vue
index aece336b..b94c3cdf 100644
--- a/src/components/ViewTransanction.vue
+++ b/src/components/ViewTransanction.vue
@@ -1,7 +1,7 @@
 <script lang="ts">
 import { defineComponent, computed } from 'vue';
-import { useStore } from 'src/store';
 import { useRouter } from 'vue-router';
+import { useAccountStore } from 'src/stores/account';
 
 export default defineComponent({
     name: 'ViewTransaction',
@@ -12,14 +12,14 @@ export default defineComponent({
         },
     },
     setup(props) {
-        const store = useStore();
+        const accountStore = useAccountStore();
         const router = useRouter();
         const msg = computed((): string => props.message);
-        const Id = computed(() => store.state.account.TransactionId);
-        const transactionE = computed(() => store.state.account.TransactionError);
+        const Id = computed(() => accountStore.TransactionId);
+        const transactionE = computed(() => accountStore.TransactionError);
 
         const reset = () => {
-            void store.dispatch('account/resetTransaction');
+            void accountStore.resetTransaction();
         };
 
         const navToTransaction = async () => {
@@ -28,7 +28,7 @@ export default defineComponent({
                 params: { transaction: Id.value },
             });
             router.go(0);
-            void store.dispatch('account/resetTransaction');
+            void accountStore.resetTransaction();
         };
 
         return {
diff --git a/src/components/WalletModal.vue b/src/components/WalletModal.vue
index e90bb71d..0d637113 100644
--- a/src/components/WalletModal.vue
+++ b/src/components/WalletModal.vue
@@ -2,8 +2,8 @@
 import { computed, defineComponent, ref } from 'vue';
 import { DialogChainObject } from 'quasar';
 import { getAuthenticators } from 'src/boot/ual';
-import { useStore } from 'src/store';
 import { useQuasar } from 'quasar';
+import { useAccountStore } from 'src/stores/account';
 
 
 export default defineComponent({
@@ -11,9 +11,9 @@ export default defineComponent({
     setup() {
         const authenticators = getAuthenticators();
         const $q = useQuasar();
-        const store = useStore();
+        const store = useAccountStore();
         const error = ref<string>(null);
-        const account = computed(() => store.state.account.accountName);
+        const account = computed(() => store.accountName);
         const loading = {};
         const walletDialog = ref<DialogChainObject>(null);
         const iconSize = computed(() => {
@@ -27,7 +27,7 @@ export default defineComponent({
             const authenticator = authenticators[idx];
             error.value = null;
             try {
-                await store.dispatch('account/login', {
+                await store.login({
                     account: account.value,
                     authenticator,
                 });
diff --git a/src/components/WorldMap.vue b/src/components/WorldMap.vue
index 68537674..dfe53f38 100644
--- a/src/components/WorldMap.vue
+++ b/src/components/WorldMap.vue
@@ -18,9 +18,9 @@ import { getVectorContext } from 'ol/render';
 import { unByKey } from 'ol/Observable';
 import { mapActions } from 'vuex';
 import { BP } from 'src/types';
-import { useStore } from 'src/store';
 import VectorImageLayer from 'ol/layer/VectorImage';
 import { getCssVar } from 'quasar';
+import { useChainStore } from 'src/stores/chain';
 
 export default defineComponent({
     name: 'WorldMap',
@@ -29,18 +29,18 @@ export default defineComponent({
         View
     },
     setup() {
-        const store = useStore();
+        const chainStore = useChainStore();
         const center = ref([40, 40]);
         const projection = ref('EPSG:4326');
         const zoom = ref(8);
         const rotation = ref(0);
         const producerToggle = ref<boolean>(Boolean(Number(localStorage.getItem('mapBP-toggle'))));
-        const BPlist = computed((): BP[] => store.state.chain.bpList);
+        const BPlist = computed((): BP[] => chainStore.bpList);
         const schedule = computed(
-            (): string[] => store.state.chain.producerSchedule
+            (): string[] => chainStore.producerSchedule
         );
         const HeadProducer = computed(
-            (): string => store.state.chain.head_block_producer
+            (): string => chainStore.head_block_producer
         );
         const currentHeadProducer = ref<string>('');
         function updateToggleOption(val: boolean) {
diff --git a/src/components/contract/ContractActions.vue b/src/components/contract/ContractActions.vue
index 010ddd44..035cd064 100644
--- a/src/components/contract/ContractActions.vue
+++ b/src/components/contract/ContractActions.vue
@@ -1,7 +1,7 @@
 <script lang="ts">
 import { defineComponent, ref, computed, onMounted, watch } from 'vue';
-import { useStore } from 'src/store';
 import ViewTransaction from 'src/components/ViewTransanction.vue';
+import { useAccountStore } from 'src/stores/account';
 
 export default defineComponent({
     name: 'ContractActions',
@@ -9,23 +9,23 @@ export default defineComponent({
     setup() {
         const memo = ref<Record<string, unknown>>({});
         const permission = ref<string>('');
-        const store = useStore();
+        const accountStore = useAccountStore();
         const actor = ref('');
         const openTransaction = ref<boolean>(false);
-        const transactionId = ref<string>(store.state.account.TransactionId);
-        const transactionError = ref<unknown>(store.state.account.TransactionError);
+        const transactionId = ref<string>(accountStore.TransactionId);
+        const transactionError = ref<unknown>(accountStore.TransactionError);
         const actions = computed(() =>
-            store.state.account.abi.abi.actions.map(a => a.name),
+            accountStore.abi.abi.actions.map(a => a.name),
         );
         const action = ref<string>(actions.value[0]);
         const fields = computed(
             () =>
-                store.state.account.abi.abi.structs.find(s => s.name === action.value)
+                accountStore.abi.abi.structs.find(s => s.name === action.value)
                     .fields,
         );
 
         async function signAction() {
-            await store.dispatch('account/sendAction', {
+            await accountStore.sendAction({
                 name: action.value,
                 actor: actor.value,
                 permission: permission.value,
@@ -38,17 +38,11 @@ export default defineComponent({
             for (let key in memo.value) {
                 const field = fields.value.find(val => val.name === key);
                 if (field.type === 'bool') {
-                    if (
-                        memo.value[key] === 'true' ||
+                    memo.value[key] = memo.value[key] === 'true' ||
                         memo.value[key] === '1' ||
                         memo.value[key] === 'True' ||
                         memo.value[key] === 'T' ||
-                        memo.value[key] === 't'
-                    ) {
-                        memo.value[key] = true;
-                    } else {
-                        memo.value[key] = false;
-                    }
+                        memo.value[key] === 't';
                 }
             }
         }
@@ -59,8 +53,8 @@ export default defineComponent({
         });
 
         onMounted(async () => {
-            actor.value = await store.state.account.user.getAccountName();
-            permission.value = store.state.account.accountPermission;
+            actor.value = await accountStore.user.getAccountName();
+            permission.value = accountStore.accountPermission;
         });
 
         return {
diff --git a/src/components/contract/ContractTables.vue b/src/components/contract/ContractTables.vue
index 33e95b8e..eb6e44c0 100644
--- a/src/components/contract/ContractTables.vue
+++ b/src/components/contract/ContractTables.vue
@@ -1,23 +1,23 @@
 <script lang="ts">
-import { defineComponent, ref, computed, onMounted, watch } from 'vue';
-import { useStore } from 'src/store';
+import { defineComponent, ref, computed, onMounted } from 'vue';
 import { api } from 'src/api/index';
 import { GetTableRowsParams, GenericTable } from 'src/types';
 import { TableIndexType } from 'src/types/Api';
 import { PaginationSettings } from 'src/types';
+import { useAccountStore } from 'src/stores/account';
 /* eslint-disable */
 export default defineComponent({
     name: 'ContractTables',
     setup() {
-        const store = useStore();
+        const accountStore = useAccountStore();
         const options = computed(() =>
-            store.state.account.abi.abi.tables.map((table) => {
+            accountStore.abi.abi.tables.map((table: {name: string}) => {
                 return table.name;
             })
         );
-        const account = computed(() => store.state.account.abi.account_name);
+        const account = computed(() => accountStore.abi.account_name);
         const table = ref(options.value[0]);
-        const scope = ref<string>(store.state.account.abi.account_name);
+        const scope = ref<string>(accountStore.abi.account_name);
         const lower = ref<string>(null);
         const upper = ref<string>(null);
         const limit = ref<string>('20');
@@ -78,7 +78,7 @@ export default defineComponent({
         }
 
         function formatData(data: any): any {
-            var dict: any = {};
+            const dict: any = {};
             for (let key in data) {
                 if (data[key] instanceof Object) {
                     dict[key] = JSON.stringify(data[key]);
diff --git a/src/components/contract/ContractTabs.vue b/src/components/contract/ContractTabs.vue
index 95468316..ae6ff2f7 100644
--- a/src/components/contract/ContractTabs.vue
+++ b/src/components/contract/ContractTabs.vue
@@ -4,17 +4,17 @@ import { defineComponent, ref, computed, watch } from 'vue';
 import ContractTables from 'src/components/contract/ContractTables.vue';
 import ContractActions from 'src/components/contract/ContractActions.vue';
 import JsonViewer from 'vue-json-viewer';
-import { useStore } from 'src/store';
 import { useRoute, useRouter } from 'vue-router';
+import { useAccountStore } from 'src/stores/account';
 
 export default defineComponent({
     name: 'ContractTabs',
     setup() {
-        const store = useStore();
+        const accountStore = useAccountStore();
         const route = useRoute();
         const router = useRouter();
         const tab = ref<string>((route.query['tab1'] as string) || 'tables');
-        const abi = computed(() => store.state.account.abi);
+        const abi = computed(() => accountStore.abi);
 
         watch([tab], () => {
             let query = { ...route.query };
diff --git a/src/components/resources/BuyRam.vue b/src/components/resources/BuyRam.vue
index ff1cf88d..30242ab1 100644
--- a/src/components/resources/BuyRam.vue
+++ b/src/components/resources/BuyRam.vue
@@ -1,10 +1,10 @@
 <script lang="ts">
 import { defineComponent, ref, computed, watch } from 'vue';
-import { useStore } from 'src/store';
 import ViewTransaction from 'src/components/ViewTransanction.vue';
 import { getChain } from 'src/config/ConfigManager';
 import { formatCurrency, isValidAccount } from 'src/utils/string-utils';
 import { API, UInt64 } from '@greymass/eosio';
+import { useAccountStore } from 'src/stores/account';
 
 const chain = getChain();
 
@@ -14,15 +14,15 @@ export default defineComponent({
         ViewTransaction,
     },
     setup() {
-        const store = useStore();
+        const accountStore = useAccountStore();
         let openTransaction = ref<boolean>(false);
         const buyAmount = ref<string>('');
         const symbol = ref<string>(chain.getSystemToken().symbol);
         const buyOptions = [symbol.value, 'Bytes'];
         const buyOption = ref<string>(buyOptions[0]);
-        const receivingAccount = ref<string>(store.state.account.accountName);
+        const receivingAccount = ref<string>(accountStore.accountName);
         const transactionId = computed(
-            (): string => store.state.account.TransactionId,
+            (): string => accountStore.TransactionId,
         );
         const buyPreview = computed(() => {
             if (buyOption.value === buyOptions[0]) {
@@ -42,13 +42,13 @@ export default defineComponent({
             }
         });
         const transactionError = computed(
-            () => store.state.account.TransactionError,
+            () => accountStore.TransactionError,
         );
         const ramPrice = computed((): string => store.state?.chain.ram_price);
         const ramAvailable = computed(() =>
             UInt64.sub(
-                store.state.account.data.ram_quota,
-                store.state.account.data.ram_usage,
+                accountStore.data.ram_quota,
+                accountStore.data.ram_usage,
             ),
         );
         const accountData = computed((): API.v1.AccountObject => store.state?.account.data);
diff --git a/src/components/resources/RefundTab.vue b/src/components/resources/RefundTab.vue
index 78d0e875..ccca869d 100644
--- a/src/components/resources/RefundTab.vue
+++ b/src/components/resources/RefundTab.vue
@@ -1,12 +1,13 @@
 <script lang="ts">
 import { defineComponent, ref, computed } from 'vue';
-import { useStore } from 'src/store';
 import { Token } from 'src/types';
 import { mapActions } from 'vuex';
 import ViewTransaction from 'src/components/ViewTransanction.vue';
 import { API } from '@greymass/eosio';
 import { formatCurrency } from 'src/utils/string-utils';
 import { getChain } from 'src/config/ConfigManager';
+import { useAccountStore } from 'src/stores/account';
+import { useChainStore } from 'src/stores/chain';
 
 export default defineComponent({
     name: 'RefundTab',
@@ -14,20 +15,21 @@ export default defineComponent({
         ViewTransaction,
     },
     setup() {
-        const store = useStore();
+        const accountStore = useAccountStore();
+        const chainStore = useChainStore();
         const openTransaction = ref<boolean>(false);
         const stakingAccount = ref<string>('');
         const total = ref<string>('0');
         const progress = ref<number>(0.2);
-        const refundRequest = computed((): API.v1.AccountRefundRequest => accountData.value?.refund_request);
+        const refundRequest = computed(() => accountData.value?.refund_request);
         const cpuAmount = computed(
             (): number => refundRequest.value?.cpu_amount.value,
         );
         const netAmount = computed(
             (): number => refundRequest.value?.net_amount.value,
         );
-        const token = computed((): Token => store.state.chain.token);
-        const accountData = computed((): API.v1.AccountObject => store.state?.account.data);
+        const token = computed((): Token => chainStore.token);
+        const accountData = computed(() => accountStore.data as API.v1.AccountObject);
         const totalRefund = computed((): string => {
             const totalRefund = refundRequest.value
                 ? formatCurrency((refundRequest.value.cpu_amount.value + refundRequest.value.net_amount.value), 4)
@@ -67,7 +69,7 @@ export default defineComponent({
                 259200 -
                 Math.round(new Date(new Date().toISOString()).getTime() / 1000);
             if (diff > 0) {
-                var days = component(diff, 24 * 60 * 60), // calculate days from timestamp
+                const days = component(diff, 24 * 60 * 60), // calculate days from timestamp
                     hours = component(diff, 60 * 60) % 24; // hours
                 return `${days} days, ${hours} hours remaining`;
             } else {
@@ -80,7 +82,7 @@ export default defineComponent({
         }
 
         return {
-            store,
+            accountStore,
             openTransaction,
             stakingAccount,
             total,
@@ -117,7 +119,7 @@ export default defineComponent({
                 ).transactionId as string;
             } catch (e) {
                 this.transactionError = e;
-                this.$store.commit('account/setTransactionError', e);
+                this.accountStore.setTransactionError(e);
             }
             await this.loadAccountData();
 
@@ -128,9 +130,9 @@ export default defineComponent({
         async loadAccountData(): Promise<void> {
             try {
                 const data = await this.$api.getAccount(
-                    this.store.state.account.abi.account_name,
+                    this.accountStore.abi.account_name,
                 );
-                this.$store.commit('account/setAccountData', data);
+                this.accountStore.setAccountData(data);
             } catch (e) {
                 return;
             }
diff --git a/src/components/resources/ResourcesInfo.vue b/src/components/resources/ResourcesInfo.vue
index d5a335b4..8d4c92f8 100644
--- a/src/components/resources/ResourcesInfo.vue
+++ b/src/components/resources/ResourcesInfo.vue
@@ -1,25 +1,27 @@
 <script lang="ts">
 import { defineComponent, ref, computed } from 'vue';
-import { useStore } from 'src/store';
 import { Token } from 'src/types';
 import { API } from '@greymass/eosio';
 import { getChain } from 'src/config/ConfigManager';
 import { formatCurrency } from 'src/utils/string-utils';
+import { useAccountStore } from 'src/stores/account';
+import { useChainStore } from 'src/stores/chain';
+import { useResourceStore } from 'src/stores/resources';
 
 export default defineComponent({
     name: 'ResourcesInfo',
     setup() {
-        const store = useStore();
+        const accountStore = useAccountStore();
+        const chainStore = useChainStore();
+        const resourceStore = useResourceStore();
         const openCoinDialog = ref<boolean>(false);
         const stakingAccount = ref<string>('');
         const cpuTokens = ref<string>('0');
         const netTokens = ref<string>('0');
         const total = ref<string>('0');
         const token = ref<Token>(getChain().getSystemToken());
-        const accountData = computed((): API.v1.AccountObject => store.state?.account.data);
-        const ramPrice = computed((): string => store.state?.chain.ram_price === '0'
-            ? '0'
-            : store.state.chain.ram_price);
+        const accountData = computed(() => accountStore.data as API.v1.AccountObject);
+        const ramPrice = computed((): string => chainStore.ram_price === '0' ? '0' : chainStore.ram_price);
         const ramAvailable = computed(() =>
             Number(accountData.value.ram_quota) -
             Number(accountData.value.ram_usage),
@@ -43,9 +45,7 @@ export default defineComponent({
                 );
             return totalStakedResources - selfStakedResources;
         });
-        const delegatedToOthers = computed(
-            (): number => store.state.resources.toOthersAggregated,
-        );
+        const delegatedToOthers = computed(() => resourceStore.toOthersAggregated);
 
         const accountTotal = computed(() => {
             let value = 0;
@@ -71,7 +71,6 @@ export default defineComponent({
         const formatValue = (val: number): string => formatCurrency(val || 0, token.value.precision, token.value.symbol);
 
         return {
-            store,
             openCoinDialog,
             stakingAccount,
             cpuTokens,
diff --git a/src/components/resources/SellRam.vue b/src/components/resources/SellRam.vue
index bcaa79c4..999e5980 100644
--- a/src/components/resources/SellRam.vue
+++ b/src/components/resources/SellRam.vue
@@ -1,10 +1,11 @@
 <script lang="ts">
 import { defineComponent, ref, computed } from 'vue';
-import { useStore } from 'src/store';
 import ViewTransaction from 'src/components/ViewTransanction.vue';
 import { getChain } from 'src/config/ConfigManager';
 import { API } from '@greymass/eosio';
 import { formatCurrency } from 'src/utils/string-utils';
+import { useAccountStore } from 'src/stores/account';
+import { useChainStore } from 'src/stores/chain';
 
 export default defineComponent({
     name: 'SellRam',
@@ -12,26 +13,20 @@ export default defineComponent({
         ViewTransaction,
     },
     setup() {
-        const store = useStore();
+        const accountStore = useAccountStore();
+        const chainStore = useChainStore();
         const chain = getChain();
         let openTransaction = ref<boolean>(false);
         const sellAmount = ref('');
         const symbol = ref<string>(chain.getSystemToken().symbol);
-        const transactionId = computed(
-            (): string => store.state.account.TransactionId,
-        );
-        const transactionError = computed(
-            () => store.state.account.TransactionError,
-        );
-        const ramPrice = computed((): string => store.state?.chain.ram_price);
+        const transactionId = computed(() => accountStore.TransactionId);
+        const transactionError = computed(() => accountStore.TransactionError);
+        const ramPrice = computed((): string => chainStore.ram_price);
         const sellPreview = computed(
             () => formatCurrency((Number(sellAmount.value) / 1000) * Number(ramPrice.value), 4, symbol.value),
         );
-        const ramAvailable = computed(
-            () =>
-                Number(store.state.account.data.ram_quota.value) -
-                Number(store.state.account.data.ram_usage.value));
-        const accountData = computed((): API.v1.AccountObject => store.state?.account.data);
+        const ramAvailable = computed(() => Number(accountStore.data.ram_quota.value) - Number(accountStore.data.ram_usage.value));
+        const accountData = computed(() => accountStore.data as API.v1.AccountObject);
 
         function formatDec() {
             sellAmount.value = parseInt(sellAmount.value)
@@ -39,7 +34,7 @@ export default defineComponent({
                 .replace(/[^0-9.]/g, '');
         }
         async function sell() {
-            void store.dispatch('account/resetTransaction');
+            void accountStore.resetTransaction();
             if (
                 sellAmount.value === '0' ||
                 !ramAvailable.value ||
@@ -47,7 +42,7 @@ export default defineComponent({
             ) {
                 return;
             }
-            await store.dispatch('account/sellRam', {
+            await accountStore.sellRam({
                 amount: sellAmount.value,
             });
 
diff --git a/src/components/resources/StakeTab.vue b/src/components/resources/StakeTab.vue
index 5d270ac0..5b147a8e 100644
--- a/src/components/resources/StakeTab.vue
+++ b/src/components/resources/StakeTab.vue
@@ -1,11 +1,12 @@
 <script lang="ts">
 import { defineComponent, ref, computed } from 'vue';
-import { mapActions } from 'vuex';
 import ViewTransaction from 'src/components/ViewTransanction.vue';
 import { getChain } from 'src/config/ConfigManager';
 import { formatCurrency, isValidAccount } from 'src/utils/string-utils';
 import { assetToAmount } from 'src/utils/string-utils';
-import { useAntelopeStore } from 'src/store/antelope.store';
+import { useAccountStore } from 'src/stores/account';
+import { useResourceStore } from 'src/stores/resources';
+import { useChainStore } from 'src/stores/chain';
 
 const chain = getChain();
 const symbol = chain.getSystemToken().symbol;
@@ -16,11 +17,13 @@ export default defineComponent({
         ViewTransaction,
     },
     setup() {
-        const store = useAntelopeStore();
+        const accountStore = useAccountStore();
+        const resourceStore = useResourceStore();
+        const chainStore = useChainStore();
         const openTransaction = ref<boolean>(false);
-        const stakingAccount = ref<string>(store.state.account.accountName || '');
+        const stakingAccount = ref<string>(accountStore.accountName || '');
         const accountTotal = computed((): string =>
-            (store.state.account.data.core_liquid_balance ?? 0).toString(),
+            (accountStore.data.core_liquid_balance ?? 0).toString(),
         );
         const accountTotalAsNumber = computed(() => assetToAmount(accountTotal.value));
         const cpuTokens = ref<string>('0');
@@ -31,8 +34,8 @@ export default defineComponent({
                 cpuTokens.value = Number(cpuTokens.value)
                     .toLocaleString('en-US', {
                         style: 'decimal',
-                        maximumFractionDigits: store.state.chain.token.precision,
-                        minimumFractionDigits: store.state.chain.token.precision,
+                        maximumFractionDigits: chainStore.token.precision,
+                        minimumFractionDigits: chainStore.token.precision,
                     })
                     .replace(/[^0-9.]/g, '');
             }
@@ -40,8 +43,8 @@ export default defineComponent({
                 netTokens.value = Number(netTokens.value)
                     .toLocaleString('en-US', {
                         style: 'decimal',
-                        maximumFractionDigits: store.state.chain.token.precision,
-                        minimumFractionDigits: store.state.chain.token.precision,
+                        maximumFractionDigits: chainStore.token.precision,
+                        minimumFractionDigits: chainStore.token.precision,
                     })
                     .replace(/[^0-9.]/g, '');
             }
@@ -52,12 +55,13 @@ export default defineComponent({
             stakingAccount,
             cpuTokens,
             netTokens,
-            ...mapActions({ delegateResources: 'resources/delegateResources' }),
             transactionId: ref<string>(null),
             transactionError: null,
             formatDec,
             accountTotalAsNumber,
             isValidAccount,
+            resourceStore,
+            accountStore,
         };
     },
     computed: {
@@ -83,8 +87,8 @@ export default defineComponent({
                 this.$q.notify('Enter valid value for CPU or NET to stake');
                 return;
             }
-            await this.delegateResources({
-                from: this.$store.state.account.accountName,
+            await this.resourceStore.delegateResources({
+                from: this.accountStore.accountName,
                 to: this.stakingAccount.toLowerCase().trim(),
                 transfer: false,
                 cpu_weight:
diff --git a/src/components/resources/UnstakeTab.vue b/src/components/resources/UnstakeTab.vue
index 89a08bbe..df94e1b0 100644
--- a/src/components/resources/UnstakeTab.vue
+++ b/src/components/resources/UnstakeTab.vue
@@ -1,11 +1,12 @@
 <script lang="ts">
-import { defineComponent, ref, computed } from 'vue';
-import { useAntelopeStore } from 'src/store/antelope.store';
+import { computed, defineComponent, ref } from 'vue';
 import { mapActions } from 'vuex';
 import ViewTransaction from 'src/components/ViewTransanction.vue';
 import { getChain } from 'src/config/ConfigManager';
-import { DelegatedResources } from 'src/store/resources/state';
-import { formatCurrency, assetToAmount } from 'src/utils/string-utils';
+import { DelegatedResources, useResourceStore } from 'src/stores/resources';
+import { assetToAmount, formatCurrency } from 'src/utils/string-utils';
+import { useAccountStore } from 'src/stores/account';
+import { useChainStore } from 'src/stores/chain';
 
 const chain = getChain();
 const symbol = chain.getSystemToken().symbol;
@@ -16,10 +17,12 @@ export default defineComponent({
         ViewTransaction,
     },
     setup() {
-        const store = useAntelopeStore();
+        const accountStore = useAccountStore();
+        const chainStore = useChainStore();
+        const resourceStore = useResourceStore();
         const openTransaction = ref<boolean>(false);
         const stakingAccount = ref<string>(
-            store.state.account.accountName.toLowerCase() || '',
+            accountStore.accountName.toLowerCase() || '',
         );
         const cpuTokens = ref<string>('0');
         const netTokens = ref<string>('0');
@@ -29,8 +32,8 @@ export default defineComponent({
                 cpuTokens.value = Number(cpuTokens.value)
                     .toLocaleString('en-US', {
                         style: 'decimal',
-                        maximumFractionDigits: store.state.chain.token.precision,
-                        minimumFractionDigits: store.state.chain.token.precision,
+                        maximumFractionDigits: chainStore.token.precision,
+                        minimumFractionDigits: chainStore.token.precision,
                     })
                     .replace(/[^0-9.]/g, '');
             }
@@ -38,30 +41,27 @@ export default defineComponent({
                 netTokens.value = Number(netTokens.value)
                     .toLocaleString('en-US', {
                         style: 'decimal',
-                        maximumFractionDigits: store.state.chain.token.precision,
-                        minimumFractionDigits: store.state.chain.token.precision,
+                        maximumFractionDigits: chainStore.token.precision,
+                        minimumFractionDigits: chainStore.token.precision,
                     })
                     .replace(/[^0-9.]/g, '');
             }
         }
 
-        const delegatedList = computed(() => store.resources.getDelegatedToOthers());
-        const isUpdating = computed(() => store.resources.isLoading('updateResources'));
-        const isUnstaking = computed(() => store.resources.isLoading('undelegateResources'));
-        const loading = computed(() => store.resources.getLoading());
+        const delegatedList = computed(() => resourceStore.getDelegatedToOthers);
+        const isUpdating = computed(() => resourceStore.isLoading('updateResources'));
+        const isUnstaking = computed(() => resourceStore.isLoading('undelegateResources'));
+        const loading = computed(() => resourceStore.loading);
         const selectModel = ref<{label:string, value:DelegatedResources}>({ label: '', value: null });
         const receiverAccount = computed((): string => selectModel.value?.value?.to);
 
-        const selectOptions = computed(() => {
-            const options = delegatedList.value?.map(item => ({
-                label: item.to,
-                value: item,
-            })) ?? [];
-            return options;
-        });
+        const selectOptions = computed(() => delegatedList.value?.map(item => ({
+            label: item.to,
+            value: item,
+        })) ?? []);
 
-        void store.resources.updateResources({}).then(() => {
-            const selfStaked = store.resources.getSelfStaked();
+        void resourceStore.updateResources({}).then(() => {
+            const selfStaked = resourceStore.selfStaked;
             if (selfStaked) {
                 selectModel.value = {
                     label: (selfStaked?.to ?? 'unknown'),
diff --git a/src/components/staking/HistoryTab.vue b/src/components/staking/HistoryTab.vue
index b95a00a8..c76ec6e7 100644
--- a/src/components/staking/HistoryTab.vue
+++ b/src/components/staking/HistoryTab.vue
@@ -1,18 +1,18 @@
 <script lang="ts">
 import { defineComponent, computed } from 'vue';
-import { useStore } from 'src/store';
 import { Action } from 'src/types';
 import { getRexHistoryAsset, formatDate } from 'src/utils/string-utils';
+import { useAccountStore } from 'src/stores/account';
 
 export default defineComponent({
     name: 'HistoryTab',
     components: {},
     setup() {
-        const store = useStore();
-        const rexActions = computed((): Action[] => store.state.account.rexActions);
+        const accountStore = useAccountStore();
+        const rexActions = computed((): Action[] => accountStore.rexActions);
 
         return {
-            store,
+            accountStore,
             rexActions,
             formatDate,
             getRexHistoryAsset,
diff --git a/src/components/staking/ProcessingTab.vue b/src/components/staking/ProcessingTab.vue
index f68f721f..f0bb84e7 100644
--- a/src/components/staking/ProcessingTab.vue
+++ b/src/components/staking/ProcessingTab.vue
@@ -1,20 +1,22 @@
 <script lang="ts">
 import { defineComponent, ref, computed } from 'vue';
-import { useStore } from 'src/store';
 import { Token } from 'src/types';
 import { mapActions } from 'vuex';
 import { API } from '@greymass/eosio';
+import { useAccountStore } from 'src/stores/account';
+import { useChainStore } from 'src/stores/chain';
 
 export default defineComponent({
     name: 'ProcessingTab',
     components: {
     },
     setup() {
-        const store = useStore();
+        const chainStore = useChainStore();
+        const accountStore = useAccountStore();
         const progress = ref<number>(0.2);
-        const token = computed((): Token => store.state.chain.token);
-        const accountData = computed((): API.v1.AccountObject => store.state?.account.data);
-        const maturingRex = computed(() => store.state?.account.maturingRex);
+        const token = computed((): Token => chainStore.token);
+        const accountData = computed(() => accountStore.data as API.v1.AccountObject);
+        const maturingRex = computed(() => accountStore.maturingRex);
 
         function refundProgress(): number {
             if (maturingRex.value === '0') {
@@ -48,7 +50,7 @@ export default defineComponent({
                     ).getTime() / 1000,
                 ) - Math.round(new Date(new Date().toISOString()).getTime() / 1000);
             if (diff > 0) {
-                var days = component(diff, 24 * 60 * 60), // calculate days from timestamp
+                const days = component(diff, 24 * 60 * 60), // calculate days from timestamp
                     hours = component(diff, 60 * 60) % 24; // hours
                 // minutes = component(diff, 60) % 60, // minutes
                 // seconds = component(diff, 1) % 60;// seconds
@@ -63,7 +65,6 @@ export default defineComponent({
         }
 
         return {
-            store,
             accountData,
             token,
             progress,
diff --git a/src/components/staking/SavingsTab.vue b/src/components/staking/SavingsTab.vue
index 2490eaa2..97f03f1f 100644
--- a/src/components/staking/SavingsTab.vue
+++ b/src/components/staking/SavingsTab.vue
@@ -1,10 +1,11 @@
 <script lang="ts">
 import { defineComponent, ref, computed } from 'vue';
-import { useStore } from 'src/store';
 import ViewTransaction from 'src/components/ViewTransanction.vue';
 import { API } from '@greymass/eosio';
 import { assetToAmount, formatNumberWithCommas } from 'src/utils/string-utils';
 import { getChain } from 'src/config/ConfigManager';
+import { useAccountStore } from 'src/stores/account';
+import { useChainStore } from 'src/stores/chain';
 
 export default defineComponent({
     name: 'SavingsTab',
@@ -12,29 +13,30 @@ export default defineComponent({
         ViewTransaction,
     },
     setup() {
-        const store = useStore();
+        const accountStore = useAccountStore();
+        const chainStore = useChainStore();
         const openTransaction = ref<boolean>(false);
         const stakingAccount = computed(
-            (): string => store.state.account.accountName,
+            (): string => accountStore.accountName,
         );
         const toSavingAmount = ref<string>('');
         const fromSavingAmount = ref<string>('');
-        const transactionId = ref<string>(store.state.account.TransactionId);
-        const transactionError = ref<unknown>(store.state.account.TransactionError);
-        const accountData = computed((): API.v1.AccountObject => store.state?.account.data);
+        const transactionId = ref<string>(accountStore.TransactionId);
+        const transactionError = ref<unknown>(accountStore.TransactionError);
+        const accountData = computed(() => accountStore.data as API.v1.AccountObject);
         const eligibleStaked = computed(() => (
-            assetToAmount(store.state?.account.maturedRex) +
-            assetToAmount(store.state?.account.maturingRex)
+            assetToAmount(accountStore.maturedRex) +
+            assetToAmount(accountStore.maturingRex)
         ));
-        const rexSavings = computed(() => store.state?.account.savingsRex);
+        const rexSavings = computed(() => accountStore.savingsRex);
 
         function formatDec() {
             if (toSavingAmount.value !== '') {
                 toSavingAmount.value = Number(toSavingAmount.value)
                     .toLocaleString('en-US', {
                         style: 'decimal',
-                        maximumFractionDigits: store.state.chain.token.precision,
-                        minimumFractionDigits: store.state.chain.token.precision,
+                        maximumFractionDigits: chainStore.token.precision,
+                        minimumFractionDigits: chainStore.token.precision,
                     })
                     .replace(/[^0-9.]/g, '');
             }
@@ -42,15 +44,15 @@ export default defineComponent({
                 fromSavingAmount.value = Number(fromSavingAmount.value)
                     .toLocaleString('en-US', {
                         style: 'decimal',
-                        maximumFractionDigits: store.state.chain.token.precision,
-                        minimumFractionDigits: store.state.chain.token.precision,
+                        maximumFractionDigits: chainStore.token.precision,
+                        minimumFractionDigits: chainStore.token.precision,
                     })
                     .replace(/[^0-9.]/g, '');
             }
         }
 
         async function moveToSavings() {
-            void store.dispatch('account/resetTransaction');
+            void accountStore.resetTransaction();
             if (
                 toSavingAmount.value === '0' ||
                 toSavingAmount.value === '' ||
@@ -58,7 +60,7 @@ export default defineComponent({
             ) {
                 return;
             }
-            await store.dispatch('account/moveToSavings', {
+            await accountStore.moveToSavings({
                 amount: toSavingAmount.value || '0',
             });
 
@@ -68,7 +70,7 @@ export default defineComponent({
         }
 
         async function moveFromSavings() {
-            void store.dispatch('account/resetTransaction');
+            void accountStore.resetTransaction();
             if (
                 fromSavingAmount.value === '0' ||
                 fromSavingAmount.value === '' ||
@@ -76,7 +78,7 @@ export default defineComponent({
             ) {
                 return;
             }
-            await store.dispatch('account/moveFromSavings', {
+            await accountStore.moveFromSavings({
                 amount: fromSavingAmount.value || '0',
             });
 
diff --git a/src/components/staking/StakeFromResources.vue b/src/components/staking/StakeFromResources.vue
index 78e9cebc..bc5c5b4d 100644
--- a/src/components/staking/StakeFromResources.vue
+++ b/src/components/staking/StakeFromResources.vue
@@ -1,9 +1,10 @@
 <script lang="ts">
 import { defineComponent, ref, computed } from 'vue';
-import { useStore } from 'src/store';
 import ViewTransaction from 'src/components/ViewTransanction.vue';
 import { getChain } from 'src/config/ConfigManager';
 import { API, Asset } from '@greymass/eosio';
+import { useAccountStore } from 'src/stores/account';
+import { useChainStore } from 'src/stores/chain';
 
 export default defineComponent({
     name: 'StakeFromResources',
@@ -11,7 +12,8 @@ export default defineComponent({
         ViewTransaction,
     },
     setup() {
-        const store = useStore();
+        const accountStore = useAccountStore();
+        const chainStore = useChainStore();
         const openTransaction = ref<boolean>(false);
         const chain = getChain();
         const symbol = ref<string>(chain.getSystemToken().symbol);
@@ -19,12 +21,12 @@ export default defineComponent({
         const netTokens = ref<string>('');
         const cpuWithdraw = ref<string>('0');
         const netWithdraw = ref<string>('0');
-        const transactionId = ref<string>(store.state.account.TransactionId);
-        const transactionError = ref<unknown>(store.state.account.TransactionError);
+        const transactionId = ref<string>(accountStore.TransactionId);
+        const transactionError = ref<unknown>(accountStore.TransactionError);
         const stakingAccount = computed(
-            (): string => store.state.account.accountName,
+            (): string => accountStore.accountName,
         );
-        const accountData = computed((): API.v1.AccountObject => store.state?.account.data);
+        const accountData = computed(() => accountStore.data as API.v1.AccountObject);
         const cpuWeight = computed(
             (): Asset => accountData.value.total_resources.cpu_weight,
         );
@@ -37,8 +39,8 @@ export default defineComponent({
                 cpuTokens.value = Number(cpuTokens.value)
                     .toLocaleString('en-US', {
                         style: 'decimal',
-                        maximumFractionDigits: store.state.chain.token.precision,
-                        minimumFractionDigits: store.state.chain.token.precision,
+                        maximumFractionDigits: chainStore.token.precision,
+                        minimumFractionDigits: chainStore.token.precision,
                     })
                     .replace(/[^0-9.]/g, '');
             }
@@ -46,15 +48,15 @@ export default defineComponent({
                 netTokens.value = Number(netTokens.value)
                     .toLocaleString('en-US', {
                         style: 'decimal',
-                        maximumFractionDigits: store.state.chain.token.precision,
-                        minimumFractionDigits: store.state.chain.token.precision,
+                        maximumFractionDigits: chainStore.token.precision,
+                        minimumFractionDigits: chainStore.token.precision,
                     })
                     .replace(/[^0-9.]/g, '');
             }
         }
 
         async function stake() {
-            void store.dispatch('account/resetTransaction');
+            void accountStore.resetTransaction();
             if (
                 (cpuTokens.value === '0' && netTokens.value === '0') ||
                 Number(cpuTokens.value) >= Number(cpuWeight.value) ||
@@ -63,7 +65,7 @@ export default defineComponent({
                 return;
             }
 
-            await store.dispatch('account/stakeCpuNetRex', {
+            await accountStore.stakeCpuNetRex({
                 cpuAmount: cpuTokens.value || '0',
                 netAmount: netTokens.value || '0',
             });
@@ -74,11 +76,11 @@ export default defineComponent({
         }
 
         async function unstake() {
-            void store.dispatch('account/resetTransaction');
+            void accountStore.resetTransaction();
             if (cpuWithdraw.value === '0' && netWithdraw.value === '0') {
                 return;
             }
-            await store.dispatch('account/unstakeCpuNetRex', {
+            await accountStore.unstakeCpuNetRex({
                 cpuAmount: cpuWithdraw.value || '0',
                 netAmount: netWithdraw.value || '0',
             });
diff --git a/src/components/staking/StakingDialog.vue b/src/components/staking/StakingDialog.vue
index 59227e56..5499669f 100644
--- a/src/components/staking/StakingDialog.vue
+++ b/src/components/staking/StakingDialog.vue
@@ -1,7 +1,7 @@
 <script lang="ts">
 import { computed, defineComponent, PropType, ref } from 'vue';
 import { Token } from 'src/types';
-import { mapActions, mapGetters } from 'vuex';
+import { mapGetters } from 'vuex';
 import StakingInfo from 'src/components/staking/StakingInfo.vue';
 import StakeFromResources from 'src/components/staking/StakeFromResources.vue';
 import ProcessingTab from 'src/components/staking/ProcessingTab.vue';
@@ -10,9 +10,10 @@ import UnstakingTab from 'src/components/staking/UnstakingTab.vue';
 import HistoryTab from 'src/components/staking/HistoryTab.vue';
 import SavingsTab from 'src/components/staking/SavingsTab.vue';
 import { getChain } from 'src/config/ConfigManager';
-import { useStore } from 'src/store';
 import { API } from '@greymass/eosio';
 import { formatCurrency } from 'src/utils/string-utils';
+import { useChainStore } from 'src/stores/chain';
+import { useAccountStore } from 'src/stores/account';
 
 const symbol = getChain().getSystemToken().symbol;
 
@@ -46,16 +47,17 @@ export default defineComponent({
         },
     },
     setup() {
-        const store = useStore();
-        const rexfund = computed(() => store.state.account.rexfund || 0);
-        const symbol = computed(() => store.state.chain.token.symbol);
+        const accountStore = useAccountStore();
+        const chainStore = useChainStore();
+        const rexfund = computed(() => accountStore.rexfund || 0);
+        const symbol = computed(() => chainStore.token.symbol);
         const transactionId = ref<string>(null);
         const transactionError = ref<string>(null);
 
         const withdrawRexFund = async () => {
-            await store.dispatch('account/unstakeRexFund', { amount: rexfund.value });
-            void store.dispatch('account/updateRexData', {
-                account: store.state.account.accountName,
+            await accountStore.unstakeRexFund({ amount: rexfund.value });
+            void accountStore.updateRexData({
+                account: accountStore.accountName,
             });
         };
 
@@ -73,7 +75,7 @@ export default defineComponent({
             transactionId,
             withdrawRexFund,
             prettyRexFund,
-            ...mapActions({ sendAction: 'account/sendAction' }),
+            accountStore,
         };
     },
     computed: {
@@ -92,14 +94,13 @@ export default defineComponent({
                 memo: this.memo,
             };
             try {
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
                 this.transactionId = (
-                    await this.sendAction({
+                    await this.accountStore.sendAction({
                         account: actionAccount,
                         data,
                         name: 'transfer',
                     })
-                ).transactionId as string;
+                ).transactionId;
             } catch (e) {
                 this.transactionError = e as string;
             }
@@ -123,7 +124,7 @@ export default defineComponent({
             let data: API.v1.AccountObject;
             try {
                 data = await this.$api.getAccount(this.account);
-                this.$store.commit('account/setAccountData', data);
+                this.accountStore.setAccountData(data);
             } catch (e) {
                 return;
             }
diff --git a/src/components/staking/StakingInfo.vue b/src/components/staking/StakingInfo.vue
index b999f9bf..6ebf86b7 100644
--- a/src/components/staking/StakingInfo.vue
+++ b/src/components/staking/StakingInfo.vue
@@ -1,30 +1,31 @@
 <script lang="ts">
 import { defineComponent, ref, computed } from 'vue';
-import { useStore } from 'src/store';
 import { getChain } from 'src/config/ConfigManager';
 import { API } from '@greymass/eosio';
 import { Token } from 'src/types';
+import { useChainStore } from 'src/stores/chain';
+import { useAccountStore } from 'src/stores/account';
 
 const chain = getChain();
 
 export default defineComponent({
     name: 'StakingInfo',
     setup() {
-        const store = useStore();
+        const chainStore = useChainStore();
+        const accountStore = useAccountStore();
         const symbol = ref<string>(chain.getSystemToken().symbol);
         const stakingAccount = ref<string>('');
         const total = ref<string>('0');
-        const token = computed((): Token => store.state.chain.token);
-        const accountData = computed((): API.v1.AccountObject => store.state.account.data);
+        const token = computed((): Token => chainStore.token);
+        const accountData = computed(() => accountStore.data as API.v1.AccountObject);
         const liquidBalance = computed(() => accountData.value.core_liquid_balance);
         const rexInfo = computed(() => accountData.value.rex_info);
-        const coreRexBalance = computed(() => store.state?.account.coreRexBalance);
-        const maturingRex = computed(() => store.state?.account.maturingRex);
-        const maturedRex = computed(() => store.state?.account.maturedRex);
-        const rexSavings = computed(() => store.state?.account.savingsRex);
+        const coreRexBalance = computed(() => accountStore.coreRexBalance);
+        const maturingRex = computed(() => accountStore.maturingRex);
+        const maturedRex = computed(() => accountStore.maturedRex);
+        const rexSavings = computed(() => accountStore.savingsRex);
 
         return {
-            store,
             symbol,
             stakingAccount,
             total,
diff --git a/src/components/staking/StakingTab.vue b/src/components/staking/StakingTab.vue
index 9417d5e9..dd34e20a 100644
--- a/src/components/staking/StakingTab.vue
+++ b/src/components/staking/StakingTab.vue
@@ -1,10 +1,11 @@
 <script lang="ts">
 import { defineComponent, ref, computed } from 'vue';
-import { useStore } from 'src/store';
 import ViewTransaction from 'src/components/ViewTransanction.vue';
 import { getChain } from 'src/config/ConfigManager';
 import { API } from '@greymass/eosio';
 import { assetToAmount } from 'src/utils/string-utils';
+import { useAccountStore } from 'src/stores/account';
+import { useChainStore } from 'src/stores/chain';
 
 const chain = getChain();
 
@@ -14,20 +15,17 @@ export default defineComponent({
         ViewTransaction,
     },
     setup() {
-        const store = useStore();
+        const accountStore = useAccountStore();
+        const chainStore = useChainStore();
         let openTransaction = ref<boolean>(false);
         const stakeTokens = ref<string>('');
         const symbol = ref<string>(chain.getSystemToken().symbol);
-        const transactionId = computed(
-            (): string => store.state.account.TransactionId,
-        );
-        const transactionError = computed(
-            () => store.state.account.TransactionError,
-        );
-        const accountData = computed((): API.v1.AccountObject => store.state?.account.data);
-        const rexInfo = computed(() => store.state.account.data.rex_info);
-        const rexbal = computed(() => store.state.account.rexbal);
-        const maturedRex = computed(() => store.state.account.maturedRex);
+        const transactionId = computed((): string => accountStore.TransactionId);
+        const transactionError = computed(() => accountStore.TransactionError);
+        const accountData = computed(() => accountStore.data as API.v1.AccountObject);
+        const rexInfo = computed(() => accountStore.data.rex_info);
+        const rexbal = computed(() => accountStore.rexbal);
+        const maturedRex = computed(() => accountStore.maturedRex);
         const liquidBalance = computed(
             () => accountData.value?.core_liquid_balance?.value ?? 0,
         );
@@ -38,7 +36,7 @@ export default defineComponent({
         ]);
 
         function formatDec() {
-            const precision = store.state.chain.token.precision;
+            const precision = chainStore.token.precision;
             if (stakeTokens.value !== '') {
                 stakeTokens.value = Number(stakeTokens.value)
                     .toLocaleString('en-US', {
@@ -51,7 +49,7 @@ export default defineComponent({
         }
 
         async function stake() {
-            void store.dispatch('account/resetTransaction');
+            void accountStore.resetTransaction();
             if (
                 stakeTokens.value === '0' ||
                 Number(stakeTokens.value) >=
@@ -59,7 +57,7 @@ export default defineComponent({
             ) {
                 return;
             }
-            await store.dispatch('account/stakeRex', {
+            await accountStore.stakeRex({
                 amount: stakeTokens.value,
             });
 
diff --git a/src/components/staking/UnstakingTab.vue b/src/components/staking/UnstakingTab.vue
index 2a79fee5..e2d6c5fb 100644
--- a/src/components/staking/UnstakingTab.vue
+++ b/src/components/staking/UnstakingTab.vue
@@ -1,11 +1,12 @@
 <script lang="ts">
 import { defineComponent, ref, computed } from 'vue';
-import { useStore } from 'src/store';
 import ViewTransaction from 'src/components/ViewTransanction.vue';
 import { getChain } from 'src/config/ConfigManager';
 import { API } from '@greymass/eosio';
 import { assetToAmount } from 'src/utils/string-utils';
 import { QInput } from 'quasar';
+import { useAccountStore } from 'src/stores/account';
+import { useChainStore } from 'src/stores/chain';
 
 const chain = getChain();
 
@@ -15,25 +16,26 @@ export default defineComponent({
         ViewTransaction,
     },
     setup() {
-        const store = useStore();
+        const accountStore = useAccountStore();
+        const chainStore = useChainStore();
         let openTransaction = ref<boolean>(false);
         const unstakeTokens = ref<string>('');
         const symbol = ref<string>(chain.getSystemToken().symbol);
         const unstakeInput = ref<QInput>(null);
         const transactionId = computed(
-            (): string => store.state.account.TransactionId,
+            (): string => accountStore.TransactionId,
         );
         const transactionError = computed(
-            () => store.state.account.TransactionError,
+            () => accountStore.TransactionError,
         );
-        const accountData = computed((): API.v1.AccountObject => store.state?.account.data);
-        const rexInfo = computed(() => store.state.account.data.rex_info);
-        const rexbal = computed(() => store.state.account.rexbal);
-        const maturedRex = computed(() => store.state?.account.maturedRex);
+        const accountData = computed(() => accountStore.data as API.v1.AccountObject);
+        const rexInfo = computed(() => accountStore.data.rex_info);
+        const rexbal = computed(() => accountStore.rexbal);
+        const maturedRex = computed(() => accountStore.maturedRex);
         const maxUnlend = computed(() => assetToAmount(maturedRex.value) - .0001);
 
         function formatDec() {
-            const precision = store.state.chain.token.precision;
+            const precision = chainStore.token.precision;
             if (unstakeTokens.value !== '') {
                 unstakeTokens.value = Number(unstakeTokens.value)
                     .toLocaleString('en-US', {
@@ -46,12 +48,12 @@ export default defineComponent({
         }
 
         async function unstake() {
-            void store.dispatch('account/resetTransaction');
+            void accountStore.resetTransaction();
             // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-member-access
             if ((unstakeInput.value as any).hasError) {
                 return;
             }
-            await store.dispatch('account/unstakeRex', {
+            await accountStore.unstakeRex({
                 amount: unstakeTokens.value,
             });
 
diff --git a/src/components/transaction/TraceTree.vue b/src/components/transaction/TraceTree.vue
index 0dfcd414..dac59199 100644
--- a/src/components/transaction/TraceTree.vue
+++ b/src/components/transaction/TraceTree.vue
@@ -1,16 +1,18 @@
 <script lang="ts">
 import { defineComponent, ref, computed } from 'vue';
-import { useStore } from 'src/store';
 import { Action, TreeNode } from 'src/types';
 import ActionFormat from 'src/components/transaction/ActionFormat.vue';
 import DataFormat from 'src/components/transaction/DataFormat.vue';
+import { useAccountStore } from 'src/stores/account';
+import { useTransactionStore } from 'src/stores/transaction';
 
 export default defineComponent({
     name: 'TraceTree',
     components: { ActionFormat, DataFormat },
     setup() {
-        const store = useStore();
-        const account = computed((): string => store.state.account.accountName);
+        const accountStore = useAccountStore();
+        const transactionStore = useTransactionStore();
+        const account = computed(() => accountStore.accountName);
         function getTree(actions: Action[]): TreeNode[] {
             let array = [] as TreeNode[];
             for (let action of actions) {
@@ -49,17 +51,17 @@ export default defineComponent({
         }
 
         return {
-            transaction: computed(() => store.state.transaction.transactionId),
-            transactionData: computed(() => store.state.transaction.transaction),
-            blockNum: computed(() => store.state.transaction.blockNum),
-            timestamp: computed(() => store.state.transaction.timestamp),
-            executed: computed(() => store.state.transaction.executed),
-            irreversable: computed(() => store.state.transaction.irreversable),
-            cpuUsage: computed(() => store.state.transaction.cpuUsage),
-            netUsage: computed(() => store.state.transaction.netUsage),
+            transaction: computed(() => transactionStore.transactionId),
+            transactionData: computed(() => transactionStore.transaction),
+            blockNum: computed(() => transactionStore.blockNum),
+            timestamp: computed(() => transactionStore.timestamp),
+            executed: computed(() => transactionStore.executed),
+            irreversable: computed(() => transactionStore.irreversable),
+            cpuUsage: computed(() => transactionStore.cpuUsage),
+            netUsage: computed(() => transactionStore.netUsage),
             actionsTraces: ref<string>(''),
-            actionNum: computed(() => store.state.transaction.actionCount),
-            actions: computed(() => store.state.transaction.actions),
+            actionNum: computed(() => transactionStore.actionCount),
+            actions: computed(() => transactionStore.actions),
             getTree,
             account,
         };
diff --git a/src/components/transaction/TransactionCard.vue b/src/components/transaction/TransactionCard.vue
index cf91ecca..2f41cfd5 100644
--- a/src/components/transaction/TransactionCard.vue
+++ b/src/components/transaction/TransactionCard.vue
@@ -1,26 +1,26 @@
 <script lang="ts">
 import { defineComponent, ref, computed } from 'vue';
 import { copyToClipboard } from 'quasar';
-import { useStore } from 'src/store';
 import {  formatDate } from 'src/utils/string-utils';
 import AccountFormat from 'src/components/transaction/AccountFormat.vue';
+import { useTransactionStore } from 'src/stores/transaction';
 
 export default defineComponent({
     name: 'TransactionCard',
     components: { AccountFormat },
     setup() {
-        const store = useStore();
+        const transactionStore = useTransactionStore();
         return {
-            transaction: computed(() => store.state.transaction.transactionId),
-            transactionData: computed(() => store.state.transaction.transaction),
-            blockNum: computed(() => store.state.transaction.blockNum.toString()),
-            timestamp: computed(() => store.state.transaction.timestamp),
-            executed: computed(() => store.state.transaction.executed),
-            irreversable: computed(() => store.state.transaction.irreversable),
-            cpuUsage: computed(() => store.state.transaction.cpuUsage),
-            netUsage: computed(() => store.state.transaction.netUsage),
+            transaction: computed(() => transactionStore.transactionId),
+            transactionData: computed(() => transactionStore.transaction),
+            blockNum: computed(() => transactionStore.blockNum.toString()),
+            timestamp: computed(() => transactionStore.timestamp),
+            executed: computed(() => transactionStore.executed),
+            irreversable: computed(() => transactionStore.irreversable),
+            cpuUsage: computed(() => transactionStore.cpuUsage),
+            netUsage: computed(() => transactionStore.netUsage),
             actionsTraces: ref<string>(''),
-            actionNum: computed(() => store.state.transaction.actionCount),
+            actionNum: computed(() => transactionStore.actionCount),
         };
     },
     methods: {
diff --git a/src/components/validators/ValidatorData.vue b/src/components/validators/ValidatorData.vue
index 29798af2..cffb8305 100644
--- a/src/components/validators/ValidatorData.vue
+++ b/src/components/validators/ValidatorData.vue
@@ -2,13 +2,14 @@
 import { defineComponent, computed, ref, onMounted, watch } from 'vue';
 import ValidatorDataTable from 'src/components/validators/ValidatorDataTable.vue';
 import { api } from 'src/api';
-import { useStore } from 'src/store';
 import ViewTransaction from 'src/components/ViewTransanction.vue';
 import { GetTableRowsParams } from 'src/types';
 import WalletModal from 'src/components/WalletModal.vue';
 import { getChain } from 'src/config/ConfigManager';
 import { Name } from '@greymass/eosio';
 import { formatCurrency, assetToAmount } from 'src/utils/string-utils';
+import { useAccountStore } from 'src/stores/account';
+import { useChainStore } from 'src/stores/chain';
 
 const chain = getChain();
 
@@ -20,22 +21,23 @@ export default defineComponent({
         WalletModal,
     },
     setup() {
-        const store = useStore();
+        const accountStore = useAccountStore();
+        const chainStore = useChainStore();
         const symbol = chain.getSystemToken().symbol;
-        const account = computed(() => store.state.account.accountName);
+        const account = computed(() => accountStore.accountName);
         const balance = computed(
             () => formatCurrency(lastWeight.value, 2, symbol),
         );
         const activecount = computed(() => {
-            if (store.state.chain.producers.length > 42) {
+            if (chainStore.producers.length > 42) {
                 return 42;
             } else {
-                return store.state.chain.producers.length;
+                return chainStore.producers.length;
             }
         });
         const lastUpdated = ref<string>('');
         const producerVotes = ref<Name[]>([]);
-        const currentVote = computed(() => store.state.account.vote);
+        const currentVote = computed(() => accountStore.vote);
         const showCpu = ref<boolean>(false);
         const voteChanged = ref<boolean>(false);
         const resetFlag = ref<boolean>(false);
@@ -43,8 +45,8 @@ export default defineComponent({
         const lastStaked = ref<number>(0);
         const stakedAmount = ref<number>(0);
         const accountValid = computed(() => account.value && account.value !== '');
-        const transactionId = ref<string>(store.state.account.TransactionId);
-        const transactionError = ref<unknown>(store.state.account.TransactionError);
+        const transactionId = ref<string>(accountStore.TransactionId);
+        const transactionError = ref<unknown>(accountStore.TransactionError);
         const openTransaction = ref<boolean>(false);
         const showWalletModal = ref<boolean>(false);
         const payrate = ref(0);
@@ -137,7 +139,7 @@ export default defineComponent({
         }
         async function sendVoteTransaction() {
             if (accountValid.value) {
-                await store.dispatch('account/sendVoteTransaction');
+                await accountStore.sendVoteTransaction();
                 openTransaction.value = true;
                 await getVoteWeight();
             } else {
diff --git a/src/components/validators/ValidatorDataTable.vue b/src/components/validators/ValidatorDataTable.vue
index c12828be..30e30ade 100644
--- a/src/components/validators/ValidatorDataTable.vue
+++ b/src/components/validators/ValidatorDataTable.vue
@@ -1,8 +1,9 @@
 <script lang="ts">
 import { defineComponent, computed, ref } from 'vue';
-import { useStore } from 'src/store';
 import { Producer } from 'src/types';
 import { getChain } from 'src/config/ConfigManager';
+import { useAccountStore } from 'src/stores/account';
+import { useChainStore } from 'src/stores/chain';
 
 const chain = getChain();
 
@@ -14,21 +15,22 @@ export default defineComponent({
         top21pay24h: { type: Number, required: true },
     },
     setup(props) {
-        const store = useStore();
+        const accountStore = useAccountStore();
+        const chainStore = useChainStore();
         const symbol = chain.getSystemToken().symbol;
-        const account = computed(() => store.state.account.accountName);
+        const account = computed(() => accountStore.accountName);
         const previousVote = computed(() =>
-            store.state.account.data.voter_info
-                ? store.state.account.data.voter_info.producers.map(vote =>
+            accountStore.data.voter_info
+                ? accountStore.data.voter_info.producers.map(vote =>
                     vote.toString(),
                 )
                 : [],
         );
         const producers = computed(() =>
-            [...store.state.chain.producers].map(val => val.owner),
+            [...chainStore.producers].map(val => val.owner),
         );
         const currentVote = computed(() => {
-            let votes = [...store.state.account.vote];
+            let votes = [...accountStore.vote];
             votes.forEach((vote, index) => {
                 if (!producers.value.includes(vote)) {
                     votes.splice(index, 1);
@@ -38,13 +40,13 @@ export default defineComponent({
         });
         const selection = ref<string[]>([]);
         const HeadProducer = computed(
-            (): string => store.state.chain.head_block_producer,
+            (): string => chainStore.head_block_producer,
         );
         const producerRows = computed(
-            (): Producer[] => store.state.chain.producers || [],
+            (): Producer[] => chainStore.producers || [],
         );
         const producerPay = computed(() => props.top21pay24h);
-        const bpTop21 = computed(() => store.state.chain.producerSchedule);
+        const bpTop21 = computed(() => chainStore.producerSchedule);
 
         const maxSelected = computed(
             () => currentVote.value.length === MAX_VOTE_PRODUCERS,
diff --git a/src/pages/Account.vue b/src/pages/Account.vue
index ab134094..0161fa42 100644
--- a/src/pages/Account.vue
+++ b/src/pages/Account.vue
@@ -9,7 +9,7 @@ import ContractTabs from 'components/contract/ContractTabs.vue';
 import BpVotes from 'components/BpVotes.vue';
 import { api } from 'src/api';
 import { useRoute, useRouter } from 'vue-router';
-import { useStore } from 'src/store';
+import { useAccountStore } from 'src/stores/account';
 import ConfigManager from 'src/config/ConfigManager';
 
 export default defineComponent({
@@ -24,14 +24,14 @@ export default defineComponent({
         BpVotes,
     },
     setup() {
-        const store = useStore();
+        const accountStore = useAccountStore();
         const route = useRoute();
         const router = useRouter();
         const accountPageSettings = computed(() => ConfigManager.get().getCurrentChain().getUiCustomization().accountPageSettings);
 
         const tab = ref<string>((route.query['tab'] as string) || 'transactions');
         const account = computed(() => (route.params.account as string) || '');
-        const abi = computed(() => store.state.account.abi.abi);
+        const abi = computed(() => accountStore.abi.abi);
         const tokenList = ref(api.getTokens(account.value));
 
         onMounted(async () => {
diff --git a/src/pages/Block.vue b/src/pages/Block.vue
index f3378935..32ccd470 100644
--- a/src/pages/Block.vue
+++ b/src/pages/Block.vue
@@ -3,7 +3,7 @@ import { defineComponent, ref, onMounted, watch } from 'vue';
 import TransactionTable from 'src/components/TransactionsTable.vue';
 import BlockCard from 'components/BlockCard.vue';
 import { useRoute, useRouter } from 'vue-router';
-import { api } from 'src/api/index';
+import { api } from 'src/api';
 import { Action, Block } from 'src/types';
 
 export default defineComponent({
@@ -32,7 +32,7 @@ export default defineComponent({
                 }));
                 actions.value = actions.value.concat(act);
             });
-            found.value = block.value ? true : false;
+            found.value = !!block.value;
         });
         watch([tab], () => {
             void router.push({
diff --git a/src/pages/Network.vue b/src/pages/Network.vue
index da2f4018..d08836dc 100644
--- a/src/pages/Network.vue
+++ b/src/pages/Network.vue
@@ -4,8 +4,8 @@ import PriceChart from 'components/PriceChart.vue';
 import TransactionsTable from 'components/TransactionsTable.vue';
 import WorldMap from 'components/WorldMap.vue';
 import MapData from 'components/MapData.vue';
-import { useStore } from 'src/store';
 import ConfigManager from 'src/config/ConfigManager';
+import { useChainStore } from 'src/stores/chain';
 
 enum MapReveal {
     Reveal,
@@ -22,7 +22,7 @@ export default defineComponent({
         MapData,
     },
     setup() {
-        const store = useStore();
+        const chainStore = useChainStore();
         const mapDisplay = ConfigManager.get().getCurrentChain().getMapDisplay();
         const showMap = ref(false);
         const showMapHint = ref(false);
@@ -82,7 +82,7 @@ export default defineComponent({
                 window.addEventListener('wheel', eventTimeout, false);
                 window.addEventListener('keyup', keyUpTimeout, false);
                 window.setInterval(() => {
-                    void store.dispatch('chain/updateBlockData');
+                    void chainStore.updateBlockData();
                 }, 2000);
             }
         });
diff --git a/src/pages/Proposal.vue b/src/pages/Proposal.vue
index a2445d58..5130ac57 100644
--- a/src/pages/Proposal.vue
+++ b/src/pages/Proposal.vue
@@ -3,7 +3,7 @@ import { defineComponent, ref, onMounted, watch, computed } from 'vue';
 import ProposalTable from 'src/components/ProposalTable.vue';
 import { api } from 'src/api';
 import { useRoute, useRouter } from 'vue-router';
-import { useStore } from 'src/store';
+import { useAccountStore } from 'src/stores/account';
 
 export default defineComponent({
     name: 'ProposalPage',
@@ -13,10 +13,10 @@ export default defineComponent({
     setup() {
         const route = useRoute();
         const router = useRouter();
-        const store = useStore();
+        const accountStore = useAccountStore();
         const blockProducers = ref<string[]>([]);
-        const account = computed(() => store.state.account.accountName);
-        const isAuthenticated = computed(() => store.state.account.isAuthenticated);
+        const account = computed(() => accountStore.accountName);
+        const isAuthenticated = computed(() => accountStore.isAuthenticated);
 
         const tab = ref<string>((route.query['tab'] as string) || 'myProposal');
 
diff --git a/src/pages/ProposalItem.vue b/src/pages/ProposalItem.vue
index 4f1b3257..ac25350b 100644
--- a/src/pages/ProposalItem.vue
+++ b/src/pages/ProposalItem.vue
@@ -8,9 +8,9 @@ import { api } from 'src/api';
 import { RequestedApprovals, Error, Proposal } from 'src/types';
 import sha256 from 'fast-sha256';
 import { ABI, ABIDef, Action, Serializer, Transaction } from '@greymass/eosio';
-import { useStore } from 'src/store';
 import { deserializeActionDataFromAbi } from 'src/api/eosio_core';
 import { sleep } from 'src/utils/time';
+import { useAccountStore } from 'src/stores/account';
 
 export default defineComponent({
     name: 'ProposalItem',
@@ -21,11 +21,11 @@ export default defineComponent({
         const route = useRoute();
         const router = useRouter();
         const $q = useQuasar();
-        const store = useStore();
+        const accountStore = useAccountStore();
 
         const { proposalName } = route.params;
-        const account = computed(() => store.state.account.accountName);
-        const isAuthenticated = computed(() => store.state.account.isAuthenticated);
+        const account = computed(() => accountStore.accountName);
+        const isAuthenticated = computed(() => accountStore.isAuthenticated);
         const isLoading = ref(true);
 
         const proposer = ref('');
@@ -319,7 +319,7 @@ export default defineComponent({
             name: 'approve' | 'unapprove' | 'cancel' | 'exec';
             data: unknown;
         }) {
-            const response = await store.state.account.user.signTransaction(
+            const response = await accountStore.user.signTransaction(
                 {
                     actions: [
                         {
diff --git a/src/pages/ProposalNew.vue b/src/pages/ProposalNew.vue
index 54cef71f..7e004ceb 100644
--- a/src/pages/ProposalNew.vue
+++ b/src/pages/ProposalNew.vue
@@ -13,7 +13,7 @@ import { Authorization, ProposalForm, Error } from 'src/types';
 import { api } from 'src/api';
 import { randomEosioName } from 'src/utils/handleEosioName';
 import { useQuasar } from 'quasar';
-import { useStore } from 'src/store';
+import { useAccountStore } from 'src/stores/account';
 
 export default defineComponent({
     name: 'ProposalNew',
@@ -25,10 +25,10 @@ export default defineComponent({
     },
     setup() {
         const router = useRouter();
-        const store = useStore();
+        const accountStore = useAccountStore();
         const $q = useQuasar();
-        const account = computed(() => store.state.account.accountName);
-        const isAuthenticated = computed(() => store.state.account.isAuthenticated);
+        const account = computed(() => accountStore.accountName);
+        const isAuthenticated = computed(() => accountStore.isAuthenticated);
         const actionsTab = ref<'one' | 'batch'>('one');
         const amountOfDaysToExpire = ref(7);
         const blockProducers = ref<Authorization[]>([]);
@@ -153,7 +153,7 @@ export default defineComponent({
                     data.trx.actions[i].data = hexData as { [key: string]: string | number; };
                 }
 
-                const transaction = await store.state.account.user.signTransaction(
+                const transaction = await accountStore.user.signTransaction(
                     {
                         actions: [
                             {
@@ -174,7 +174,7 @@ export default defineComponent({
                         expireSeconds: 30,
                     },
                 );
-                if (store.state.account.autoLogin !== 'cleos') {
+                if (accountStore.autoLogin !== 'cleos') {
                     success.showModal = true;
                 }
 
diff --git a/src/pages/TransactionPage.vue b/src/pages/TransactionPage.vue
index de07cace..4a174b08 100644
--- a/src/pages/TransactionPage.vue
+++ b/src/pages/TransactionPage.vue
@@ -4,19 +4,19 @@ import TransactionsTable from 'src/components/TransactionsTable.vue';
 import TransactionCard from 'components/transaction/TransactionCard.vue';
 import TraceTree from 'components/transaction/TraceTree.vue';
 import JsonViewer from 'vue-json-viewer';
-import { useStore } from 'src/store';
 import { useRoute, useRouter } from 'vue-router';
+import { useTransactionStore } from 'src/stores/transaction';
 
 export default defineComponent({
     name: 'TransactionPage',
     setup() {
-        const store = useStore();
+        const transactionStore = useTransactionStore();
         const route = useRoute();
         const router = useRouter();
         const tab = ref<string>((route.query['tab'] as string) || 'actions');
         onMounted(() => {
-            store.commit('transaction/setTransactionId', route.params.transaction);
-            void store.dispatch('transaction/updateTransaction');
+            transactionStore.setTransactionId(route.params.transaction as string);
+            void transactionStore.updateTransaction();
         });
         watch([tab], () => {
             void router.push({
@@ -29,9 +29,9 @@ export default defineComponent({
         return {
             tab,
             transaction: route.params.transaction,
-            actionCount: computed(() => store.state.transaction.actionCount),
-            jsonTransaction: computed(() => store.state.transaction.transaction),
-            found: computed(() => store.state.transaction.transactionFound),
+            actionCount: computed(() => transactionStore.actionCount),
+            jsonTransaction: computed(() => transactionStore.transaction),
+            found: computed(() => transactionStore.transactionFound),
         };
     },
     components: {
diff --git a/src/pages/Vote.vue b/src/pages/Vote.vue
index c850be6c..30a43612 100644
--- a/src/pages/Vote.vue
+++ b/src/pages/Vote.vue
@@ -1,24 +1,29 @@
 <script lang="ts">
 import ValidatorData from 'src/components/validators/ValidatorData.vue';
 import { defineComponent, onMounted } from 'vue';
-import { useStore } from 'src/store';
 import { api } from 'src/api';
+import { useAccountStore } from 'src/stores/account';
+import { useChainStore } from 'src/stores/chain';
 export default defineComponent({
     name: 'VotePage',
     components: { ValidatorData },
     setup() {
-        const store = useStore();
+        const accountStore = useAccountStore();
+        const chainStore = useChainStore();
+
         onMounted(async () => {
             if (
-                !store.state.account.data.voter_info &&
-                store.state.account.accountName
+                !accountStore.data.voter_info &&
+                accountStore.accountName
             ) {
-                const data = await api.getAccount(store.state.account.accountName);
-                store.commit('account/setAccountData', data);
+                const data = await api.getAccount(accountStore.accountName);
+                accountStore.setAccountData(data);
             }
-            await store.dispatch('chain/updateBpList');
+
+            await chainStore.updateBpList();
+
             window.setInterval(() => {
-                void store.dispatch('chain/updateBlockData');
+                void chainStore.updateBlockData();
             }, 2000);
         });
     },
diff --git a/src/router/index.ts b/src/router/index.ts
index 52c66058..2b00703e 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -1,6 +1,6 @@
 import { route } from 'quasar/wrappers';
 import { createRouter, createWebHistory } from 'vue-router';
-import { StateInterface } from 'src/store';
+import { StateInterface } from 'src/stores';
 import routes from 'src/router/routes';
 import ConfigManager from 'src/config/ConfigManager';
 import { ComputedRef, computed, reactive } from 'vue';
diff --git a/src/store/account/actions.ts b/src/store/account/actions.ts
deleted file mode 100644
index 93e759cd..00000000
--- a/src/store/account/actions.ts
+++ /dev/null
@@ -1,645 +0,0 @@
-import { Authenticator } from 'universal-authenticator-library';
-import { ActionTree } from 'vuex';
-import { StateInterface } from 'src/store/index';
-import { AccountStateInterface } from 'src/store/account/state';
-import { api } from 'src/api/index';
-import { Action, GetTableRowsParams, RexbalRows, RexPoolRows } from 'src/types';
-import { TableIndexType } from 'src/types/Api';
-import { getChain } from 'src/config/ConfigManager';
-import { FuelUserWrapper } from 'src/api/fuel';
-import { formatCurrency } from 'src/utils/string-utils';
-
-const chain = getChain();
-const symbol = chain.getSystemToken().symbol;
-
-export const actions: ActionTree<AccountStateInterface, StateInterface> = {
-    async login({ commit }, { account, authenticator }) {
-        await (authenticator as Authenticator).init();
-        if (!account) {
-            const requestAccount = await (
-                authenticator as Authenticator
-            ).shouldRequestAccountName();
-            if (requestAccount) {
-                commit('setRequestAccount', true);
-                return;
-            }
-        }
-        const users = await (authenticator as Authenticator).login();
-        if (users?.length) {
-            const account = new FuelUserWrapper(users[0]);
-            const permission = (account as unknown as { requestPermission: string })
-                .requestPermission;
-            const accountName = await account.getAccountName();
-
-            commit('setAccountPermission', permission || 'active');
-            commit('setUser', account);
-            commit('setIsAuthenticated', true);
-            commit('setAccountName', accountName);
-            commit('setChainId', (authenticator as Authenticator).chains[0].chainId);
-
-            localStorage.setItem(`account_${(authenticator as Authenticator).chains[0].chainId}`, accountName);
-            localStorage.setItem(
-                `autoLogin_${(authenticator as Authenticator).chains[0].chainId}`,
-                (authenticator as Authenticator).getName(),
-            );
-        }
-    },
-    logout({ commit, state }) {
-        commit('setIsAuthenticated', false);
-        commit('setAccountName', '');
-        commit('setUser', null);
-
-        localStorage.removeItem(`account_${state.chainId}`);
-        localStorage.removeItem(`autoLogin_${state.chainId}`);
-    },
-    async loadAccountData({ commit, state }) {
-        try {
-            const data = await api.getAccount(state.accountName);
-            commit('setAccountData', data);
-        } catch (e) {
-            return;
-        }
-    },
-    async updateRexData({ commit }, { account }) {
-        const paramsrexbal = {
-            code: 'eosio',
-            limit: '2',
-            lower_bound: account as TableIndexType,
-            scope: 'eosio',
-            table: 'rexbal',
-            reverse: false,
-            upper_bound: account as TableIndexType,
-        } as GetTableRowsParams;
-        const rexbalRows = (await api.getTableRows(paramsrexbal)) as RexbalRows;
-        const paramsrexpool = {
-            code: 'eosio',
-            scope: 'eosio',
-            table: 'rexpool',
-            json: true,
-            reverse: false,
-        } as GetTableRowsParams;
-        const rexpool = ((await api.getTableRows(paramsrexpool)) as RexPoolRows)
-            .rows[0];
-        const paramsrexfund = {
-            code: 'eosio',
-            limit: '1',
-            lower_bound: account as TableIndexType,
-            scope: 'eosio',
-            table: 'rexfund',
-            reverse: false,
-            upper_bound: account as TableIndexType,
-        } as GetTableRowsParams;
-        const rexfund = (
-            (await api.getTableRows(paramsrexfund)) as {
-                rows: {
-                owner: string;
-                balance: string;
-                }[];
-            }
-        ).rows[0];
-        const rexFundBalance =
-            rexfund?.balance ? Number(rexfund.balance.split(' ')[0]) : 0.0;
-        commit('setRexFund', rexFundBalance);
-        const rexbal = rexbalRows.rows[0];
-        const rexBalance =
-            rexbal && rexbal.rex_balance
-                ? parseFloat(rexbal.rex_balance.split(' ')[0])
-                : 0;
-        const totalRex = Number(rexpool.total_rex.split(' ')[0]);
-        const totalLendable = Number(rexpool.total_lendable.split(' ')[0]);
-        const tlosRexRatio = totalRex > 0 ? totalLendable / totalRex : 1;
-        commit('setTlosRexRatio', tlosRexRatio);
-        let coreBalance = totalRex > 0 ? tlosRexRatio * rexBalance : 0.0;
-        coreBalance += rexFundBalance;
-
-        let savingsRex = 0;
-        let maturedRex = rexbal
-            ? tlosRexRatio * (Number(rexbal.matured_rex) / 10000)
-            : 0;
-        let maturingRex = 0;
-        if (rexbal && rexbal.rex_maturities && rexbal.rex_maturities.length > 0) {
-            const thisYear = new Date().getFullYear();
-            const now = new Date().getTime();
-            rexbal.rex_maturities.forEach((maturity) => {
-                const maturityYear = new Date(maturity.first).getFullYear();
-                const maturityTime = new Date(maturity.first).getTime();
-                if (maturityYear - thisYear > 1) {
-                    savingsRex = tlosRexRatio * (Number(maturity.second) / 10000);
-                } else if (maturityTime - now < 0) {
-                    maturedRex += tlosRexRatio * (Number(maturity.second) / 10000);
-                } else {
-                    maturingRex = tlosRexRatio * (Number(maturity.second) / 10000);
-                }
-            });
-        }
-
-        if (rexbalRows.rows.length > 0) {
-            commit('setRexbal', {
-                rexbal: rexbalRows.rows[0],
-                coreBalance,
-                maturingRex,
-                savingsRex,
-                maturedRex,
-            });
-        }
-        const filter = [
-            'eosio:sellrex',
-            'eosio:buyrex',
-            'eosio:deposit',
-            'eosio:withdraw',
-            'eosio:unstaketorex',
-            'eosio:cnclrexorder',
-            'eosio:rentcpu',
-            'eosio:rentnet',
-            'eosio:fundcpuloan',
-            'eosio:fundnetloan',
-            'eosio:defcpuloan',
-            'eosio:defnetloan',
-            'eosio:updaterex',
-            'eosio:consolidate',
-            'eosio:closerex',
-            'eosio:mvfrsavings',
-            'eosio:mvtosavings',
-            'eosio:rexexec',
-        ].join(',');
-        const rexActions = (await api.getActions(account, filter)).actions;
-        commit('setRexActions', rexActions);
-    },
-    async sendAction({ state, dispatch }, { account, data, name, actor, permission }) {
-        const actions = [
-            {
-                account: account as string ?? state.abi.account_name,
-                name: name as string,
-                authorization: [
-                    {
-                        actor: actor as string ?? state.accountName,
-                        permission: permission as string ?? state.accountPermission,
-                    },
-                ],
-                data: data as unknown,
-            },
-        ];
-        return dispatch('sendTransaction', actions);
-    },
-    async sendTransaction({ commit, state }, actions: Action[]) {
-        let transaction = null;
-        try {
-            transaction = await state.user.signTransaction(
-                {
-                    actions,
-                },
-                {
-                    blocksBehind: 3,
-                    expireSeconds: 180,
-                },
-            );
-            commit('setTransaction', transaction.transactionId);
-        } catch (e) {
-            console.error(e);
-            commit('setTransactionError', e);
-        }
-        return transaction;
-    },
-    async stakeRex({ commit, dispatch, state }, { amount }) {
-        let transaction = null;
-        const quantityStr = formatCurrency(amount, 4, symbol, true);
-        const actions = [
-            {
-                account: 'eosio',
-                name: 'deposit',
-                authorization: [
-                    {
-                        actor: state.accountName,
-                        permission: state.accountPermission,
-                    },
-                ],
-                data: {
-                    owner: state.accountName,
-                    amount: quantityStr,
-                },
-            },
-            {
-                account: 'eosio',
-                name: 'buyrex',
-                authorization: [
-                    {
-                        actor: state.accountName,
-                        permission: state.accountPermission,
-                    },
-                ],
-                data: {
-                    from: state.accountName,
-                    amount: quantityStr,
-                },
-            },
-        ];
-        try {
-            transaction = await state.user.signTransaction(
-                {
-                    actions,
-                },
-                {
-                    blocksBehind: 3,
-                    expireSeconds: 180,
-                },
-            );
-            commit('setTransaction', transaction.transactionId);
-            void dispatch('loadAccountData');
-            void dispatch('updateRexData', { account: state.accountName });
-        } catch (e) {
-            commit('setTransactionError', e);
-        }
-    },
-    async unstakeRex({ commit, dispatch, state }, { amount }) {
-        let transaction = null;
-        const tokenRexBalance = state.rexbal.rex_balance
-            ? Number(state.rexbal.rex_balance.split(' ')[0])
-            : 0;
-        if (tokenRexBalance === 0) {
-            return;
-        }
-        const quantityStr = formatCurrency(amount, 4, symbol, true);
-        const rexToUnstake = formatCurrency(+amount / state.tlosRexRatio, 4, null, true);
-
-        //   TODO check maturities
-        const actions = [
-            {
-                account: 'eosio',
-                name: 'sellrex',
-                authorization: [
-                    {
-                        actor: state.accountName,
-                        permission: state.accountPermission,
-                    },
-                ],
-                data: {
-                    from: state.accountName,
-                    rex: `${rexToUnstake} REX`,
-                },
-            },
-            {
-                account: 'eosio',
-                name: 'withdraw',
-                authorization: [
-                    {
-                        actor: state.accountName,
-                        permission: state.accountPermission,
-                    },
-                ],
-                data: {
-                    owner: state.accountName,
-                    amount: quantityStr,
-                },
-            },
-        ];
-        try {
-            transaction = await state.user.signTransaction(
-                {
-                    actions,
-                },
-                {
-                    blocksBehind: 3,
-                    expireSeconds: 180,
-                },
-            );
-            commit('setTransaction', transaction.transactionId);
-            void dispatch('loadAccountData');
-            void dispatch('updateRexData', { account: state.accountName });
-        } catch (e) {
-            commit('setTransactionError', e);
-        }
-    },
-    async unstakeRexFund({ commit, state }, { amount }) {
-        let transaction = null;
-        const quantityStr = formatCurrency(amount, 4, symbol, true);
-
-        const actions = [
-            {
-                account: 'eosio',
-                name: 'withdraw',
-                authorization: [
-                    {
-                        actor: state.accountName,
-                        permission: state.accountPermission,
-                    },
-                ],
-                data: {
-                    owner: state.accountName,
-                    amount: quantityStr,
-                },
-            },
-        ];
-        try {
-            transaction = await state.user.signTransaction(
-                {
-                    actions,
-                },
-                {
-                    blocksBehind: 3,
-                    expireSeconds: 180,
-                },
-            );
-            commit('setTransaction', transaction.transactionId);
-        } catch (e) {
-            commit('setTransactionError', e);
-        }
-    },
-    async stakeCpuNetRex({ commit, dispatch, state }, { cpuAmount, netAmount }) {
-        let transaction = null;
-        const quantityStrCPU = formatCurrency(cpuAmount, 4, symbol, true);
-        const quantityStrNET = formatCurrency(netAmount, 4, symbol, true);
-        const actions = [
-            {
-                account: 'eosio',
-                name: 'unstaketorex',
-                authorization: [
-                    {
-                        actor: state.accountName,
-                        permission: state.accountPermission,
-                    },
-                ],
-                data: {
-                    owner: state.accountName,
-                    receiver: state.accountName,
-                    from_net: quantityStrNET,
-                    from_cpu: quantityStrCPU,
-                },
-            },
-        ];
-        try {
-            transaction = await state.user.signTransaction(
-                {
-                    actions,
-                },
-                {
-                    blocksBehind: 3,
-                    expireSeconds: 180,
-                },
-            );
-            commit('setTransaction', transaction.transactionId);
-            void dispatch('loadAccountData');
-            void dispatch('updateRexData', { account: state.accountName });
-        } catch (e) {
-            commit('setTransactionError', e);
-        }
-    },
-    async unstakeCpuNetRex({ commit, dispatch, state }, { cpuAmount, netAmount }) {
-        let transaction = null;
-        const quantityStrCPU = formatCurrency(cpuAmount, 4, symbol, true);
-        const quantityStrNET = formatCurrency(netAmount, 4, symbol, true);
-        const actions = [
-            {
-                account: 'eosio',
-                name: 'stakefromrex',
-                authorization: [
-                    {
-                        actor: state.accountName,
-                        permission: state.accountPermission,
-                    },
-                ],
-                data: {
-                    owner: state.accountName,
-                    receiver: state.accountName,
-                    from_net: quantityStrNET,
-                    from_cpu: quantityStrCPU,
-                },
-            },
-        ];
-        try {
-            transaction = await state.user.signTransaction(
-                {
-                    actions,
-                },
-                {
-                    blocksBehind: 3,
-                    expireSeconds: 180,
-                },
-            );
-            commit('setTransaction', transaction.transactionId);
-            void dispatch('loadAccountData');
-            void dispatch('updateRexData', { account: state.accountName });
-        } catch (e) {
-            commit('setTransactionError', e);
-        }
-    },
-    resetTransaction({ commit }) {
-        commit('setTransaction', '');
-        commit('setTransactionError', '');
-    },
-    async updateABI({ commit }, account: string) {
-        commit('setABI', {});
-        const abi = await api.getABI(account);
-        commit('setABI', abi);
-    },
-    async sendVoteTransaction({ commit, state }) {
-        let transaction = null;
-        const actions = [
-            {
-                account: 'eosio',
-                name: 'voteproducer',
-                authorization: [
-                    {
-                        actor: state.accountName,
-                        permission: state.accountPermission,
-                    },
-                ],
-                data: {
-                    voter: state.accountName,
-                    proxy: '',
-                    producers: state.vote,
-                },
-            },
-        ];
-        try {
-            transaction = await state.user.signTransaction(
-                {
-                    actions,
-                },
-                {
-                    blocksBehind: 3,
-                    expireSeconds: 180,
-                },
-            );
-            commit('setTransaction', transaction.transactionId);
-        } catch (e) {
-            commit('setTransactionError', e);
-        }
-    },
-    async buyRam({ commit, dispatch, state }, { amount, receivingAccount }) {
-        let transaction = null;
-        const actions = [
-            {
-                account: 'eosio',
-                name: 'buyram',
-                authorization: [
-                    {
-                        actor: state.accountName,
-                        permission: state.accountPermission,
-                    },
-                ],
-                data: {
-                    payer: state.accountName,
-                    receiver: receivingAccount as string,
-                    quant: amount as string,
-                },
-            },
-        ];
-        try {
-            transaction = await state.user.signTransaction(
-                {
-                    actions,
-                },
-                {
-                    blocksBehind: 3,
-                    expireSeconds: 180,
-                },
-            );
-            commit('setTransaction', transaction.transactionId);
-            void dispatch('loadAccountData');
-        } catch (e) {
-            commit('setTransactionError', e);
-        }
-    },
-    async buyRamBytes({ commit, dispatch, state }, { amount, receivingAccount }) {
-        let transaction = null;
-        const actions = [
-            {
-                account: 'eosio',
-                name: 'buyrambytes',
-                authorization: [
-                    {
-                        actor: state.accountName,
-                        permission: state.accountPermission,
-                    },
-                ],
-                data: {
-                    payer: state.accountName,
-                    receiver: receivingAccount as string,
-                    bytes: amount as string,
-                },
-            },
-        ];
-        try {
-            transaction = await state.user.signTransaction(
-                {
-                    actions,
-                },
-                {
-                    blocksBehind: 3,
-                    expireSeconds: 180,
-                },
-            );
-            commit('setTransaction', transaction.transactionId);
-            void dispatch('loadAccountData');
-        } catch (e) {
-            commit('setTransactionError', e);
-        }
-    },
-    async sellRam({ commit, dispatch, state }, { amount }) {
-        let transaction = null;
-        const actions = [
-            {
-                account: 'eosio',
-                name: 'sellram',
-                authorization: [
-                    {
-                        actor: state.accountName,
-                        permission: state.accountPermission,
-                    },
-                ],
-                data: {
-                    account: state.accountName,
-                    bytes: amount as string,
-                },
-            },
-        ];
-        try {
-            transaction = await state.user.signTransaction(
-                {
-                    actions,
-                },
-                {
-                    blocksBehind: 3,
-                    expireSeconds: 180,
-                },
-            );
-            commit('setTransaction', transaction.transactionId);
-            void dispatch('loadAccountData');
-        } catch (e) {
-            commit('setTransactionError', e);
-        }
-    },
-    async moveToSavings({ commit, dispatch, state }, { amount }) {
-        let transaction = null;
-        const rexToUnstake = formatCurrency((+amount / state.tlosRexRatio), 4, 'REX', true);
-        const actions = [
-            {
-                account: 'eosio',
-                name: 'mvtosavings',
-                authorization: [
-                    {
-                        actor: state.accountName,
-                        permission: state.accountPermission,
-                    },
-                ],
-                data: {
-                    owner: state.accountName,
-                    rex: rexToUnstake,
-                },
-            },
-        ];
-        try {
-            transaction = await state.user.signTransaction(
-                {
-                    actions,
-                },
-                {
-                    blocksBehind: 3,
-                    expireSeconds: 180,
-                },
-            );
-            commit('setTransaction', transaction.transactionId);
-            void dispatch('loadAccountData');
-            void dispatch('updateRexData', { account: state.accountName });
-        } catch (e) {
-            commit('setTransactionError', e);
-        }
-    },
-    async moveFromSavings({ commit, dispatch, state }, { amount }) {
-        let transaction = null;
-        const rexToUnstake = formatCurrency((+amount / state.tlosRexRatio), 4, 'REX', true);
-
-        const actions = [
-            {
-                account: 'eosio',
-                name: 'mvfrsavings',
-                authorization: [
-                    {
-                        actor: state.accountName,
-                        permission: state.accountPermission,
-                    },
-                ],
-                data: {
-                    owner: state.accountName,
-                    rex: rexToUnstake,
-                },
-            },
-        ];
-        try {
-            transaction = await state.user.signTransaction(
-                {
-                    actions,
-                },
-                {
-                    blocksBehind: 3,
-                    expireSeconds: 180,
-                },
-            );
-            commit('setTransaction', transaction.transactionId);
-            void dispatch('loadAccountData');
-            void dispatch('updateRexData', { account: state.accountName });
-        } catch (e) {
-            commit('setTransactionError', e);
-        }
-    },
-};
diff --git a/src/store/account/getters.ts b/src/store/account/getters.ts
deleted file mode 100644
index ca9ff56d..00000000
--- a/src/store/account/getters.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { API } from '@greymass/eosio';
-import { User } from 'universal-authenticator-library';
-import { GetterTree } from 'vuex';
-import { StateInterface } from 'src/store/index';
-import { AccountStateInterface } from 'src/store/account/state';
-
-export const getters: GetterTree<AccountStateInterface, StateInterface> = {
-    account(state): AccountStateInterface {
-        return state;
-    },
-    isAuthenticated(state): boolean {
-        return state.isAuthenticated;
-    },
-    accountName(state): string {
-        return state.accountName;
-    },
-    getAccountData(state): API.v1.AccountObject {
-        return state.data;
-    },
-    getUser(state): User {
-        return state.user;
-    },
-};
diff --git a/src/store/account/index.ts b/src/store/account/index.ts
deleted file mode 100644
index 7a942fe8..00000000
--- a/src/store/account/index.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { Module } from 'vuex';
-import { StateInterface } from 'src/store/index';
-import { state, AccountStateInterface } from 'src/store/account/state';
-import { getters } from 'src/store/account/getters';
-import { mutations } from 'src/store/account/mutations';
-import { actions } from 'src/store/account/actions';
-
-export const account: Module<AccountStateInterface, StateInterface> = {
-    namespaced: true,
-    getters,
-    mutations,
-    actions,
-    state,
-};
diff --git a/src/store/account/mutations.ts b/src/store/account/mutations.ts
deleted file mode 100644
index 656f47fb..00000000
--- a/src/store/account/mutations.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-import { MutationTree } from 'vuex';
-import { AccountStateInterface } from 'src/store/account/state';
-import { Action, Rexbal, ABI } from 'src/types';
-import { User } from 'universal-authenticator-library';
-import { markRaw } from 'vue';
-
-import { getChain } from 'src/config/ConfigManager';
-import { API } from '@greymass/eosio';
-import { formatCurrency } from 'src/utils/string-utils';
-
-const symbol = getChain().getSystemToken().symbol;
-
-export const mutations: MutationTree<AccountStateInterface> = {
-    setUser(state: AccountStateInterface, user: User) {
-        state.user = user ? markRaw(user) : user;
-    },
-    setAccountName(state: AccountStateInterface, accountName: string) {
-        state.accountName = accountName;
-    },
-    setAutoLogin(state: AccountStateInterface, status: string) {
-        state.autoLogin = status;
-    },
-    setAccountData(
-        state: AccountStateInterface,
-        AccountData: API.v1.AccountObject,
-    ) {
-        state.data = AccountData;
-        state.vote =
-      AccountData?.voter_info?.producers.map(vote => vote.toString()) || [];
-    },
-    setTransaction(state: AccountStateInterface, TransactionId: string) {
-        state.TransactionId = TransactionId;
-    },
-    setTransactionError(state: AccountStateInterface, TransactionError: unknown) {
-        state.TransactionError = TransactionError;
-    },
-    setRexActions(state: AccountStateInterface, actions: Action[]) {
-        state.rexActions = actions;
-    },
-    setRexbal(
-        state: AccountStateInterface,
-        params: {
-      rexbal: Rexbal;
-      coreBalance: number;
-      maturingRex: number;
-      savingsRex: number;
-      maturedRex: number;
-    },
-    ) {
-        state.rexbal = params.rexbal;
-        state.coreRexBalance = formatCurrency(params.coreBalance, 4, symbol);
-        state.maturedRex = formatCurrency(params.maturedRex, 4, symbol);
-        state.maturingRex = formatCurrency(params.maturingRex, 4, symbol);
-        state.savingsRex = formatCurrency(params.savingsRex, 4, symbol);
-    },
-    setVote(state: AccountStateInterface, vote: string[]) {
-        state.vote = vote.sort();
-    },
-    setABI(state: AccountStateInterface, abi: ABI) {
-        state.abi = abi;
-    },
-    setTlosRexRatio(state: AccountStateInterface, ratio: number) {
-        state.tlosRexRatio = ratio;
-    },
-    setAccountPermission(state: AccountStateInterface, permission: string) {
-        state.accountPermission = permission;
-    },
-    setIsAuthenticated(state: AccountStateInterface, authenticated: boolean) {
-        state.isAuthenticated = authenticated;
-    },
-    setRexFund(state: AccountStateInterface, fund: number) {
-        state.rexfund = fund;
-    },
-    setChainId(state: AccountStateInterface, id: string) {
-        state.chainId = id;
-    },
-};
diff --git a/src/store/account/state.ts b/src/store/account/state.ts
deleted file mode 100644
index 97349134..00000000
--- a/src/store/account/state.ts
+++ /dev/null
@@ -1,86 +0,0 @@
-import { Authorization, Action, Rexbal, ABI } from 'src/types';
-import { getChain } from 'src/config/ConfigManager';
-import { User } from 'universal-authenticator-library';
-import { API, UInt64 } from '@greymass/eosio';
-
-const chain = getChain();
-
-export interface AccountStateInterface {
-  loading: unknown;
-  accountName: string;
-  accountPermission: string;
-  user: User;
-  autoLogin: unknown;
-  isAuthenticated: boolean;
-  linkedAccounts: Array<unknown>;
-  data: API.v1.AccountObject;
-  authorization: Authorization[];
-  rexActions: Action[];
-  TransactionId: string;
-  TransactionError: unknown;
-  rexbal: Rexbal;
-  vote: string[];
-  abi: ABI;
-  coreRexBalance: string;
-  maturingRex: string;
-  maturedRex: string;
-  savingsRex: string;
-  tlosRexRatio: number;
-  rexfund: number;
-  chainId: string;
-}
-
-export function state(): AccountStateInterface {
-    return {
-        loading: false,
-        accountName: '',
-        accountPermission: 'active',
-        user: null,
-        autoLogin: null,
-        isAuthenticated: false,
-        linkedAccounts: [],
-        data: {
-            account_name: '',
-            /** Highest block number on the chain */
-            // head_block_num: UInt32;
-            // /** Highest block unix timestamp. */
-            // head_block_time: TimePoint;
-            // /** Indicator of if this is a privileged system account */
-            // privileged: boolean;
-            // /** Last update to accounts contract as unix timestamp. */
-            // last_code_update: TimePoint;
-            // /** Account created as unix timestamp. */
-            // created: TimePoint;
-            /** Account core token balance */
-            core_liquid_balance: UInt64.from(0),
-            // ram_quota: Int64;
-            // net_weight: Int64;
-            // cpu_weight: Int64;
-            // net_limit: AccountResourceLimit;
-            // cpu_limit: AccountResourceLimit;
-            // ram_usage: UInt64;
-            // permissions: AccountPermission[];
-            // total_resources: AccountTotalResources;
-            // self_delegated_bandwidth?: AccountSelfDelegatedBandwidth;
-            // refund_request?: AccountRefundRequest;
-            // voter_info?: AccountVoterInfo;
-            // rex_info?: AccountRexInfo;
-            // getPermission(permission: NameType): AccountPermission;
-        } as unknown as API.v1.AccountObject,
-
-        authorization: [],
-        rexActions: [],
-        TransactionId: '',
-        TransactionError: '',
-        rexbal: {} as Rexbal,
-        vote: [],
-        abi: { abi: null } as ABI,
-        coreRexBalance: `0 ${chain.getSystemToken().symbol}`,
-        maturingRex: `0 ${chain.getSystemToken().symbol}`,
-        maturedRex: `0 ${chain.getSystemToken().symbol}`,
-        savingsRex: `0 ${chain.getSystemToken().symbol}`,
-        tlosRexRatio: 1,
-        rexfund: 0,
-        chainId: '',
-    };
-}
diff --git a/src/store/antelope.store.ts b/src/store/antelope.store.ts
deleted file mode 100644
index ffc13913..00000000
--- a/src/store/antelope.store.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import { StateInterface, useStore } from 'src/store';
-import { ResourcesAPI } from 'src/store/resources';
-import { DelegatedResources } from 'src/store/resources/state';
-import { Ref } from 'vue';
-import { CommitOptions, DispatchOptions } from 'vuex';
-
-interface GettersInterface {
-    'resources/getDelegatedToOthers': DelegatedResources[];
-    'resources/getDelegatedFromOthers': Ref<DelegatedResources | null>;
-    'resources/getDelegatedToOthersAggregated': number;
-    'resources/getSelfStaked': DelegatedResources | null;
-    'resources/getLoading': string[];
-    'resources/isLoading': (name: string) => boolean;
-}
-
-export interface AntelopeStore {
-    resources: ResourcesAPI;
-    state: StateInterface;
-    dispatch: (t: string, p?: unknown, o?: DispatchOptions) => Promise<unknown>;
-    commit: (type: string, payload?: unknown, options?: CommitOptions) => void;
-}
-
-export function useAntelopeStore(): AntelopeStore {
-    const store = useStore();
-    const state = store.state;
-    const getters = store.getters as GettersInterface;
-    return {
-        resources: {
-            getDelegatedToOthers: (): DelegatedResources[] => getters['resources/getDelegatedToOthers'],
-            getDelegatedFromOthers: ():Ref<DelegatedResources> => getters['resources/getDelegatedFromOthers'],
-            getSelfStaked: ():DelegatedResources => getters['resources/getSelfStaked'],
-            getDelegatedToOthersAggregated: ():number => getters['resources/getDelegatedToOthersAggregated'],
-            getLoading: ():string[] => getters['resources/getLoading'],
-            isLoading: (funcname: string) => getters['resources/isLoading'](funcname),
-
-            // actions
-            updateResources: (payload: {account?: string, force?:boolean}) => store.dispatch('resources/updateResources', payload),
-            updateSelfStaked: (account: string) => store.dispatch('resources/updateSelfStaked', account),
-            updateDelegatedToOthers: (account: string) => store.dispatch('resources/updateDelegatedToOthers', account),
-            delegateResources: (order: DelegatedResources) => store.dispatch('resources/delegateResources', order),
-            undelegateResources: (order: DelegatedResources) => store.dispatch('resources/undelegateResources', order),
-        },
-        state,
-        dispatch: ((type: string, payload?: unknown, options?: DispatchOptions): Promise<unknown> =>
-            store.dispatch(type, payload, options)),
-        commit: ((type: string, payload?: unknown, options?: CommitOptions): void =>
-            store.commit(type, payload, options)),
-    };
-}
diff --git a/src/store/chain/actions.ts b/src/store/chain/actions.ts
deleted file mode 100644
index 28e195b1..00000000
--- a/src/store/chain/actions.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-import { ActionTree } from 'vuex';
-import { StateInterface } from 'src/store/index';
-import { ChainStateInterface } from 'src/store/chain/state';
-import { BP, GetTableRowsParams } from 'src/types';
-import axios from 'axios';
-import { api } from 'src/api/index';
-import { Chain } from 'src/types/Chain';
-import { getChain } from 'src/config/ConfigManager';
-import { formatCurrency } from 'src/utils/string-utils';
-
-const chain: Chain = getChain();
-
-export const actions: ActionTree<ChainStateInterface, StateInterface> = {
-    async updateBpList({ commit }) {
-        try {
-            const producerSchedule = (await api.getSchedule()).active.producers;
-            const schedule = producerSchedule.map(el => el.producer_name);
-            commit('setProducerSchedule', schedule);
-            const objectList = await axios.get(chain.getS3ProducerBucket());
-            const parser = new DOMParser();
-            const contentsArray = parser
-                .parseFromString(objectList.data, 'text/xml')
-                .getElementsByTagName('Contents');
-            const lastEntry = contentsArray[contentsArray.length - 1];
-            const lastKey = lastEntry.childNodes[0].textContent;
-            const producerData: BP[] = (
-        await axios.get(`${chain.getS3ProducerBucket()}/${lastKey}`)
-      ).data as BP[];
-            let producers = (await api.getProducers()).rows;
-            producers = producers.filter(producer => producer.is_active === 1);
-            producers = producers.map((data) => {
-                const bp = producerData.find(
-                    producer => producer.owner === data.owner,
-                );
-                if (bp) {
-                    try {
-                        return {
-                            ...data,
-                            name: bp.org.candidate_name,
-                            location: bp.org.location.name,
-                        };
-                    } catch (error) {
-                        return data;
-                    }
-                } else {
-                    return {
-                        ...data,
-                        name: data.owner,
-                        location: '',
-                    };
-                }
-            });
-            producerData.sort((a, b) => b.total_votes - a.total_votes);
-            producers.sort((a, b) => b.total_votes - a.total_votes);
-            commit('setProducers', producers);
-            commit('setBpList', producerData);
-        } catch (err) {
-            console.error(err);
-        }
-    },
-    async updateBlockData({ commit }) {
-        try {
-            const info = await api.getInfo();
-            commit('setHead_block_num', info.head_block_num);
-            commit('setLIB', info.last_irreversible_block_num);
-            commit('setHead_block_producer', info.head_block_producer);
-        } catch (err) {
-            console.error(err);
-        }
-    },
-    async updateRamPrice({ commit }) {
-        try {
-            const paramsRammarket = {
-                code: 'eosio',
-                scope: 'eosio',
-                table: 'rammarket',
-                json: true,
-            } as GetTableRowsParams;
-            const rammarket = (
-        (await api.getTableRows(paramsRammarket)) as {
-          rows: {
-            supply: string;
-            base: { balance: string; weight: string };
-            quote: { balance: string; weight: string };
-          }[];
-        }
-            ).rows[0];
-            const base = Number(rammarket.base.balance.split(' ')[0]);
-            const quote = Number(rammarket.quote.balance.split(' ')[0]);
-            const price = (quote * 1000) / (base - 1000);
-            // add 0.5% fee to the price
-            const formattedPrice = formatCurrency((price / 0.995), 4, null, true);
-
-            commit('setRamPrice', formattedPrice);
-        } catch (err) {
-            console.error(err);
-        }
-    },
-};
diff --git a/src/store/chain/getters.ts b/src/store/chain/getters.ts
deleted file mode 100644
index 0ff06315..00000000
--- a/src/store/chain/getters.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { Token } from 'src/types';
-import { GetterTree } from 'vuex';
-import { StateInterface } from 'src/store/index';
-import { ChainStateInterface } from 'src/store/chain/state';
-
-export const getters: GetterTree<ChainStateInterface, StateInterface> = {
-    getToken({ token }): Token {
-        return token;
-    },
-};
diff --git a/src/store/chain/index.ts b/src/store/chain/index.ts
deleted file mode 100644
index e9c020ce..00000000
--- a/src/store/chain/index.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { Module } from 'vuex';
-import { StateInterface } from 'src/store/index';
-import { state, ChainStateInterface } from 'src/store/chain/state';
-import { getters } from 'src/store/chain/getters';
-import { mutations } from 'src/store/chain/mutations';
-import { actions } from 'src/store/chain/actions';
-
-export const chain: Module<ChainStateInterface, StateInterface> = {
-    namespaced: true,
-    actions,
-    getters,
-    mutations,
-    state,
-};
diff --git a/src/store/chain/mutations.ts b/src/store/chain/mutations.ts
deleted file mode 100644
index daca5b13..00000000
--- a/src/store/chain/mutations.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { Token, BP, Producer } from 'src/types';
-import { MutationTree } from 'vuex';
-import { ChainStateInterface } from 'src/store/chain/state';
-
-export const mutations: MutationTree<ChainStateInterface> = {
-    setToken(state: ChainStateInterface, token: Token) {
-        state.token = token;
-    },
-    setSymbol(state: ChainStateInterface, symbol: string) {
-        state.token.symbol = symbol;
-    },
-    setPrecision(state: ChainStateInterface, precision: number) {
-        state.token.precision = precision;
-    },
-    setBpList(state: ChainStateInterface, bpList: BP[]) {
-        state.bpList = bpList;
-    },
-    setHead_block_num(state: ChainStateInterface, hbn: number) {
-        state.head_block_num = hbn;
-    },
-    setLIB(state: ChainStateInterface, lib: number) {
-        state.last_irreversible_block_num = lib;
-    },
-    setHead_block_producer(state: ChainStateInterface, hbp: string) {
-        state.head_block_producer = hbp;
-    },
-    setProducerSchedule(state: ChainStateInterface, schedule: string[]) {
-        state.producerSchedule = schedule;
-    },
-    setProducers(state: ChainStateInterface, bpList: Producer[]) {
-        state.producers = bpList;
-    },
-    setRamPrice(state: ChainStateInterface, price: string) {
-        state.ram_price = price;
-    },
-};
diff --git a/src/store/chain/state.ts b/src/store/chain/state.ts
deleted file mode 100644
index 5982fdd6..00000000
--- a/src/store/chain/state.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { Token, BP, Producer } from 'src/types';
-export interface ChainStateInterface {
-  token: Token;
-  bpList: BP[];
-  producers: Producer[];
-  head_block_num: number;
-  last_irreversible_block_num: number;
-  head_block_producer: string;
-  producerSchedule: string[];
-  ram_price: string;
-}
-
-export function state(): ChainStateInterface {
-    return {
-        token: {
-            symbol: '',
-            precision: 0,
-            amount: 0,
-            contract: '',
-        },
-        bpList: [],
-        producers: [],
-        head_block_num: 0,
-        last_irreversible_block_num: 0,
-        head_block_producer: '',
-        producerSchedule: [],
-        ram_price: '0',
-    };
-}
diff --git a/src/store/contract/actions.ts b/src/store/contract/actions.ts
deleted file mode 100644
index f5bde154..00000000
--- a/src/store/contract/actions.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { ActionTree } from 'vuex';
-import { StateInterface } from 'src/store/index';
-import { ContractStateInterface } from 'src/store/contract/state';
-
-export const actions: ActionTree<ContractStateInterface, StateInterface> = {
-    async setContract({ dispatch, commit }, contractAddress) {
-        commit('setContract', contractAddress);
-        await dispatch('getContractInfo', contractAddress);
-    },
-    getContractInfo({ commit }) {
-        const response: { creator: string } = { creator: 'bob' }; //mock
-        commit('setCreator', response.creator);
-    },
-};
diff --git a/src/store/contract/getters.ts b/src/store/contract/getters.ts
deleted file mode 100644
index 82bb7102..00000000
--- a/src/store/contract/getters.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { GetterTree } from 'vuex';
-import { StateInterface } from 'src/store/index';
-import { ContractStateInterface } from 'src/store/contract/state';
-
-export const getters: GetterTree<ContractStateInterface, StateInterface> = {
-    getCreatorAddress({ creator }): string {
-        return creator;
-    },
-};
diff --git a/src/store/contract/index.ts b/src/store/contract/index.ts
deleted file mode 100644
index a4d24dd2..00000000
--- a/src/store/contract/index.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { Module } from 'vuex';
-import { StateInterface } from 'src/store/index';
-import { state, ContractStateInterface } from 'src/store/contract/state';
-import { actions } from 'src/store/contract/actions';
-import { getters } from 'src/store/contract/getters';
-import { mutations } from 'src/store/contract/mutations';
-
-export const contract: Module<ContractStateInterface, StateInterface> = {
-    namespaced: true,
-    actions,
-    getters,
-    mutations,
-    state,
-};
diff --git a/src/store/contract/mutations.ts b/src/store/contract/mutations.ts
deleted file mode 100644
index 5db37551..00000000
--- a/src/store/contract/mutations.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { MutationTree } from 'vuex';
-import { ContractStateInterface } from 'src/store/contract/state';
-
-export const mutations: MutationTree<ContractStateInterface> = {
-    setContract(state: ContractStateInterface, contractAddress: string) {
-        state.address = contractAddress;
-    },
-    setCreator(state: ContractStateInterface, creatorAddress: string) {
-        state.creator = creatorAddress;
-    },
-};
diff --git a/src/store/contract/state.ts b/src/store/contract/state.ts
deleted file mode 100644
index 17afca2a..00000000
--- a/src/store/contract/state.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-export interface ContractStateInterface {
-  address: string;
-  creator: string;
-}
-
-export function state(): ContractStateInterface {
-    return {
-        address: '',
-        creator: '',
-    };
-}
diff --git a/src/store/index.ts b/src/store/index.ts
deleted file mode 100644
index bf4f893c..00000000
--- a/src/store/index.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-import { store } from 'quasar/wrappers';
-import { InjectionKey } from 'vue';
-import {
-    createStore,
-    Store as VuexStore,
-    useStore as vuexUseStore,
-} from 'vuex';
-
-import { contract } from 'src/store/contract';
-import { ContractStateInterface } from 'src/store/contract/state';
-import { chain } from 'src/store/chain';
-import { ChainStateInterface } from 'src/store/chain/state';
-import { account } from 'src/store/account';
-import { AccountStateInterface } from 'src/store/account/state';
-import { transaction } from 'src/store/transaction';
-import { TransactionStateInterface } from 'src/store/transaction/state';
-import { resources } from 'src/store/resources';
-import { ResourcesStateInterface } from 'src/store/resources/state';
-
-/*
- * If not building with SSR mode, you can
- * directly export the Store instantiation;
- *
- * The function below can be async too; either use
- * async/await or return a Promise which resolves
- * with the Store instance.
- */
-
-export interface StateInterface {
-    // Define your own store structure, using submodules if needed
-    contract: ContractStateInterface;
-    chain: ChainStateInterface;
-    account: AccountStateInterface;
-    transaction: TransactionStateInterface;
-    resources: ResourcesStateInterface;
-}
-
-// provide typings for `this.$store`
-declare module '@vue/runtime-core' {
-    interface ComponentCustomProperties {
-        $store: VuexStore<StateInterface>;
-    }
-}
-
-// provide typings for `useStore` helper
-export const storeKey: InjectionKey<VuexStore<StateInterface>> =
-    Symbol('vuex-key');
-
-export default store(function () {
-    const Store = createStore<StateInterface>({
-        modules: {
-            contract,
-            chain,
-            account,
-            transaction,
-            resources,
-        },
-
-        // enable strict mode (adds overhead!)
-        // for dev mode and --debug builds only
-        strict: !!process.env.DEBUGGING,
-    });
-    return Store;
-});
-
-export function useStore() {
-    return vuexUseStore(storeKey);
-}
diff --git a/src/store/resources/actions.ts b/src/store/resources/actions.ts
deleted file mode 100644
index 2cefb073..00000000
--- a/src/store/resources/actions.ts
+++ /dev/null
@@ -1,228 +0,0 @@
-import { ActionTree } from 'vuex';
-import { StateInterface } from 'src/store/index';
-import { DelegatedResources, ResourcesStateInterface } from 'src/store/resources/state';
-import { GetTableRowsParams } from 'src/types';
-import { api } from 'src/api';
-import { getChain } from 'src/config/ConfigManager';
-import { formatCurrency } from 'src/utils/string-utils';
-
-const chain = getChain();
-const symbol = chain.getSystemToken().symbol;
-const precision = chain.getSystemToken().precision;
-
-export const actions: ActionTree<ResourcesStateInterface, StateInterface> = {
-
-    // general update action to assert all resources related data is loaded for the current account
-    async updateResources(store, { account, force }) {
-        const currentAccount = (account as string) ?? (store.rootState.account.accountName);
-        try {
-            store.commit('setLoading', 'updateResources');
-            store.commit('setForceUpdate', force);
-            if (
-                store.state.currentAccount !== currentAccount ||
-                !store.rootState.account.data ||
-                force
-            ) {
-                // dispatch updateSelfStaked and updateDelegatedToOthers actions in parallel awaiting for both to finish
-                await Promise.all([
-                    store.dispatch('updateSelfStaked', currentAccount),
-                    store.dispatch('updateDelegatedToOthers', currentAccount),
-                ]);
-                store.commit('setCurrentAccount', currentAccount);
-            }
-        } catch (err) {
-            console.error('Error:', err);
-        } finally {
-            store.commit('setForceUpdate', false);
-            store.commit('unsetLoading', 'updateResources');
-        }
-    },
-
-    // self staked resources actions
-    async updateSelfStaked(store, account: string) {
-        try {
-            store.commit('setLoading', 'updateSelfStaked');
-            if (
-                store.state.currentAccount !== account ||
-                store.state.selfStaked?.from !== account ||
-                store.state.selfStaked?.to !== account ||
-                store.state.forceUpdate
-            ) {
-                // dispatch loadAccountData action from account module
-                await store.dispatch('account/loadAccountData', account, { root: true });
-            }
-
-            const accountData = store.rootState.account.data;
-
-            if (!accountData) {
-                return;
-            }
-
-            // self staked resources
-            const self_net_weight = Number(accountData.self_delegated_bandwidth?.net_weight.value ?? 0);
-            const self_cpu_weight = Number(accountData.self_delegated_bandwidth?.cpu_weight.value ?? 0);
-
-            const self_net_asset = formatCurrency(self_net_weight, precision, symbol, true);
-            const self_cpu_asset = formatCurrency(self_cpu_weight, precision, symbol, true);
-
-            const selfStaked: DelegatedResources = {
-                from: account,
-                to: account,
-                net_weight: self_net_asset,
-                cpu_weight: self_cpu_asset,
-            };
-
-            // total staked resources
-            const total_net_weight = Number(accountData.net_weight?.value ?? 0) / Math.pow(10, precision);
-            const total_cpu_weight = Number(accountData.cpu_weight?.value ?? 0) / Math.pow(10, precision);
-
-            // resources delegated from others
-            const from_others_net_weight = total_net_weight - self_net_weight;
-            const from_others_cpu_weight = total_cpu_weight - self_cpu_weight;
-
-            const from_others_net_asset = formatCurrency(from_others_net_weight, precision, symbol, true);
-            const from_others_cpu_asset = formatCurrency(from_others_cpu_weight, precision, symbol, true);
-
-            const fromOthers: DelegatedResources = {
-                from: 'not-available',
-                to: account,
-                net_weight: from_others_net_asset,
-                cpu_weight: from_others_cpu_asset,
-            };
-
-            store.commit('setDelegatedFromOthers', fromOthers);
-            store.commit('setSelfStaked', selfStaked);
-        } catch (err) {
-            console.error('Error:', err);
-        } finally {
-            store.commit('unsetLoading', 'updateSelfStaked');
-        }
-    },
-
-    // delegated resources actions
-    async updateDelegatedToOthers({ commit }, account: string) {
-        try {
-            commit('setLoading', 'updateDelegatedToOthers');
-
-            const paramsdelband = {
-                code: 'eosio',
-                limit: '200',
-                scope: account,
-                table: 'delband',
-            } as GetTableRowsParams;
-
-            const delegated = (
-                (await api.getTableRows(paramsdelband)) as {
-                    rows: DelegatedResources[];
-                }
-            ).rows;
-
-            const delegatedToOthers = delegated.filter(item => item.to !== account);
-            const delegatedToOthersNet = delegatedToOthers.reduce(
-                (acc, item) => acc + parseFloat(item.net_weight),
-                0,
-            );
-            const delegatedToOthersCpu = delegatedToOthers.reduce(
-                (acc, item) => acc + parseFloat(item.cpu_weight),
-                0,
-            );
-            const totalDelegatedToOthers = delegatedToOthersCpu + delegatedToOthersNet;
-
-            commit('setCurrentAccount', account);
-            commit('setDelegatedToOthers', delegated);
-            commit('setDelegatedToOthersAggregated', totalDelegatedToOthers);
-        } catch (err) {
-            console.error('Error:', err);
-        } finally {
-            commit('unsetLoading', 'updateDelegatedToOthers');
-        }
-    },
-    async delegateResources({ commit, dispatch }, order: DelegatedResources) {
-        const { from, to, net_weight, cpu_weight } = order;
-
-        // create two actions, one for the delegatebw and one for the transfer
-        try {
-            commit('setLoading', 'delegateResources');
-
-            // calculate the total amount
-            const amount = Number(net_weight ?? '0') + Number(cpu_weight ?? '0');
-
-            const actions = [
-                {
-                    account: 'eosio',
-                    name: 'delegatebw',
-                    authorization: [
-                        {
-                            actor: from,
-                            permission: this.state.account.accountPermission,
-                        },
-                    ],
-                    data: {
-                        from,
-                        receiver: to,
-                        stake_net_quantity: net_weight,
-                        stake_cpu_quantity: cpu_weight,
-                        transfer: false,
-                        amount,
-                    },
-                },
-            ];
-
-            await dispatch('account/sendTransaction', actions, { root: true });
-            await dispatch('updateResources', { account:from, force: true });
-        } catch (e) {
-            commit('setTransactionError', e);
-        } finally {
-            commit('unsetLoading', 'delegateResources');
-        }
-    },
-    async undelegateResources({ commit, dispatch }, order: DelegatedResources) {
-        const { from, to, net_weight, cpu_weight } = order;
-
-        // create two actions, one for the delegatebw and one for the transfer
-        try {
-            commit('setLoading', 'undelegateResources');
-
-            const actions = [
-                {
-                    account: 'eosio',
-                    name: 'undelegatebw',
-                    authorization: [
-                        {
-                            actor: from,
-                            permission: 'active',
-                        },
-                    ],
-                    data: {
-                        from,
-                        receiver: to,
-                        unstake_net_quantity: net_weight,
-                        unstake_cpu_quantity: cpu_weight,
-                    },
-                },
-            ];
-            await dispatch('account/sendTransaction', actions, { root: true });
-            await dispatch('updateResources', { account:from, force: true });
-        } catch (e) {
-            console.error('Error', e);
-        } finally {
-            commit('unsetLoading', 'undelegateResources');
-        }
-    },
-
-    // reset interlad data when there's no logged in account
-    resetResources({ commit }) {
-        commit('setDelegatedFromOthers', null);
-        commit('setDelegatedToOthers', []);
-        commit('setSelfStaked', null);
-    },
-};
-
-// include all actions in the interface as callable full-typed functions
-export interface ResourcesActions {
-    updateResources: (payload: {account?:string, force?: boolean}) => Promise<void>;
-    updateSelfStaked: (account: string) => Promise<void>;
-    updateDelegatedToOthers: (account: string) => Promise<void>;
-    delegateResources: (order: DelegatedResources) => Promise<void>;
-    undelegateResources: (order: DelegatedResources) => Promise<void>;
-}
diff --git a/src/store/resources/getters.ts b/src/store/resources/getters.ts
deleted file mode 100644
index 84042490..00000000
--- a/src/store/resources/getters.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { GetterTree } from 'vuex';
-import { StateInterface } from 'src/store/index';
-import { DelegatedResources, ResourcesStateInterface } from 'src/store/resources/state';
-import { Ref } from 'vue';
-
-
-export const getters: GetterTree<ResourcesStateInterface, StateInterface> = {
-    // get list of delegates resources to other accounts
-    getDelegatedToOthers(store: ResourcesStateInterface): DelegatedResources[] {
-        return store.toOthers ?? [];
-    },
-
-    // get list of delegates resources to other accounts
-    getDelegatedToOthersAggregated(store: ResourcesStateInterface): number {
-        return store.toOthersAggregated ?? 0;
-    },
-
-    // get list of delegates resources from other accounts
-    getDelegatedFromOthers(store: ResourcesStateInterface): DelegatedResources | null {
-        return store.fromOthers;
-    },
-
-    // get list of self staked resources
-    getSelfStaked(store: ResourcesStateInterface): DelegatedResources | null {
-        return store.selfStaked;
-    },
-
-    getLoading(store: ResourcesStateInterface): string[] {
-        return store.loading;
-    },
-
-    // is loading function name
-    isLoading(store: ResourcesStateInterface): (name: string) => boolean {
-        return (name: string) => store.loading.includes(name);
-    },
-
-
-};
-
-// include all getters in the interface as collable full-typed functions
-export interface ResourcesGetters {
-    getDelegatedToOthers: () => DelegatedResources[];
-    getDelegatedFromOthers: () => Ref<DelegatedResources | null>;
-    getDelegatedToOthersAggregated: () => number;
-    getSelfStaked: () => DelegatedResources | null;
-    getLoading: () => string[];
-    isLoading: (name: string) => boolean;
-}
diff --git a/src/store/resources/index.ts b/src/store/resources/index.ts
deleted file mode 100644
index d38a02c5..00000000
--- a/src/store/resources/index.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { Module } from 'vuex';
-import { StateInterface } from 'src/store/index';
-import { state, ResourcesStateInterface } from 'src/store/resources/state';
-import { getters, ResourcesGetters } from 'src/store/resources/getters';
-import { mutations } from 'src/store/resources/mutations';
-import { actions, ResourcesActions } from 'src/store/resources/actions';
-
-export const resources: Module<ResourcesStateInterface, StateInterface> = {
-    namespaced: true,
-    actions,
-    getters,
-    mutations,
-    state,
-};
-
-// merge all getters and actions into one interface ResourcesAPI
-export interface ResourcesAPI extends ResourcesGetters, ResourcesActions {}
-
diff --git a/src/store/resources/mutations.ts b/src/store/resources/mutations.ts
deleted file mode 100644
index a3dd811d..00000000
--- a/src/store/resources/mutations.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { MutationTree } from 'vuex';
-import { DelegatedResources, ResourcesStateInterface } from 'src/store/resources/state';
-
-export const mutations: MutationTree<ResourcesStateInterface> = {
-
-    setCurrentAccount(state: ResourcesStateInterface, account: string) {
-        state.currentAccount = account;
-    },
-
-    setDelegatedFromOthers(state: ResourcesStateInterface, delegated) {
-        state.fromOthers = delegated as DelegatedResources;
-    },
-
-    setDelegatedToOthers(state: ResourcesStateInterface, delegated) {
-        state.toOthers = delegated as DelegatedResources[];
-    },
-
-    setDelegatedToOthersAggregated(state: ResourcesStateInterface, aggregated) {
-        state.toOthersAggregated = aggregated as number;
-    },
-
-    setSelfStaked(state: ResourcesStateInterface, delegated) {
-        state.selfStaked = delegated as DelegatedResources;
-    },
-
-    setLoading(state: ResourcesStateInterface, label: string) {
-        // add label to loading array but only if it's not already there
-        if (!state.loading.includes(label)) {
-            state.loading.push(label);
-        }
-    },
-
-    unsetLoading(state: ResourcesStateInterface, label: string) {
-        // remove label from loading array
-        state.loading = state.loading.filter(l => l !== label);
-    },
-
-    setForceUpdate(state: ResourcesStateInterface, forceUpdate: boolean) {
-        state.forceUpdate = forceUpdate;
-    },
-
-
-};
diff --git a/src/store/resources/state.ts b/src/store/resources/state.ts
deleted file mode 100644
index d4393881..00000000
--- a/src/store/resources/state.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-// Note: This resources Vuex.Store solution is part of a final refactored code requested in this issue https://github.com/telosnetwork/telos-wallet/issues/99
-
-export interface DelegatedResources {
-    from: string
-    to: string
-    net_weight: string
-    cpu_weight: string
-}
-
-export interface ResourcesStateInterface {
-    currentAccount: string;
-    toOthers: DelegatedResources[];
-    toOthersAggregated: number;
-    fromOthers: DelegatedResources | null;
-    selfStaked: DelegatedResources | null;
-    loading: string[];
-    forceUpdate: boolean;
-}
-
-export function state(): ResourcesStateInterface {
-    return {
-        currentAccount: '',
-        toOthers: [],
-        toOthersAggregated: 0,
-        fromOthers: null,
-        selfStaked: null,
-        loading: [],
-        forceUpdate: false,
-    };
-}
diff --git a/src/store/transaction/actions.ts b/src/store/transaction/actions.ts
deleted file mode 100644
index e165547d..00000000
--- a/src/store/transaction/actions.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { ActionTree } from 'vuex';
-import { StateInterface } from 'src/store/index';
-import { TransactionStateInterface } from 'src/store/transaction/state';
-import { api } from 'src/api/index';
-
-export const actions: ActionTree<TransactionStateInterface, StateInterface> = {
-    async updateTransaction({ commit, state }) {
-        const transaction = await api.getTransaction(state.transactionId);
-        if (transaction) {
-            commit('setTransaction', transaction);
-        } else {
-            commit('setTransactionFound', false);
-        }
-    },
-    updateTransactionId({ commit }, transactionId) {
-        commit('setTransactionId', transactionId);
-    },
-};
diff --git a/src/store/transaction/getters.ts b/src/store/transaction/getters.ts
deleted file mode 100644
index cf1fcdba..00000000
--- a/src/store/transaction/getters.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { GetterTree } from 'vuex';
-import { StateInterface } from 'src/store/index';
-import { TransactionStateInterface } from 'src/store/transaction/state';
-import { ActionData } from 'src/types';
-
-export const getters: GetterTree<TransactionStateInterface, StateInterface> = {
-    getTransaction({ transaction }): ActionData {
-        return transaction;
-    },
-    getTransactionId({ transactionId }): string {
-        return transactionId;
-    },
-};
diff --git a/src/store/transaction/index.ts b/src/store/transaction/index.ts
deleted file mode 100644
index f1fc80d1..00000000
--- a/src/store/transaction/index.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { Module } from 'vuex';
-import { StateInterface } from 'src/store/index';
-import { state, TransactionStateInterface } from 'src/store/transaction/state';
-import { actions } from 'src/store/transaction/actions';
-import { getters } from 'src/store/transaction/getters';
-import { mutations } from 'src/store/transaction/mutations';
-
-export const transaction: Module<TransactionStateInterface, StateInterface> = {
-    namespaced: true,
-    actions,
-    getters,
-    mutations,
-    state,
-};
diff --git a/src/store/transaction/mutations.ts b/src/store/transaction/mutations.ts
deleted file mode 100644
index 3d5c5f7e..00000000
--- a/src/store/transaction/mutations.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import { MutationTree } from 'vuex';
-import { TransactionStateInterface } from 'src/store/transaction/state';
-import { ActionData } from 'src/types';
-
-export const mutations: MutationTree<TransactionStateInterface> = {
-    setTransaction(state: TransactionStateInterface, transaction: ActionData) {
-        if (transaction && transaction.actions && transaction.actions.length > 0) {
-            state.transaction = transaction;
-            state.executed = transaction.executed || false;
-            const action = transaction.actions[0];
-            state.blockNum = action.block_num;
-            state.timestamp = action.timestamp;
-            state.cpuUsage = action.cpu_usage_us;
-            state.netUsage = action.net_usage_words * 8;
-            state.actionCount = transaction.actions.length;
-            state.irreversable = transaction.lib > action.block_num;
-            state.actions = transaction.actions;
-            state.transactionFound = true;
-        } else {
-            state.transactionFound = false;
-        }
-    },
-    setTransactionId(state: TransactionStateInterface, transactionId: string) {
-        state.transactionId = transactionId;
-    },
-    setTimestamp(state: TransactionStateInterface, timestamp: string) {
-        state.timestamp = timestamp;
-    },
-    setBlockNum(state: TransactionStateInterface, blockNum: number) {
-        state.blockNum = blockNum;
-    },
-    setExecuted(state: TransactionStateInterface, executed: boolean) {
-        state.executed = executed;
-    },
-    setCpuUsage(state: TransactionStateInterface, cpuUsage: number) {
-        state.cpuUsage = cpuUsage;
-    },
-    setNetUsage(state: TransactionStateInterface, netUsage: number) {
-        state.netUsage = netUsage;
-    },
-    setActionCount(state: TransactionStateInterface, actionCount: number) {
-        state.actionCount = actionCount;
-    },
-    setIrreversable(state: TransactionStateInterface, irreversable: boolean) {
-        state.irreversable = irreversable;
-    },
-    setTransactionFounde(state: TransactionStateInterface, found: boolean) {
-        state.transactionFound = found;
-    },
-};
diff --git a/src/store/transaction/state.ts b/src/store/transaction/state.ts
deleted file mode 100644
index 4dbb0c0d..00000000
--- a/src/store/transaction/state.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { ActionData, Action } from 'src/types';
-
-export interface TransactionStateInterface {
-  transaction: ActionData;
-  transactionId: string;
-  blockNum: number;
-  timestamp: string;
-  executed: boolean;
-  cpuUsage: number;
-  netUsage: number;
-  actionCount: number;
-  irreversable: boolean;
-  actions: Action[];
-  transactionFound: boolean;
-}
-
-export function state(): TransactionStateInterface {
-    return {
-        transaction: {} as ActionData,
-        transactionId: '',
-        blockNum: 0,
-        timestamp: '',
-        executed: false,
-        cpuUsage: 0,
-        netUsage: 0,
-        actionCount: 0,
-        irreversable: false,
-        actions: [] as Action[],
-        transactionFound: true,
-    };
-}
diff --git a/src/stores/account.ts b/src/stores/account.ts
new file mode 100644
index 00000000..1e61fae2
--- /dev/null
+++ b/src/stores/account.ts
@@ -0,0 +1,832 @@
+import { defineStore } from 'pinia';
+import { ABI, Action, Authorization, GetTableRowsParams, Rexbal, RexbalRows, RexPoolRows } from 'src/types';
+import { API, Asset, Name } from '@greymass/eosio';
+import { Authenticator, User } from 'universal-authenticator-library';
+import { getChain } from 'src/config/ConfigManager';
+import { markRaw } from 'vue';
+import { formatCurrency } from 'src/utils/string-utils';
+import { FuelUserWrapper } from 'src/api/fuel';
+import { api } from 'src/api';
+import { SignTransactionResponse } from 'universal-authenticator-library/dist/interfaces';
+
+
+export interface AccountStateInterface {
+    loading: unknown;
+    accountName: string;
+    accountPermission: string;
+    requestAccount: boolean;
+    user: User;
+    autoLogin: unknown;
+    isAuthenticated: boolean;
+    linkedAccounts: Array<unknown>;
+    data: API.v1.AccountObject;
+    authorization: Authorization[];
+    rexActions: Action[];
+    TransactionId: string;
+    TransactionError: unknown;
+    rexbal: Rexbal;
+    vote: string[];
+    abi: ABI;
+    coreRexBalance: string;
+    maturingRex: string;
+    maturedRex: string;
+    savingsRex: string;
+    tlosRexRatio: number;
+    rexfund: number;
+    chainId: string;
+}
+
+const chain = getChain();
+const { symbol } = chain.getSystemToken();
+
+export const useAccountStore = defineStore('account', {
+    state: (): AccountStateInterface => ({
+        loading: false,
+        accountName: '',
+        accountPermission: 'active',
+        requestAccount: false,
+        user: null,
+        autoLogin: null,
+        isAuthenticated: false,
+        linkedAccounts: [],
+        data: {
+            account_name: Name.from(''),
+            /** Highest block number on the chain */
+            // head_block_num: UInt32;
+            // /** Highest block unix timestamp. */
+            // head_block_time: TimePoint;
+            // /** Indicator of if this is a privileged system account */
+            // privileged: boolean;
+            // /** Last update to accounts contract as unix timestamp. */
+            // last_code_update: TimePoint;
+            // /** Account created as unix timestamp. */
+            // created: TimePoint;
+            /** Account core token balance */
+            core_liquid_balance: Asset.from(0, symbol),
+            // ram_quota: Int64;
+            // net_weight: Int64;
+            // cpu_weight: Int64;
+            // net_limit: AccountResourceLimit;
+            // cpu_limit: AccountResourceLimit;
+            // ram_usage: UInt64;
+            // permissions: AccountPermission[];
+            // total_resources: AccountTotalResources;
+            // self_delegated_bandwidth?: AccountSelfDelegatedBandwidth;
+            // refund_request?: AccountRefundRequest;
+            // voter_info?: AccountVoterInfo;
+            // rex_info?: AccountRexInfo;
+            // getPermission(permission: NameType): AccountPermission;
+        } as API.v1.AccountObject,
+        authorization: [],
+        rexActions: [],
+        TransactionId: '',
+        TransactionError: '',
+        rexbal: {} as Rexbal,
+        vote: [],
+        abi: { abi: null } as ABI,
+        coreRexBalance: `0 ${symbol}`,
+        maturingRex: `0 ${symbol}`,
+        maturedRex: `0 ${symbol}`,
+        savingsRex: `0 ${symbol}`,
+        tlosRexRatio: 1,
+        rexfund: 0,
+        chainId: '',
+    }),
+    getters: {
+        account(): AccountStateInterface {
+            return {
+                loading: this.loading,
+                accountName: this.accountName,
+                accountPermission: this.accountPermission,
+                user: this.user,
+                autoLogin: this.autoLogin,
+                isAuthenticated: this.isAuthenticated,
+                linkedAccounts: this.linkedAccounts,
+                data: this.data,
+                authorization: this.authorization,
+                rexActions: this.rexActions,
+                TransactionId: this.TransactionId,
+                TransactionError: this.TransactionError,
+                rexbal: this.rexbal,
+                vote: this.vote,
+                abi: this.abi,
+                coreRexBalance: this.coreRexBalance,
+                maturingRex: this.maturingRex,
+                maturedRex: this.maturedRex,
+                savingsRex: this.savingsRex,
+                tlosRexRatio: this.tlosRexRatio,
+                rexfund: this.rexfund,
+                chainId: this.chainId,
+            } as AccountStateInterface;
+        },
+        getAccountData(): API.v1.AccountObject {
+            return this.data as API.v1.AccountObject;
+        },
+        getUser(): User {
+            return this.user as User;
+        },
+    },
+    actions: {
+        setUser(user: User) {
+            this.user = user ? markRaw(user) : user;
+        },
+        setAccountName(accountName: string) {
+            this.accountName = accountName;
+        },
+        setAutoLogin(autoLogin: string) {
+            this.autoLogin = autoLogin;
+        },
+        setAccountData(accountData: API.v1.AccountObject) {
+            this.$patch({
+                data: accountData,
+                vote: accountData?.voter_info?.producers.map(vote => vote.toString()) ?? [],
+            });
+        },
+        setTransaction(TransactionId: string) {
+            this.TransactionId = TransactionId;
+        },
+        setTransactionError(TransactionError: unknown) {
+            this.TransactionError = TransactionError;
+        },
+        setRexActions(rexActions: Action[]) {
+            this.rexActions = rexActions;
+        },
+        setRexbal(
+            params: {
+                rexbal: Rexbal;
+                coreBalance: number;
+                maturingRex: number;
+                savingsRex: number;
+                maturedRex: number;
+            },
+        ) {
+            this.rexbal= params.rexbal;
+            this.coreRexBalance= formatCurrency(params.coreBalance, 4, symbol);
+            this.maturedRex= formatCurrency(params.maturedRex, 4, symbol);
+            this.maturingRex= formatCurrency(params.maturingRex, 4, symbol);
+            this.savingsRex= formatCurrency(params.savingsRex, 4, symbol);
+        },
+        setVote(vote: string[]) {
+            this.vote = vote.sort();
+        },
+        setABI(abi: ABI) {
+            this.abi = abi;
+        },
+        setTlosRexRatio(tlosRexRatio: number) {
+            this.tlosRexRatio = tlosRexRatio;
+        },
+        setAccountPermission(accountPermission: string) {
+            this.accountPermission = accountPermission;
+        },
+        setIsAuthenticated(isAuthenticated: boolean) {
+            this.isAuthenticated = isAuthenticated;
+        },
+        setRexFund(rexfund: number) {
+            this.rexfund = rexfund;
+        },
+        setChainId(chainId: string) {
+            this.chainId = chainId;
+        },
+
+        async login({ account, authenticator }: {account: string, authenticator: Authenticator}): Promise<void> {
+            await authenticator.init();
+
+            if (!account) {
+                const requestAccount = await (
+                    authenticator
+                ).shouldRequestAccountName();
+                if (requestAccount) {
+                    this.requestAccount = true;
+                    return;
+                }
+            }
+
+
+            const users = await authenticator.login();
+            if (users?.length) {
+                const account = new FuelUserWrapper(users[0]);
+                const permission = account.requestPermission;
+                const accountName = await account.getAccountName();
+
+                this.$patch({
+                    accountPermission: permission || 'active',
+                    user: account,
+                    isAuthenticated: true,
+                    accountName: accountName,
+                    chainId: authenticator.chains[0].chainId,
+                });
+
+                localStorage.setItem(`account_${authenticator.chains[0].chainId}`, accountName);
+                localStorage.setItem(
+                    `autoLogin_${(authenticator).chains[0].chainId}`,
+                    (authenticator).getName(),
+                );
+            }
+        },
+        logout() {
+            this.isAuthenticated = false;
+            this.accountName = '';
+            this.user = null;
+            localStorage.removeItem(`account_${this.chainId}`);
+            localStorage.removeItem(`autoLogin_${this.chainId}`);
+        },
+        async loadAccountData() {
+            try {
+                this.data = await api.getAccount(this.accountName);
+            } catch (e) {
+                return;
+            }
+        },
+        async updateRexData({ account }: {account: string}) {
+            const paramsrexbal = {
+                code: 'eosio',
+                limit: '2',
+                lower_bound: Name.from(account),
+                scope: 'eosio',
+                table: 'rexbal',
+                reverse: false,
+                upper_bound: Name.from(account),
+            } as GetTableRowsParams;
+            const rexbalRows = (await api.getTableRows(paramsrexbal)) as RexbalRows;
+            const paramsrexpool = {
+                code: 'eosio',
+                scope: 'eosio',
+                table: 'rexpool',
+                json: true,
+                reverse: false,
+            } as GetTableRowsParams;
+            const rexpool = ((await api.getTableRows(paramsrexpool)) as RexPoolRows).rows[0];
+            const paramsrexfund = {
+                code: 'eosio',
+                limit: '1',
+                lower_bound: Name.from(account),
+                scope: 'eosio',
+                table: 'rexfund',
+                reverse: false,
+                upper_bound: Name.from(account),
+            } as GetTableRowsParams;
+            const rexfund = (
+                (await api.getTableRows(paramsrexfund)) as {
+                    rows: {
+                        owner: string;
+                        balance: string;
+                    }[];
+                }
+            ).rows[0];
+
+            const rexFundBalance = rexfund?.balance ? Number(rexfund.balance.split(' ')[0]) : 0.0;
+            this.setRexFund(rexFundBalance);
+
+            const rexbal = rexbalRows.rows[0];
+            const rexBalance =
+                rexbal && rexbal.rex_balance
+                    ? parseFloat(rexbal.rex_balance.split(' ')[0])
+                    : 0;
+            const totalRex = Number(rexpool.total_rex.split(' ')[0]);
+            const totalLendable = Number(rexpool.total_lendable.split(' ')[0]);
+            const tlosRexRatio = totalRex > 0 ? totalLendable / totalRex : 1;
+            this.setTlosRexRatio(tlosRexRatio);
+
+            let coreBalance = totalRex > 0 ? tlosRexRatio * rexBalance : 0.0;
+            coreBalance += rexFundBalance;
+
+            let savingsRex = 0;
+            let maturedRex = rexbal
+                ? tlosRexRatio * (Number(rexbal.matured_rex) / 10000)
+                : 0;
+
+            let maturingRex = 0;
+            if (rexbal && rexbal.rex_maturities && rexbal.rex_maturities.length > 0) {
+                const thisYear = new Date().getFullYear();
+                const now = new Date().getTime();
+                rexbal.rex_maturities.forEach((maturity) => {
+                    const maturityYear = new Date(maturity.first).getFullYear();
+                    const maturityTime = new Date(maturity.first).getTime();
+                    if (maturityYear - thisYear > 1) {
+                        savingsRex = tlosRexRatio * (Number(maturity.second) / 10000);
+                    } else if (maturityTime - now < 0) {
+                        maturedRex += tlosRexRatio * (Number(maturity.second) / 10000);
+                    } else {
+                        maturingRex = tlosRexRatio * (Number(maturity.second) / 10000);
+                    }
+                });
+            }
+
+            if (rexbalRows.rows.length > 0) {
+                this.setRexbal({
+                    rexbal: rexbalRows.rows[0],
+                    coreBalance,
+                    maturingRex,
+                    savingsRex,
+                    maturedRex,
+                });
+            }
+            const filter = [
+                'eosio:sellrex',
+                'eosio:buyrex',
+                'eosio:deposit',
+                'eosio:withdraw',
+                'eosio:unstaketorex',
+                'eosio:cnclrexorder',
+                'eosio:rentcpu',
+                'eosio:rentnet',
+                'eosio:fundcpuloan',
+                'eosio:fundnetloan',
+                'eosio:defcpuloan',
+                'eosio:defnetloan',
+                'eosio:updaterex',
+                'eosio:consolidate',
+                'eosio:closerex',
+                'eosio:mvfrsavings',
+                'eosio:mvtosavings',
+                'eosio:rexexec',
+            ].join(',');
+            const rexActions = (await api.getActions(account as unknown as string, filter)).actions;
+            this.setRexActions(rexActions);
+        },
+        async sendAction({ account, data, name, actor, permission }: {
+            name: Name|string;
+            data: Record<string, unknown>;
+            account?: Name|string;
+            actor?: Name|string;
+            permission?: string;
+        }): Promise<SignTransactionResponse | null> {
+            const actions = [
+                {
+                    account: account ?? this.abi.account_name,
+                    name: name.toString(),
+                    authorization: [
+                        {
+                            actor: actor ?? this.accountName,
+                            permission: permission ?? this.accountPermission,
+                        },
+                    ],
+                    data,
+                },
+            ] as Action[];
+            return this.sendTransaction(actions);
+        },
+        async sendTransaction(actions: Action[]) {
+            let transaction = null;
+            try {
+                transaction = await this.user.signTransaction(
+                    {
+                        actions,
+                    },
+                    {
+                        blocksBehind: 3,
+                        expireSeconds: 180,
+                    },
+                );
+                this.setTransaction(transaction.transactionId);
+            } catch (e) {
+                console.error(e);
+                this.setTransactionError(e);
+            }
+
+            return transaction;
+        },
+        async stakeRex({ amount }: {amount: string}) {
+            let transaction = null;
+            const quantityStr = formatCurrency(amount, 4, symbol, true);
+            const actions = [
+                {
+                    account: 'eosio',
+                    name: 'deposit',
+                    authorization: [
+                        {
+                            actor: this.accountName,
+                            permission: this.accountPermission,
+                        },
+                    ],
+                    data: {
+                        owner: this.accountName,
+                        amount: quantityStr,
+                    },
+                },
+                {
+                    account: 'eosio',
+                    name: 'buyrex',
+                    authorization: [
+                        {
+                            actor: this.accountName,
+                            permission: this.accountPermission,
+                        },
+                    ],
+                    data: {
+                        from: this.accountName,
+                        amount: quantityStr,
+                    },
+                },
+            ] as Action[];
+            try {
+                transaction = await this.user.signTransaction(
+                    {
+                        actions,
+                    },
+                    {
+                        blocksBehind: 3,
+                        expireSeconds: 180,
+                    },
+                );
+                this.setTransaction(transaction.transactionId);
+                void this.loadAccountData();
+                void this.updateRexData({ account: this.accountName });
+            } catch (e) {
+                this.setTransactionError(e);
+            }
+        },
+        async unstakeRex({ amount }: {amount: number|string}) {
+            let transaction = null;
+            const tokenRexBalance = this.rexbal.rex_balance
+                ? Number(this.rexbal.rex_balance.split(' ')[0])
+                : 0;
+            if (tokenRexBalance === 0) {
+                return;
+            }
+            const quantityStr = formatCurrency(amount, 4, symbol, true);
+            const rexToUnstake = formatCurrency(+amount / this.tlosRexRatio, 4, null, true);
+
+            //   TODO check maturities
+            const actions = [
+                {
+                    account: 'eosio',
+                    name: 'sellrex',
+                    authorization: [
+                        {
+                            actor: this.accountName,
+                            permission: this.accountPermission,
+                        },
+                    ],
+                    data: {
+                        from: this.accountName,
+                        rex: `${rexToUnstake} REX`,
+                    },
+                },
+                {
+                    account: 'eosio',
+                    name: 'withdraw',
+                    authorization: [
+                        {
+                            actor: this.accountName,
+                            permission: this.accountPermission,
+                        },
+                    ],
+                    data: {
+                        owner: this.accountName,
+                        amount: quantityStr,
+                    },
+                },
+            ];
+            try {
+                transaction = await this.user.signTransaction(
+                    {
+                        actions,
+                    },
+                    {
+                        blocksBehind: 3,
+                        expireSeconds: 180,
+                    },
+                );
+                this.setTransaction(transaction.transactionId);
+                void this.loadAccountData();
+                void this.updateRexData({ account: this.accountName });
+            } catch (e) {
+                this.setTransactionError(e);
+            }
+        },
+        async unstakeRexFund({ amount }: {amount: number}) {
+            let transaction = null;
+            const quantityStr = formatCurrency(amount, 4, symbol, true);
+
+            const actions = [
+                {
+                    account: 'eosio',
+                    name: 'withdraw',
+                    authorization: [
+                        {
+                            actor: this.accountName,
+                            permission: this.accountPermission,
+                        },
+                    ],
+                    data: {
+                        owner: this.accountName,
+                        amount: quantityStr,
+                    },
+                },
+            ];
+            try {
+                transaction = await this.user.signTransaction(
+                    {
+                        actions,
+                    },
+                    {
+                        blocksBehind: 3,
+                        expireSeconds: 180,
+                    },
+                );
+                this.setTransaction(transaction.transactionId);
+            } catch (e) {
+                this.setTransactionError(e);
+            }
+        },
+        async stakeCpuNetRex({ cpuAmount, netAmount }: {cpuAmount: string, netAmount: string}) {
+            let transaction = null;
+            const quantityStrCPU = formatCurrency(cpuAmount, 4, symbol, true);
+            const quantityStrNET = formatCurrency(netAmount, 4, symbol, true);
+            const actions = [
+                {
+                    account: 'eosio',
+                    name: 'unstaketorex',
+                    authorization: [
+                        {
+                            actor: this.accountName,
+                            permission: this.accountPermission,
+                        },
+                    ],
+                    data: {
+                        owner: this.accountName,
+                        receiver: this.accountName,
+                        from_net: quantityStrNET,
+                        from_cpu: quantityStrCPU,
+                    },
+                },
+            ];
+            try {
+                transaction = await this.user.signTransaction(
+                    {
+                        actions,
+                    },
+                    {
+                        blocksBehind: 3,
+                        expireSeconds: 180,
+                    },
+                );
+                this.setTransaction(transaction.transactionId);
+                void this.loadAccountData();
+                void this.updateRexData({ account: this.accountName });
+            } catch (e) {
+                this.setTransactionError(e);
+            }
+        },
+        async unstakeCpuNetRex({ cpuAmount, netAmount }: {cpuAmount: string, netAmount: string}) {
+            let transaction = null;
+            const quantityStrCPU = formatCurrency(cpuAmount, 4, symbol, true);
+            const quantityStrNET = formatCurrency(netAmount, 4, symbol, true);
+            const actions = [
+                {
+                    account: 'eosio',
+                    name: 'stakefromrex',
+                    authorization: [
+                        {
+                            actor: this.accountName,
+                            permission: this.accountPermission,
+                        },
+                    ],
+                    data: {
+                        owner: this.accountName,
+                        receiver: this.accountName,
+                        from_net: quantityStrNET,
+                        from_cpu: quantityStrCPU,
+                    },
+                },
+            ];
+            try {
+                transaction = await this.user.signTransaction(
+                    {
+                        actions,
+                    },
+                    {
+                        blocksBehind: 3,
+                        expireSeconds: 180,
+                    },
+                );
+                this.setTransaction(transaction.transactionId);
+                void this.loadAccountData();
+                void this.updateRexData({ account: this.accountName });
+            } catch (e) {
+                this.setTransactionError(e);
+            }
+        },
+        resetTransaction() {
+            this.setTransaction('');
+            this.setTransactionError('');
+        },
+        async updateABI(account: string) {
+            const abi = await api.getABI(account);
+            this.setABI(abi);
+        },
+        async sendVoteTransaction() {
+            let transaction = null;
+            const actions = [
+                {
+                    account: 'eosio',
+                    name: 'voteproducer',
+                    authorization: [
+                        {
+                            actor: this.accountName,
+                            permission: this.accountPermission,
+                        },
+                    ],
+                    data: {
+                        voter: this.accountName,
+                        proxy: '',
+                        producers: this.vote,
+                    },
+                },
+            ];
+            try {
+                transaction = await this.user.signTransaction(
+                    {
+                        actions,
+                    },
+                    {
+                        blocksBehind: 3,
+                        expireSeconds: 180,
+                    },
+                );
+                this.setTransaction(transaction.transactionId);
+            } catch (e) {
+                this.setTransactionError(e);
+            }
+        },
+        async buyRam({ amount, receivingAccount }: {amount: string, receivingAccount?: string}) {
+            let transaction = null;
+            const actions = [
+                {
+                    account: 'eosio',
+                    name: 'buyram',
+                    authorization: [
+                        {
+                            actor: this.accountName,
+                            permission: this.accountPermission,
+                        },
+                    ],
+                    data: {
+                        payer: this.accountName,
+                        receiver: receivingAccount,
+                        quant: amount,
+                    },
+                },
+            ];
+            try {
+                transaction = await this.user.signTransaction(
+                    {
+                        actions,
+                    },
+                    {
+                        blocksBehind: 3,
+                        expireSeconds: 180,
+                    },
+                );
+                this.setTransaction(transaction.transactionId);
+                void this.loadAccountData();
+            } catch (e) {
+                this.setTransactionError(e);
+            }
+        },
+        async buyRamBytes({ amount, receivingAccount }: {amount: string, receivingAccount?: string}) {
+            let transaction = null;
+            const actions = [
+                {
+                    account: 'eosio',
+                    name: 'buyrambytes',
+                    authorization: [
+                        {
+                            actor: this.accountName,
+                            permission: this.accountPermission,
+                        },
+                    ],
+                    data: {
+                        payer: this.accountName,
+                        receiver: receivingAccount,
+                        bytes: amount,
+                    },
+                },
+            ];
+            try {
+                transaction = await this.user.signTransaction(
+                    {
+                        actions,
+                    },
+                    {
+                        blocksBehind: 3,
+                        expireSeconds: 180,
+                    },
+                );
+                this.setTransaction(transaction.transactionId);
+                void this.loadAccountData();
+            } catch (e) {
+                this.setTransactionError(e);
+            }
+        },
+        async sellRam({ amount }: {amount: string}) {
+            let transaction = null;
+            const actions = [
+                {
+                    account: 'eosio',
+                    name: 'sellram',
+                    authorization: [
+                        {
+                            actor: this.accountName,
+                            permission: this.accountPermission,
+                        },
+                    ],
+                    data: {
+                        account: this.accountName,
+                        bytes: amount,
+                    },
+                },
+            ];
+            try {
+                transaction = await this.user.signTransaction(
+                    {
+                        actions,
+                    },
+                    {
+                        blocksBehind: 3,
+                        expireSeconds: 180,
+                    },
+                );
+                this.setTransaction(transaction.transactionId);
+                void this.loadAccountData();
+            } catch (e) {
+                this.setTransactionError(e);
+            }
+        },
+        async moveToSavings({ amount }: {amount: string}) {
+            let transaction = null;
+            const rexToUnstake = formatCurrency((+amount / this.tlosRexRatio), 4, 'REX', true);
+            const actions = [
+                {
+                    account: 'eosio',
+                    name: 'mvtosavings',
+                    authorization: [
+                        {
+                            actor: this.accountName,
+                            permission: this.accountPermission,
+                        },
+                    ],
+                    data: {
+                        owner: this.accountName,
+                        rex: rexToUnstake,
+                    },
+                },
+            ];
+            try {
+                transaction = await this.user.signTransaction(
+                    {
+                        actions,
+                    },
+                    {
+                        blocksBehind: 3,
+                        expireSeconds: 180,
+                    },
+                );
+                this.setTransaction(transaction.transactionId);
+                void this.loadAccountData();
+                void this.updateRexData({ account: this.accountName });
+            } catch (e) {
+                this.setTransactionError(e);
+            }
+        },
+        async moveFromSavings({ amount }: {amount: string}) {
+            let transaction = null;
+            const rexToUnstake = formatCurrency((+amount / this.tlosRexRatio), 4, 'REX', true);
+
+            const actions = [
+                {
+                    account: 'eosio',
+                    name: 'mvfrsavings',
+                    authorization: [
+                        {
+                            actor: this.accountName,
+                            permission: this.accountPermission,
+                        },
+                    ],
+                    data: {
+                        owner: this.accountName,
+                        rex: rexToUnstake,
+                    },
+                },
+            ];
+            try {
+                transaction = await this.user.signTransaction(
+                    {
+                        actions,
+                    },
+                    {
+                        blocksBehind: 3,
+                        expireSeconds: 180,
+                    },
+                );
+                this.setTransaction(transaction.transactionId);
+                void this.loadAccountData();
+                void this.updateRexData({ account: this.accountName });
+            } catch (e) {
+                this.setTransactionError(e);
+            }
+        },
+    },
+});
+
diff --git a/src/stores/chain.ts b/src/stores/chain.ts
new file mode 100644
index 00000000..a29613a0
--- /dev/null
+++ b/src/stores/chain.ts
@@ -0,0 +1,162 @@
+import { defineStore } from 'pinia';
+import { BP, GetTableRowsParams, Producer, Token } from 'src/types';
+import { api } from 'src/api';
+import axios from 'axios';
+import { formatCurrency } from 'src/utils/string-utils';
+import { Chain } from 'src/types/Chain';
+import { getChain } from 'src/config/ConfigManager';
+
+
+export interface ChainStateInterface {
+    token: Token;
+    bpList: BP[];
+    producers: Producer[];
+    head_block_num: number;
+    last_irreversible_block_num: number;
+    head_block_producer: string;
+    producerSchedule: string[];
+    ram_price: string;
+}
+
+const chain: Chain = getChain();
+
+export const useChainStore = defineStore('chain', {
+    state: (): ChainStateInterface => ({
+        token: {
+            symbol: '',
+            precision: 0,
+            amount: 0,
+            contract: '',
+        },
+        bpList: [],
+        producers: [],
+        head_block_num: 0,
+        last_irreversible_block_num: 0,
+        head_block_producer: '',
+        producerSchedule: [],
+        ram_price: '0',
+    }),
+    getters: {
+        getToken({ token }): Token {
+            return token;
+        },
+    },
+    actions: {
+        setToken(token: Token) {
+            this.token = token;
+        },
+        setsSymbol(symbol: string) {
+            this.token.symbol = symbol;
+        },
+        setPrecision(precision: number) {
+            this.token.precision = precision;
+        },
+        setBpList(bpList: BP[]) {
+            this.bpList = bpList;
+        },
+        setHead_block_num(hbn: number) {
+            this.head_block_num = hbn;
+        },
+        setLIB(lib: number) {
+            this.last_irreversible_block_num = lib;
+        },
+        setHead_block_producer(hbp: string) {
+            this.head_block_producer = hbp;
+        },
+        setProducerSchedule(schedule: string[]) {
+            this.producerSchedule = schedule;
+        },
+        setProducers(bpList: Producer[]) {
+            this.producers = bpList;
+        },
+        setRamPrice(price: string) {
+            this.ram_price = price;
+        },
+        async updateBpList() {
+            try {
+                const producerSchedule = (await api.getSchedule()).active.producers;
+                const schedule = producerSchedule.map(el => el.producer_name);
+                this.setProducerSchedule(schedule);
+                const objectList = await axios.get(chain.getS3ProducerBucket());
+                const parser = new DOMParser();
+                const contentsArray = parser
+                    .parseFromString(objectList.data, 'text/xml')
+                    .getElementsByTagName('Contents');
+                const lastEntry = contentsArray[contentsArray.length - 1];
+                const lastKey = lastEntry.childNodes[0].textContent;
+                const producerData: BP[] = (
+            await axios.get(`${chain.getS3ProducerBucket()}/${lastKey}`)
+        ).data as BP[];
+                let producers = (await api.getProducers()).rows;
+                producers = producers.filter(producer => producer.is_active === 1);
+                producers = producers.map((data) => {
+                    const bp = producerData.find(
+                        producer => producer.owner === data.owner,
+                    );
+                    if (bp) {
+                        try {
+                            return {
+                                ...data,
+                                name: bp.org.candidate_name,
+                                location: bp.org.location.name,
+                            };
+                        } catch (error) {
+                            return data;
+                        }
+                    } else {
+                        return {
+                            ...data,
+                            name: data.owner,
+                            location: '',
+                        };
+                    }
+                });
+                producerData.sort((a, b) => b.total_votes - a.total_votes);
+                producers.sort((a, b) => b.total_votes - a.total_votes);
+                this.setProducers(producers);
+                this.setBpList(producerData);
+            } catch (err) {
+                console.error(err);
+            }
+        },
+        async updateBlockData() {
+            try {
+                const info = await api.getInfo();
+                this.head_block_num  = info.head_block_num;
+                this.last_irreversible_block_num  =info.last_irreversible_block_num;
+                this.head_block_producer = info.head_block_producer;
+            } catch (err) {
+                console.error(err);
+            }
+        },
+        async updateRamPrice() {
+            try {
+                const paramsRammarket = {
+                    code: 'eosio',
+                    scope: 'eosio',
+                    table: 'rammarket',
+                    json: true,
+                } as GetTableRowsParams;
+                const rammarket = (
+            (await api.getTableRows(paramsRammarket)) as {
+                rows: {
+                    supply: string;
+                    base: { balance: string; weight: string };
+                    quote: { balance: string; weight: string };
+                }[];
+            }
+                ).rows[0];
+                const base = Number(rammarket.base.balance.split(' ')[0]);
+                const quote = Number(rammarket.quote.balance.split(' ')[0]);
+                const price = (quote * 1000) / (base - 1000);
+                // add 0.5% fee to the price
+                const formattedPrice = formatCurrency((price / 0.995), 4, null, true);
+
+                this.setRamPrice(formattedPrice);
+            } catch (err) {
+                console.error(err);
+            }
+        },
+    },
+});
+
diff --git a/src/stores/contract.ts b/src/stores/contract.ts
new file mode 100644
index 00000000..0fa6e1da
--- /dev/null
+++ b/src/stores/contract.ts
@@ -0,0 +1,37 @@
+import { defineStore } from 'pinia';
+
+
+export interface ContractStateInterface {
+    address: string;
+    creator: string;
+}
+
+
+export const useContractStore = defineStore('contract', {
+    state: (): ContractStateInterface => ({
+        address: '',
+        creator: '',
+    }),
+    getters: {
+        getCreatorAddress({ creator }): string {
+            return creator;
+        },
+    },
+    actions: {
+        setContractAddress(contractAddress: string) {
+            this.address = contractAddress;
+        },
+        setCreator(creatorAddress: string) {
+            this.creator = creatorAddress;
+        },
+        setContract(contractAddress: string) {
+            this.setContractAddress(contractAddress);
+            this.getContractInfo();
+        },
+        getContractInfo() {
+            const response: { creator: string } = { creator: 'bob' }; //mock
+            this.setCreator(response.creator);
+        },
+    },
+});
+
diff --git a/src/stores/index.ts b/src/stores/index.ts
new file mode 100644
index 00000000..fc6fef34
--- /dev/null
+++ b/src/stores/index.ts
@@ -0,0 +1,38 @@
+import { store } from 'quasar/wrappers';
+import {
+    createStore,
+} from 'vuex';
+
+import { contract } from 'src/stores/contract';
+import { ContractStateInterface } from 'src/stores/contract/state';
+import { chain } from 'src/stores/chain';
+import { ChainStateInterface } from 'src/stores/chain/state';
+import { account } from 'src/stores/account';
+import { AccountStateInterface } from 'src/stores/account/state';
+import { transaction } from 'src/stores/transaction';
+import { TransactionStateInterface } from 'src/stores/transaction/state';
+import { resources } from 'src/stores/resources';
+import { ResourcesStateInterface } from 'src/stores/resources/state';
+import { createPinia } from 'pinia';
+
+/*
+ * If not building with SSR mode, you can
+ * directly export the Store instantiation;
+ *
+ * The function below can be async too; either use
+ * async/await or return a Promise which resolves
+ * with the Store instance.
+ */
+
+export interface StateInterface {
+    // Define your own store structure, using submodules if needed
+    contract: ContractStateInterface;
+    chain: ChainStateInterface;
+    account: AccountStateInterface;
+    transaction: TransactionStateInterface;
+    resources: ResourcesStateInterface;
+}
+
+export default store(() => {
+    return createPinia();
+});
diff --git a/src/stores/resources.ts b/src/stores/resources.ts
new file mode 100644
index 00000000..372e531c
--- /dev/null
+++ b/src/stores/resources.ts
@@ -0,0 +1,316 @@
+import { defineStore } from 'pinia';
+import { formatCurrency } from 'src/utils/string-utils';
+import { Action, GetTableRowsParams } from 'src/types';
+import { api } from 'src/api';
+import { useAccountStore } from 'src/stores/account';
+import { getChain } from 'src/config/ConfigManager';
+
+export interface DelegatedResources {
+    from: string
+    to: string
+    net_weight: string
+    cpu_weight: string
+    transfer?: boolean
+}
+
+
+export interface ResourcesStateInterface {
+    currentAccount: string;
+    toOthers: DelegatedResources[];
+    toOthersAggregated: number;
+    fromOthers: DelegatedResources | null;
+    selfStaked: DelegatedResources | null;
+    loading: string[];
+    forceUpdate: boolean;
+}
+
+const chain = getChain();
+const symbol = chain.getSystemToken().symbol;
+const precision = chain.getSystemToken().precision;
+
+
+export const useResourceStore = defineStore('resource', {
+    state: (): ResourcesStateInterface => ({
+        currentAccount: '',
+        toOthers: [],
+        toOthersAggregated: 0,
+        fromOthers: null,
+        selfStaked: null,
+        loading: [],
+        forceUpdate: false,
+    }),
+    getters: {
+        // get list of delegates resources to other accounts
+        getDelegatedToOthers(store: ResourcesStateInterface): DelegatedResources[] {
+            return store.toOthers ?? [];
+        },
+
+        // get list of delegates resources to other accounts
+        getDelegatedToOthersAggregated(store: ResourcesStateInterface): number {
+            return store.toOthersAggregated ?? 0;
+        },
+
+        // get list of delegates resources from other accounts
+        getDelegatedFromOthers(store: ResourcesStateInterface): DelegatedResources | null {
+            return store.fromOthers;
+        },
+
+        // get list of self staked resources
+        getSelfStaked(store: ResourcesStateInterface): DelegatedResources | null {
+            return store.selfStaked;
+        },
+
+        getLoading(store: ResourcesStateInterface): string[] {
+            return store.loading;
+        },
+
+        // is loading function name
+        isLoading(store: ResourcesStateInterface): (name: string) => boolean {
+            return (name: string) => store.loading.includes(name);
+        },
+    },
+    actions: {
+        setCurrentAccount(account: string) {
+            this.currentAccount = account;
+        },
+
+        setDelegatedFromOthers(delegated: DelegatedResources) {
+            this.fromOthers = delegated;
+        },
+
+        setDelegatedToOthers(delegated: DelegatedResources[]) {
+            this.toOthers = delegated;
+        },
+
+        setDelegatedToOthersAggregated(aggregated: number) {
+            this.toOthersAggregated = aggregated;
+        },
+
+        setSelfStaked(delegated: DelegatedResources) {
+            this.selfStaked = delegated;
+        },
+
+        setLoading(label: string) {
+            // add label to loading array but only if it's not already there
+            if (!this.loading.includes(label)) {
+                this.loading.push(label);
+            }
+        },
+
+        unsetLoading(label: string) {
+            // remove label from loading array
+            this.loading = this.loading.filter(l => l !== label);
+        },
+
+        setForceUpdate(forceUpdate: boolean) {
+            this.forceUpdate = forceUpdate;
+        },
+
+        async updateResources({ account, force }: {account?:string, force?: boolean}) {
+            const accountStore = useAccountStore();
+
+            const currentAccount = (account) ?? (accountStore.accountName);
+            try {
+                this.setLoading('updateResources');
+                this.setForceUpdate(force);
+                if (
+                    this.currentAccount !== currentAccount ||
+                    !accountStore.data ||
+                    force
+                ) {
+                    // dispatch updateSelfStaked and updateDelegatedToOthers actions in parallel awaiting for both to finish
+                    await Promise.all([
+                        this.updateSelfStaked(currentAccount),
+                        this.updateDelegatedToOthers(currentAccount),
+                    ]);
+                    this.setCurrentAccount(currentAccount);
+                }
+            } catch (err) {
+                console.error('Error:', err);
+            } finally {
+                this.setForceUpdate(false);
+                this.unsetLoading('updateResources');
+            }
+        },
+
+        // self staked resources actions
+        async updateSelfStaked(account: string) {
+            const accountStore = useAccountStore();
+
+            try {
+                this.setLoading('updateSelfStaked');
+                if (
+                    this.currentAccount !== account ||
+                    this.selfStaked?.from !== account ||
+                    this.selfStaked?.to !== account ||
+                    this.forceUpdate
+                ) {
+                    // dispatch loadAccountData action from account module
+                    await accountStore.loadAccountData();
+                }
+
+                const accountData = accountStore.data;
+
+                // self staked resources
+                const self_net_weight = Number(accountData.self_delegated_bandwidth?.net_weight.value ?? 0);
+                const self_cpu_weight = Number(accountData.self_delegated_bandwidth?.cpu_weight.value ?? 0);
+
+                const self_net_asset = formatCurrency(self_net_weight, precision, symbol, true);
+                const self_cpu_asset = formatCurrency(self_cpu_weight, precision, symbol, true);
+
+                const selfStaked: DelegatedResources = {
+                    from: account,
+                    to: account,
+                    net_weight: self_net_asset,
+                    cpu_weight: self_cpu_asset,
+                };
+
+                // total staked resources
+                const total_net_weight = Number(accountData.net_weight?.value ?? 0) / Math.pow(10, precision);
+                const total_cpu_weight = Number(accountData.cpu_weight?.value ?? 0) / Math.pow(10, precision);
+
+                // resources delegated from others
+                const from_others_net_weight = total_net_weight - self_net_weight;
+                const from_others_cpu_weight = total_cpu_weight - self_cpu_weight;
+
+                const from_others_net_asset = formatCurrency(from_others_net_weight, precision, symbol, true);
+                const from_others_cpu_asset = formatCurrency(from_others_cpu_weight, precision, symbol, true);
+
+                const fromOthers: DelegatedResources = {
+                    from: 'not-available',
+                    to: account,
+                    net_weight: from_others_net_asset,
+                    cpu_weight: from_others_cpu_asset,
+                };
+
+                this.setDelegatedFromOthers(fromOthers);
+                this.setSelfStaked(selfStaked);
+            } catch (err) {
+                console.error('Error:', err);
+            } finally {
+                this.unsetLoading('updateSelfStaked');
+            }
+        },
+
+        // delegated resources actions
+        async updateDelegatedToOthers(account: string) {
+            try {
+                this.setLoading('updateDelegatedToOthers');
+
+                const paramsdelband = {
+                    code: 'eosio',
+                    limit: '200',
+                    scope: account,
+                    table: 'delband',
+                } as GetTableRowsParams;
+
+                const delegated = (
+                    (await api.getTableRows(paramsdelband)) as {
+                        rows: DelegatedResources[];
+                    }
+                ).rows;
+
+                const delegatedToOthers = delegated.filter(item => item.to !== account);
+                const delegatedToOthersNet = delegatedToOthers.reduce(
+                    (acc, item) => acc + parseFloat(item.net_weight),
+                    0,
+                );
+                const delegatedToOthersCpu = delegatedToOthers.reduce(
+                    (acc, item) => acc + parseFloat(item.cpu_weight),
+                    0,
+                );
+                const totalDelegatedToOthers = delegatedToOthersCpu + delegatedToOthersNet;
+
+                this.setCurrentAccount(account);
+                this.setDelegatedToOthers(delegated);
+                this.setDelegatedToOthersAggregated(totalDelegatedToOthers);
+            } catch (err) {
+                console.error('Error:', err);
+            } finally {
+                this.unsetLoading('updateDelegatedToOthers');
+            }
+        },
+        async delegateResources(order: DelegatedResources) {
+            const accountStore = useAccountStore();
+            const { from, to, net_weight, cpu_weight } = order;
+
+            // create two actions, one for the delegatebw and one for the transfer
+            try {
+                this.setLoading('delegateResources');
+
+                // calculate the total amount
+                const amount = Number(net_weight ?? '0') + Number(cpu_weight ?? '0');
+
+                const actions = [
+                    {
+                        account: 'eosio',
+                        name: 'delegatebw',
+                        authorization: [
+                            {
+                                actor: from,
+                                permission: 'active',
+                            },
+                        ],
+                        data: {
+                            from,
+                            receiver: to,
+                            stake_net_quantity: net_weight,
+                            stake_cpu_quantity: cpu_weight,
+                            transfer: false,
+                            amount,
+                        },
+                    },
+                ];
+
+                await accountStore.sendTransaction(actions as Action[]);
+                await this.updateResources({ account:from, force: true });
+            } catch (e) {
+                accountStore.setTransactionError(e);
+            } finally {
+                this.unsetLoading('delegateResources');
+            }
+        },
+        async undelegateResources(order: DelegatedResources) {
+            const accountStore = useAccountStore();
+            const { from, to, net_weight, cpu_weight } = order;
+
+            // create two actions, one for the delegatebw and one for the transfer
+            try {
+                this.setLoading('undelegateResources');
+
+                const actions = [
+                    {
+                        account: 'eosio',
+                        name: 'undelegatebw',
+                        authorization: [
+                            {
+                                actor: from,
+                                permission: 'active',
+                            },
+                        ],
+                        data: {
+                            from,
+                            receiver: to,
+                            unstake_net_quantity: net_weight,
+                            unstake_cpu_quantity: cpu_weight,
+                        },
+                    },
+                ];
+                await accountStore.sendTransaction(actions as Action[]);
+                await this.updateResources({ account:from, force: true });
+            } catch (e) {
+                console.error('Error', e);
+            } finally {
+                this.unsetLoading('undelegateResources');
+            }
+        },
+
+        // reset interlaced data when there's no logged in account
+        resetResources() {
+            this.setDelegatedFromOthers(null);
+            this.setDelegatedToOthers([]);
+            this.setSelfStaked(null);
+        },
+    },
+});
+
diff --git a/src/store/store-flag.d.ts b/src/stores/store-flag.d.ts
similarity index 100%
rename from src/store/store-flag.d.ts
rename to src/stores/store-flag.d.ts
diff --git a/src/stores/transaction.ts b/src/stores/transaction.ts
new file mode 100644
index 00000000..ef419070
--- /dev/null
+++ b/src/stores/transaction.ts
@@ -0,0 +1,101 @@
+import { defineStore } from 'pinia';
+import { Action, ActionData } from 'src/types';
+import { api } from 'src/api';
+
+export interface TransactionStateInterface {
+    transaction: ActionData;
+    transactionId: string;
+    blockNum: number;
+    timestamp: string;
+    executed: boolean;
+    cpuUsage: number;
+    netUsage: number;
+    actionCount: number;
+    irreversable: boolean;
+    actions: Action[];
+    transactionFound: boolean;
+}
+
+
+
+export const useTransactionStore = defineStore('transaction', {
+    state: (): TransactionStateInterface => ({
+        transaction: {} as ActionData,
+        transactionId: '',
+        blockNum: 0,
+        timestamp: '',
+        executed: false,
+        cpuUsage: 0,
+        netUsage: 0,
+        actionCount: 0,
+        irreversable: false,
+        actions: [] as Action[],
+        transactionFound: true,
+    }),
+    getters: {
+        getTransaction({ transaction }): ActionData {
+            return transaction;
+        },
+        getTransactionId({ transactionId }): string {
+            return transactionId;
+        },
+    },
+    actions: {
+        setTransaction(transaction: ActionData) {
+            if ((transaction?.actions?.length || 0) > 0) {
+                this.transaction = transaction;
+                this.executed = transaction.executed || false;
+                const action = transaction.actions[0];
+                this.blockNum = action.block_num;
+                this.timestamp = action.timestamp;
+                this.cpuUsage = action.cpu_usage_us;
+                this.netUsage = action.net_usage_words * 8;
+                this.actionCount = transaction.actions.length;
+                this.irreversable = transaction.lib > action.block_num;
+                this.actions = transaction.actions;
+                this.transactionFound = true;
+            } else {
+                this.transactionFound = false;
+            }
+        },
+        setTransactionId(transactionId: string) {
+            this.transactionId = transactionId;
+        },
+        setTimestamp(timestamp: string) {
+            this.timestamp = timestamp;
+        },
+        setBlockNum(blockNum: number) {
+            this.blockNum = blockNum;
+        },
+        setExecuted(executed: boolean) {
+            this.executed = executed;
+        },
+        setCpuUsage(cpuUsage: number) {
+            this.cpuUsage = cpuUsage;
+        },
+        setNetUsage(netUsage: number) {
+            this.netUsage = netUsage;
+        },
+        setActionCount(actionCount: number) {
+            this.actionCount = actionCount;
+        },
+        setIrreversable(irreversable: boolean) {
+            this.irreversable = irreversable;
+        },
+        setTransactionFound(found: boolean) {
+            this.transactionFound = found;
+        },
+        async updateTransaction() {
+            const transaction = await api.getTransaction(this.transactionId);
+            if (transaction) {
+                this.setTransaction(transaction);
+            } else {
+                this.setTransactionFound(false);
+            }
+        },
+        updateTransactionId(transactionId: string) {
+            this.setTransactionId(transactionId);
+        },
+    },
+});
+
diff --git a/src/types/Actions.ts b/src/types/Actions.ts
index 20770701..620680cb 100644
--- a/src/types/Actions.ts
+++ b/src/types/Actions.ts
@@ -22,7 +22,7 @@ export interface GetActionsResponse {
     },
 }
 
-export interface Action {
+export interface Action<T = unknown> {
   '@timestamp': string;
   account_ram_deltas: AccountRamDelta[];
   act: Account;
@@ -43,11 +43,7 @@ export interface Action {
     actor: string;
     permission: string;
   }[];
-  data: {
-    executer: string;
-    proposal_name: string;
-    proposer: string;
-  };
+  data: T;
   name: string;
 }
 
diff --git a/test/jest/__tests__/store/account/actions.spec.ts b/test/jest/__tests__/store/account/actions.spec.ts
index e7512228..6efdf0c0 100644
--- a/test/jest/__tests__/store/account/actions.spec.ts
+++ b/test/jest/__tests__/store/account/actions.spec.ts
@@ -1,4 +1,4 @@
-import { AccountStateInterface } from 'src/store/account/state';
+import { AccountStateInterface } from 'src/stores/account';
 import { FuelUserWrapper } from 'src/api/fuel';
 
 global.fetch = jest.fn((input: RequestInfo | URL) =>
@@ -85,8 +85,9 @@ jest.mock('@greymass/eosio', () => ({
     })),
 }));
 
-import { actions } from 'src/store/account/actions';
 import { User } from 'universal-authenticator-library';
+import { createPinia, setActivePinia } from 'pinia';
+import { useAccountStore } from 'src/stores/account';
 
 const chainIdMock = 'chainIdMock';
 
@@ -110,6 +111,19 @@ describe('Store - Account Actions', () => {
 
 
     beforeEach(() => {
+        state = {
+            isAuthenticated: false,
+            user: null,
+            accountName: '',
+            accountPermission: '',
+        } as AccountStateInterface;
+
+        setActivePinia(createPinia({
+            initialState: {
+                account: state,
+            },
+        }));
+
         users = [{
             name: 'John Doe',
             getAccountName: jest.fn().mockResolvedValue('john.doe'),
@@ -118,23 +132,17 @@ describe('Store - Account Actions', () => {
         commit = jest.fn();
         authenticator = newAuthenticatorMock();
 
-        state = {
-            isAuthenticated: false,
-            user: null,
-            accountName: '',
-            accountPermission: '',
-            chainId: chainIdMock,
-        } as AccountStateInterface;
 
     });
 
     describe('login()', () => {
         test('when not account provided it should should request account', async () => {
+            const accountStore = useAccountStore();
+
             authenticator = newAuthenticatorMock(true);
 
             // call the action login
-            await (actions as { login: (a:unknown, b:unknown) => Promise<void> }).login(
-                { commit, state },
+            await accountStore.login(
                 { account: null, authenticator },
             );
 
diff --git a/test/jest/__tests__/store/antelope.store.spec.ts b/test/jest/__tests__/store/antelope.store.spec.ts
deleted file mode 100644
index 8e479f8c..00000000
--- a/test/jest/__tests__/store/antelope.store.spec.ts
+++ /dev/null
@@ -1,160 +0,0 @@
-import { AntelopeStore, useAntelopeStore } from 'src/store/antelope.store';
-import { DelegatedResources } from 'src/store/resources/state';
-import { Ref, ref } from 'vue';
-
-
-const testDelegatedResources: DelegatedResources = {
-    from: 'from',
-    to: 'to',
-    net_weight: 'net_weight',
-    cpu_weight: 'cpu_weight',
-};
-
-const testString = 'test';
-
-jest.mock('src/store', () => ({
-    useStore: () => ({
-        state: {
-            resources: {
-                delegatedToOthers: [] as DelegatedResources[],
-                delegatedFromOthers: {},
-                selfStaked: {},
-                loading: [] as string[],
-            },
-        },
-        getters: {
-            'resources/getDelegatedToOthers': [testDelegatedResources],
-            'resources/getDelegatedFromOthers': ref({} as DelegatedResources),
-            'resources/getSelfStaked': ({} as DelegatedResources),
-            'resources/getLoading': [testString],
-            'resources/isLoading': (funcname: string) => [funcname].includes(testString),
-        },
-        dispatch: (): Promise<unknown> => Promise.resolve(),
-    }),
-}));
-
-describe('AntilopeStore', () => {
-    let store: AntelopeStore;
-
-    beforeEach(() => {
-        store = useAntelopeStore();
-    });
-
-    describe('useAntelopeStore()', () => {
-
-        it('should return the correct type', () => {
-            const result = useAntelopeStore();
-            const expected = {
-                resources: {
-                    getDelegatedToOthers: (): DelegatedResources[] => [],
-                    getDelegatedFromOthers: (): Ref<DelegatedResources> => ref({} as DelegatedResources),
-                    getSelfStaked: (): DelegatedResources => ({} as DelegatedResources),
-                    getLoading: (): string[] => [],
-                    isLoading: () => false,
-                    updateResources: () => Promise.resolve(),
-                    updateSelfStaked: () => Promise.resolve(),
-                    updateDelegatedToOthers: () => Promise.resolve(),
-                    delegateResources: () => Promise.resolve(),
-                    undelegateResources: () => Promise.resolve(),
-                },
-                state: {
-                    resources: {
-                        delegatedToOthers: [] as DelegatedResources[],
-                        delegatedFromOthers: {},
-                        selfStaked: {},
-                        loading: [] as string[],
-                    },
-                },
-                dispatch: (): Promise<unknown> => Promise.resolve(),
-            };
-            const resultToJSON = JSON.stringify(result);
-            const expectedToJSON = JSON.stringify(expected);
-            expect(resultToJSON).toEqual(expectedToJSON);
-        });
-    });
-
-    describe('AntelopeStore.resources API', () => {
-
-        describe('resources.getDelegatedToOthers()', () => {
-            it('should return the same as getter: resources/getDelegatedToOthers', () => {
-                const result = store.resources.getDelegatedToOthers();
-                const expected = [testDelegatedResources];
-                expect(result).toEqual(expected);
-            });
-        });
-
-        describe('resources.getDelegatedFromOthers()', () => {
-            it('should return the same as getter: resources/getDelegatedFromOthers', () => {
-                const result = store.resources.getDelegatedFromOthers();
-                const expected = ref({} as DelegatedResources);
-                expect(result).toEqual(expected);
-            });
-        });
-
-        describe('resources.getSelfStaked()', () => {
-            it('should return the same as getter: resources/getSelfStaked', () => {
-                const result = store.resources.getSelfStaked();
-                const expected = {} as DelegatedResources;
-                expect(result).toEqual(expected);
-            });
-        });
-
-        describe('resources.getLoading()', () => {
-            it('should return the same as getter: resources/getLoading', () => {
-                const result = store.resources.getLoading();
-                const expected = [testString];
-                expect(result).toEqual(expected);
-            });
-        });
-
-        describe('resources.isLoading()', () => {
-            it('should return the same as getter: resources/isLoading', () => {
-                const result = store.resources.isLoading(testString);
-                const expected = true;
-                expect(result).toEqual(expected);
-            });
-        });
-
-        describe('resources.updateResources()', () => {
-            it('should dispatch: resources/updateResources', () => {
-                const result = store.resources.updateResources({});
-                const expected = Promise.resolve();
-                expect(result).toEqual(expected);
-            });
-        });
-
-        describe('resources.updateSelfStaked()', () => {
-            it('should dispatch: resources/updateSelfStaked', () => {
-                const result = store.resources.updateSelfStaked(testString);
-                const expected = Promise.resolve();
-                expect(result).toEqual(expected);
-            });
-        });
-
-        describe('resources.updateDelegatedToOthers()', () => {
-            it('should dispatch: resources/updateDelegatedToOthers', () => {
-                const result = store.resources.updateDelegatedToOthers(testString);
-                const expected = Promise.resolve();
-                expect(result).toEqual(expected);
-            });
-        });
-
-        describe('resources.delegateResources()', () => {
-            it('should dispatch: resources/delegateResources', () => {
-                const result = store.resources.delegateResources(testDelegatedResources);
-                const expected = Promise.resolve();
-                expect(result).toEqual(expected);
-            });
-        });
-
-        describe('resources.undelegateResources()', () => {
-            it('should dispatch: resources/undelegateResources', () => {
-                const result = store.resources.undelegateResources(testDelegatedResources);
-                const expected = Promise.resolve();
-                expect(result).toEqual(expected);
-            });
-        });
-
-    });
-
-});
diff --git a/test/jest/__tests__/store/resources/actions.spec.ts b/test/jest/__tests__/store/resources/actions.spec.ts
index b9e20bf8..4cbe2f3f 100644
--- a/test/jest/__tests__/store/resources/actions.spec.ts
+++ b/test/jest/__tests__/store/resources/actions.spec.ts
@@ -1,4 +1,4 @@
-import { DelegatedResources, ResourcesStateInterface } from 'src/store/resources/state';
+import { DelegatedResources, ResourcesStateInterface } from 'src/stores/resources';
 import { ref } from 'vue';
 
 global.fetch = jest.fn((input: RequestInfo | URL) =>
@@ -109,8 +109,8 @@ jest.mock('src/api', () => ({
     api: { getTableRows },
 }));
 
-import { actions } from 'src/store/resources/actions';
-import { StateInterface } from 'src/store';
+import { actions } from 'src/stores/resources/actions';
+import { StateInterface } from 'src/stores';
 
 import { GetTableRowsParams } from 'src/types';
 import { API } from '@greymass/eosio';
diff --git a/yarn.lock b/yarn.lock
index 20293b30..d9ac5995 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2401,11 +2401,16 @@
     "@vue/compiler-dom" "3.2.31"
     "@vue/shared" "3.2.31"
 
-"@vue/devtools-api@^6.0.0", "@vue/devtools-api@^6.0.0-beta.11":
+"@vue/devtools-api@^6.0.0":
   version "6.1.3"
   resolved "https://registry.yarnpkg.com/@vue/devtools-api/-/devtools-api-6.1.3.tgz#a44c52e8fa6d22f84db3abdcdd0be5135b7dd7cf"
   integrity sha512-79InfO2xHv+WHIrH1bHXQUiQD/wMls9qBk6WVwGCbdwP7/3zINtvqPNMtmSHXsIKjvUAHc8L0ouOj6ZQQRmcXg==
 
+"@vue/devtools-api@^6.5.0":
+  version "6.5.0"
+  resolved "https://registry.yarnpkg.com/@vue/devtools-api/-/devtools-api-6.5.0.tgz#98b99425edee70b4c992692628fa1ea2c1e57d07"
+  integrity sha512-o9KfBeaBmCKl10usN4crU53fYtC1r7jJwdGKjPT24t348rHxgfpZ0xL3Xm/gLUYnc0oTp8LAmrxOeLyu6tbk2Q==
+
 "@vue/reactivity-transform@3.2.31":
   version "3.2.31"
   resolved "https://registry.yarnpkg.com/@vue/reactivity-transform/-/reactivity-transform-3.2.31.tgz#0f5b25c24e70edab2b613d5305c465b50fc00911"
@@ -4913,6 +4918,13 @@ eslint-plugin-jest@^25.2.2:
   dependencies:
     "@typescript-eslint/experimental-utils" "^5.0.0"
 
+eslint-plugin-unused-imports@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-unused-imports/-/eslint-plugin-unused-imports-3.0.0.tgz#d25175b0072ff16a91892c3aa72a09ca3a9e69e7"
+  integrity sha512-sduiswLJfZHeeBJ+MQaG+xYzSWdRXoSw61DpU13mzWumCkR0ufD0HmO4kdNokjrkluMHpj/7PJeN35pgbhW3kw==
+  dependencies:
+    eslint-rule-composer "^0.3.0"
+
 eslint-plugin-vue@^9.0.0:
   version "9.9.0"
   resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-9.9.0.tgz#ac788ebccd2eb94d846a507df55da50693b80c91"
@@ -4926,7 +4938,12 @@ eslint-plugin-vue@^9.0.0:
     vue-eslint-parser "^9.0.1"
     xml-name-validator "^4.0.0"
 
-eslint-scope@5.1.1, eslint-scope@^5.1.1:
+eslint-rule-composer@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz#79320c927b0c5c0d3d3d2b76c8b4a488f25bbaf9"
+  integrity sha512-bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg==
+
+eslint-scope@5.1.1, eslint-scope@^5.0.0, eslint-scope@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
   integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
@@ -8956,6 +8973,28 @@ picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1:
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
+pidusage@^2.0.21:
+  version "2.0.21"
+  resolved "https://registry.npmjs.org/pidusage/-/pidusage-2.0.21.tgz"
+  integrity sha512-cv3xAQos+pugVX+BfXpHsbyz/dLzX+lr44zNMsYiGxUw+kV5sgQCIcLd1z+0vq+KyC7dJ+/ts2PsfgWfSC3WXA==
+  dependencies:
+    safe-buffer "^5.2.1"
+
+pidusage@~3.0:
+  version "3.0.2"
+  resolved "https://registry.npmjs.org/pidusage/-/pidusage-3.0.2.tgz"
+  integrity sha512-g0VU+y08pKw5M8EZ2rIGiEBaB8wrQMjYGFfW2QVIfyT8V+fq8YFLkvlz4bz5ljvFDJYNFCWT3PWqcRr2FKO81w==
+  dependencies:
+    safe-buffer "^5.2.1"
+
+pinia@^2.1.6:
+  version "2.1.6"
+  resolved "https://registry.yarnpkg.com/pinia/-/pinia-2.1.6.tgz#e88959f14b61c4debd9c42d0c9944e2875cbe0fa"
+  integrity sha512-bIU6QuE5qZviMmct5XwCesXelb5VavdOWKWaB17ggk++NUwQWWbP5YnsONTk3b752QkW9sACiR81rorpeOMSvQ==
+  dependencies:
+    "@vue/devtools-api" "^6.5.0"
+    vue-demi ">=0.14.5"
+
 pirates@^4.0.1:
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.5.tgz#feec352ea5c3268fb23a37c702ab1699f35a5f3b"
@@ -11272,6 +11311,11 @@ vue-class-component@^7.2.6:
   resolved "https://registry.yarnpkg.com/vue-class-component/-/vue-class-component-7.2.6.tgz#8471e037b8e4762f5a464686e19e5afc708502e4"
   integrity sha512-+eaQXVrAm/LldalI272PpDe3+i4mPis0ORiMYxF6Ae4hyuCh15W8Idet7wPUEs4N4YptgFHGys4UrgNQOMyO6w==
 
+vue-demi@>=0.14.5:
+  version "0.14.6"
+  resolved "https://registry.yarnpkg.com/vue-demi/-/vue-demi-0.14.6.tgz#dc706582851dc1cdc17a0054f4fec2eb6df74c92"
+  integrity sha512-8QA7wrYSHKaYgUxDA5ZC24w+eHm3sYCbp0EzcDwKqN3p6HqtTCGR/GVsPyZW92unff4UlcSh++lmqDWN3ZIq4w==
+
 vue-eslint-parser@^9.0.1:
   version "9.1.0"
   resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-9.1.0.tgz#0e121d1bb29bd10763c83e3cc583ee03434a9dd5"
@@ -11358,13 +11402,6 @@ vue@^3.0.0:
     "@vue/server-renderer" "3.2.31"
     "@vue/shared" "3.2.31"
 
-vuex@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/vuex/-/vuex-4.0.2.tgz#f896dbd5bf2a0e963f00c67e9b610de749ccacc9"
-  integrity sha512-M6r8uxELjZIK8kTKDGgZTYX/ahzblnzC4isU1tpmEuOIIKmV+TRdc+H4s8ds2NuZ7wpUTdGRzJRtoj+lI+pc0Q==
-  dependencies:
-    "@vue/devtools-api" "^6.0.0-beta.11"
-
 w3c-hr-time@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd"

From f6c075c8aeca35cdc50a9492fbccf6fc4b13885d Mon Sep 17 00:00:00 2001
From: Karyne Mayer <karyne@detroitledger.tech>
Date: Tue, 28 Nov 2023 16:07:43 -0800
Subject: [PATCH 02/10] tests wip

---
 package.json                                  |   3 +-
 src/components/Header.vue                     |   1 -
 src/stores/index.ts                           |  14 +-
 .../account.spec.ts}                          |  25 ++--
 .../resources.spec.ts}                        |  83 +++++++----
 yarn.lock                                     | 140 +++++++++++++++---
 6 files changed, 191 insertions(+), 75 deletions(-)
 rename test/jest/__tests__/{store/account/actions.spec.ts => stores/account.spec.ts} (93%)
 rename test/jest/__tests__/{store/resources/actions.spec.ts => stores/resources.spec.ts} (78%)

diff --git a/package.json b/package.json
index 5718525c..6eee9712 100644
--- a/package.json
+++ b/package.json
@@ -25,11 +25,10 @@
     "moment": "^2.29.4",
     "ol": "^6.14.1",
     "pinia": "^2.1.6",
-    "pm2": "^5.3.0",
     "quasar": "^2.6.2",
     "ual-anchor": "1.3.0",
     "universal-authenticator-library": "^0.3.0",
-    "vue": "^3.0.0",
+    "vue": "^3.3.0",
     "vue-class-component": "^7.2.6",
     "vue-json-viewer": "^3.0.4",
     "vue-router": "^4.0.0",
diff --git a/src/components/Header.vue b/src/components/Header.vue
index 35657905..5a4658f8 100644
--- a/src/components/Header.vue
+++ b/src/components/Header.vue
@@ -26,7 +26,6 @@ export default defineComponent({
         const account = computed(() => accountStore.accountName);
         const isLarge = computed((): boolean => $q.screen.gt.md);
         const showMultichainSelector = computed(() => process.env.SHOW_MULTICHAIN_SELECTOR === 'true');
-        const headBlock = computed((): number => store.state.chain.head_block_num);
 
         const isTestnet = ref(getChain().isTestnet());
         const smallLogoPath = ref(getChain().getSmallLogoPath());
diff --git a/src/stores/index.ts b/src/stores/index.ts
index fc6fef34..29174b36 100644
--- a/src/stores/index.ts
+++ b/src/stores/index.ts
@@ -1,17 +1,11 @@
 import { store } from 'quasar/wrappers';
-import {
-    createStore,
-} from 'vuex';
 
-import { contract } from 'src/stores/contract';
+
+
 import { ContractStateInterface } from 'src/stores/contract/state';
-import { chain } from 'src/stores/chain';
 import { ChainStateInterface } from 'src/stores/chain/state';
-import { account } from 'src/stores/account';
 import { AccountStateInterface } from 'src/stores/account/state';
-import { transaction } from 'src/stores/transaction';
 import { TransactionStateInterface } from 'src/stores/transaction/state';
-import { resources } from 'src/stores/resources';
 import { ResourcesStateInterface } from 'src/stores/resources/state';
 import { createPinia } from 'pinia';
 
@@ -33,6 +27,4 @@ export interface StateInterface {
     resources: ResourcesStateInterface;
 }
 
-export default store(() => {
-    return createPinia();
-});
+export default store(() => createPinia());
diff --git a/test/jest/__tests__/store/account/actions.spec.ts b/test/jest/__tests__/stores/account.spec.ts
similarity index 93%
rename from test/jest/__tests__/store/account/actions.spec.ts
rename to test/jest/__tests__/stores/account.spec.ts
index 6efdf0c0..0e1d9cf4 100644
--- a/test/jest/__tests__/store/account/actions.spec.ts
+++ b/test/jest/__tests__/stores/account.spec.ts
@@ -85,7 +85,7 @@ jest.mock('@greymass/eosio', () => ({
     })),
 }));
 
-import { User } from 'universal-authenticator-library';
+import { Authenticator, User } from 'universal-authenticator-library';
 import { createPinia, setActivePinia } from 'pinia';
 import { useAccountStore } from 'src/stores/account';
 
@@ -96,8 +96,6 @@ describe('Store - Account Actions', () => {
     let state: AccountStateInterface;
     let users: User[] = [];
 
-
-    // commit('setChainId', (authenticator as Authenticator).chains[0].chainId);
     const newAuthenticatorMock = (requestName = false) => ({
         init: jest.fn(),
         shouldRequestAccountName: jest.fn().mockResolvedValue(new Promise(resolve => resolve(requestName))),
@@ -106,7 +104,8 @@ describe('Store - Account Actions', () => {
         chains: [{
             chainId: chainIdMock,
         }],
-    });
+    } as unknown as Authenticator);
+
     let authenticator = newAuthenticatorMock();
 
 
@@ -118,11 +117,7 @@ describe('Store - Account Actions', () => {
             accountPermission: '',
         } as AccountStateInterface;
 
-        setActivePinia(createPinia({
-            initialState: {
-                account: state,
-            },
-        }));
+        setActivePinia(createPinia());
 
         users = [{
             name: 'John Doe',
@@ -138,7 +133,6 @@ describe('Store - Account Actions', () => {
     describe('login()', () => {
         test('when not account provided it should should request account', async () => {
             const accountStore = useAccountStore();
-
             authenticator = newAuthenticatorMock(true);
 
             // call the action login
@@ -156,11 +150,13 @@ describe('Store - Account Actions', () => {
         });
 
         test('when not account provided but not needed', async () => {
+            const accountStore = useAccountStore();
+
             const requestAccountSpy = jest.spyOn(authenticator, 'shouldRequestAccountName');
             requestAccountSpy.mockResolvedValue(false);
 
             // call the action login
-            await (actions as { login: (a:unknown, b:unknown) => Promise<void> }).login(
+            await (accountStore as { login: (a:unknown, b:unknown) => Promise<void> }).login(
                 { commit, state },
                 { account: null, authenticator },
             );
@@ -184,8 +180,10 @@ describe('Store - Account Actions', () => {
         });
 
         test('when account provided - Normal case', async () => {
+            const accountStore = useAccountStore();
+
             // call the action login
-            await (actions as { login: (a:unknown, b:unknown) => Promise<void> }).login(
+            await (accountStore as { login: (a:unknown, b:unknown) => Promise<void> }).login(
                 { commit, state },
                 { account: 'john.doe', authenticator },
             );
@@ -207,8 +205,9 @@ describe('Store - Account Actions', () => {
 
     describe('logout()', () => {
         test('normal case', async () => {
+            const accountStore = useAccountStore();
             // call the action logout
-            await (actions as { logout: (a:unknown) => Promise<void> }).logout({ commit, state });
+            await (accountStore as { logout: (a:unknown) => void }).logout({ commit, state });
 
             // Verify that the action called the commit mutation 'setIsAuthenticated' with the value false
             expect(commit).toHaveBeenCalledWith('setIsAuthenticated', false);
diff --git a/test/jest/__tests__/store/resources/actions.spec.ts b/test/jest/__tests__/stores/resources.spec.ts
similarity index 78%
rename from test/jest/__tests__/store/resources/actions.spec.ts
rename to test/jest/__tests__/stores/resources.spec.ts
index 4cbe2f3f..6745be53 100644
--- a/test/jest/__tests__/store/resources/actions.spec.ts
+++ b/test/jest/__tests__/stores/resources.spec.ts
@@ -1,5 +1,11 @@
-import { DelegatedResources, ResourcesStateInterface } from 'src/stores/resources';
-import { ref } from 'vue';
+import { DelegatedResources, ResourcesStateInterface, useResourceStore } from 'src/stores/resources';
+import { ref, createApp } from 'vue';
+import { StateInterface } from 'src/stores';
+
+import { GetTableRowsParams } from 'src/types';
+import { API } from '@greymass/eosio';
+import { createPinia, setActivePinia } from 'pinia';
+
 
 global.fetch = jest.fn((input: RequestInfo | URL) =>
     Promise.resolve({
@@ -51,6 +57,7 @@ const localStorageMock = {
     setItem: jest.fn(),
     removeItem:jest.fn(),
 };
+
 Object.defineProperty(window, 'localStorage', { value: localStorageMock });
 
 
@@ -65,6 +72,9 @@ const transactionHeaders = {
     transaction_extensions: [] as never[],
 };
 
+// pinia required
+const app = createApp({});
+
 jest.mock('@greymass/eosio', () => ({
     // mocking static functions from
     Name: {
@@ -99,29 +109,36 @@ jest.mock('src/config/ConfigManager', () => ({
 }));
 
 const delbandResponse: {rows: DelegatedResources[]} = { rows: [] };
-const getTableRows = jest.fn().mockImplementation((s: GetTableRowsParams) => {
-    if (s.table === 'delband' && s.code === 'eosio') {
-        return Promise.resolve(delbandResponse);
-    }
-});
+// const getTableRows = jest.fn().mockImplementation((s: GetTableRowsParams) => {
+//     if (s.table === 'delband' && s.code === 'eosio') {
+//         return Promise.resolve(delbandResponse);
+//     }
+// });
 
 jest.mock('src/api', () => ({
-    api: { getTableRows },
+    api: { getTableRows: jest.fn().mockImplementation((s: GetTableRowsParams) => {
+        if (s.table === 'delband' && s.code === 'eosio') {
+            return Promise.resolve(delbandResponse);
+        }
+    })},
 }));
 
-import { actions } from 'src/stores/resources/actions';
-import { StateInterface } from 'src/stores';
-
-import { GetTableRowsParams } from 'src/types';
-import { API } from '@greymass/eosio';
 
 describe('Store - Resources Actions', () => {
-    let commit: jest.Mock;
-    let dispatch: jest.Mock;
+    let setLoading: jest.SpyInstance;
+    let setCurrentAccount: jest.SpyInstance;
+    let setDelegatedToOthers: jest.SpyInstance;
+    let setDelegatedToOthersAggregated: jest.SpyInstance;
+    let unsetLoading: jest.SpyInstance;
     let state: ResourcesStateInterface;
     let rootState: StateInterface;
     const accountName = 'accountName'; // logged account
     let data: unknown = {};
+    const pinia = createPinia();
+    app.use(pinia);
+    setActivePinia(pinia);
+    const resourceStore = useResourceStore();
+
 
     const setDelbandResponse = (accountList: string[]) => {
         delbandResponse.rows = [];
@@ -136,8 +153,12 @@ describe('Store - Resources Actions', () => {
     };
 
     beforeEach(() => {
-        commit = jest.fn();
-        dispatch = jest.fn();
+        setLoading = jest.spyOn(resourceStore, 'setLoading');
+        setCurrentAccount = jest.spyOn(resourceStore, 'setCurrentAccount');
+        setDelegatedToOthers = jest.spyOn(resourceStore, 'setDelegatedToOthers');
+        setDelegatedToOthersAggregated = jest.spyOn(resourceStore, 'setDelegatedToOthersAggregated');
+        unsetLoading = jest.spyOn(resourceStore, 'unsetLoading');
+
         getTableRows.mockClear();
 
         state = {
@@ -160,18 +181,15 @@ describe('Store - Resources Actions', () => {
 
     describe('updateDelegatedToOthers()', () => {
 
-        test('when executed it always brings up to 200 resoults for the given account', async () => {
+        test('when executed it always brings up to 200 results for the given account', async () => {
             data = ref(null);
             setDelbandResponse([accountName]);
 
             // call the action login
-            await (actions as { updateDelegatedToOthers: (a:unknown, b:string) => Promise<void> }).updateDelegatedToOthers(
-                { commit, dispatch, state, rootState },
-                accountName,
-            );
+            await resourceStore.updateDelegatedToOthers(accountName);
 
             // Verify the loading state
-            expect(commit).toHaveBeenCalledWith('setLoading', 'updateDelegatedToOthers');
+            expect(setLoading).toHaveBeenCalledWith('updateDelegatedToOthers');
 
             // Verify the api call to get the delegated resources
             const paramsdelband = {
@@ -180,14 +198,15 @@ describe('Store - Resources Actions', () => {
                 scope: accountName,
                 table: 'delband',
             } as GetTableRowsParams;
-            expect(getTableRows).toHaveBeenCalledWith(paramsdelband);
+
+            expect(api.getTableRows).toHaveBeenCalledWith(paramsdelband);
 
             // Verify the final commits
-            expect(commit).toHaveBeenCalledWith('setCurrentAccount', accountName);
-            expect(commit).toHaveBeenCalledWith('setDelegatedToOthers', delbandResponse.rows);
+            expect(setCurrentAccount).toHaveBeenCalledWith(accountName);
+            expect(setCurrentAccount).toHaveBeenCalledWith(delbandResponse.rows);
 
             // Verify the loading state
-            expect(commit).toHaveBeenCalledWith('unsetLoading', 'updateDelegatedToOthers');
+            expect(unsetLoading).toHaveBeenCalledWith('updateDelegatedToOthers');
 
         });
     });
@@ -195,10 +214,11 @@ describe('Store - Resources Actions', () => {
     describe('updateResources()', () => {
 
         test('when we don\'t have account data', async () => {
+            const resourceStore = useResourceStore();
             data = ref(null);
 
             // call the action login
-            await (actions as { updateResources: (a:unknown, b:boolean) => Promise<void> }).updateResources(
+            await (resourceStore as { updateResources: (a:unknown, b:boolean) => Promise<void> }).updateResources(
                 { commit, dispatch, state, rootState },
                 false,
             );
@@ -220,10 +240,11 @@ describe('Store - Resources Actions', () => {
         });
 
         test('when we have account data', async () => {
+            const resourceStore = useResourceStore();
             data = ref({});
 
             // call the action login
-            await (actions as { updateResources: (a:unknown, b:boolean) => Promise<void> }).updateResources(
+            await (resourceStore as { updateResources: (a:unknown, b:boolean) => Promise<void> }).updateResources(
                 { commit, dispatch, state, rootState },
                 false,
             );
@@ -249,6 +270,8 @@ describe('Store - Resources Actions', () => {
     describe('updateSelfStaked()', () => {
 
         test('when current account is not the given account', async () => {
+            const resourceStore = useResourceStore();
+
             const anotheraccount = 'anotheraccount';
             rootState.account.data = {
                 self_delegated_bandwidth: {
@@ -261,7 +284,7 @@ describe('Store - Resources Actions', () => {
             setDelbandResponse([accountName]);
 
             // call the action login
-            await (actions as { updateSelfStaked: (a:unknown, b:string) => Promise<void> }).updateSelfStaked(
+            await (resourceStore as { updateSelfStaked: (a:unknown, b:string) => Promise<void> }).updateSelfStaked(
                 { commit, dispatch, state, rootState },
                 anotheraccount,
             );
diff --git a/yarn.lock b/yarn.lock
index d9ac5995..2cf91e3b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -443,6 +443,11 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.0.tgz#da950e622420bf96ca0d0f2909cdddac3acd8719"
   integrity sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==
 
+"@babel/parser@^7.23.3":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.4.tgz#409fbe690c333bb70187e2de4021e1e47a026661"
+  integrity sha512-vf3Xna6UEprW+7t6EtOmFpHNAuxw3xqPZghy+brsnusscJRW5BMUzzHZc5ICjULee81WeUV2jjakG09MDglJXQ==
+
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.17.12":
   version "7.17.12"
   resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.17.12.tgz#1dca338caaefca368639c9ffb095afbd4d420b1e"
@@ -1503,7 +1508,7 @@
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
   integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
 
-"@jridgewell/sourcemap-codec@^1.4.14":
+"@jridgewell/sourcemap-codec@^1.4.14", "@jridgewell/sourcemap-codec@^1.4.15":
   version "1.4.15"
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
   integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
@@ -2369,6 +2374,16 @@
     estree-walker "^2.0.2"
     source-map "^0.6.1"
 
+"@vue/compiler-core@3.3.9":
+  version "3.3.9"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.3.9.tgz#df1fc7947dcef5c2e12d257eae540057707f47d1"
+  integrity sha512-+/Lf68Vr/nFBA6ol4xOtJrW+BQWv3QWKfRwGSm70jtXwfhZNF4R/eRgyVJYoxFRhdCTk/F6g99BP0ffPgZihfQ==
+  dependencies:
+    "@babel/parser" "^7.23.3"
+    "@vue/shared" "3.3.9"
+    estree-walker "^2.0.2"
+    source-map-js "^1.0.2"
+
 "@vue/compiler-dom@3.2.31":
   version "3.2.31"
   resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.31.tgz#b1b7dfad55c96c8cc2b919cd7eb5fd7e4ddbf00e"
@@ -2377,6 +2392,14 @@
     "@vue/compiler-core" "3.2.31"
     "@vue/shared" "3.2.31"
 
+"@vue/compiler-dom@3.3.9":
+  version "3.3.9"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.3.9.tgz#67315ea4193d9d18c7a710889b8f90f7aa3914d2"
+  integrity sha512-nfWubTtLXuT4iBeDSZ5J3m218MjOy42Vp2pmKVuBKo2/BLcrFUX8nCSr/bKRFiJ32R8qbdnnnBgRn9AdU5v0Sg==
+  dependencies:
+    "@vue/compiler-core" "3.3.9"
+    "@vue/shared" "3.3.9"
+
 "@vue/compiler-sfc@3.2.31":
   version "3.2.31"
   resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.31.tgz#d02b29c3fe34d599a52c5ae1c6937b4d69f11c2f"
@@ -2393,6 +2416,22 @@
     postcss "^8.1.10"
     source-map "^0.6.1"
 
+"@vue/compiler-sfc@3.3.9":
+  version "3.3.9"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.3.9.tgz#5900906baba1a90389200d81753ad0f7ceb98a83"
+  integrity sha512-wy0CNc8z4ihoDzjASCOCsQuzW0A/HP27+0MDSSICMjVIFzk/rFViezkR3dzH+miS2NDEz8ywMdbjO5ylhOLI2A==
+  dependencies:
+    "@babel/parser" "^7.23.3"
+    "@vue/compiler-core" "3.3.9"
+    "@vue/compiler-dom" "3.3.9"
+    "@vue/compiler-ssr" "3.3.9"
+    "@vue/reactivity-transform" "3.3.9"
+    "@vue/shared" "3.3.9"
+    estree-walker "^2.0.2"
+    magic-string "^0.30.5"
+    postcss "^8.4.31"
+    source-map-js "^1.0.2"
+
 "@vue/compiler-ssr@3.2.31":
   version "3.2.31"
   resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.31.tgz#4fa00f486c9c4580b40a4177871ebbd650ecb99c"
@@ -2401,6 +2440,14 @@
     "@vue/compiler-dom" "3.2.31"
     "@vue/shared" "3.2.31"
 
+"@vue/compiler-ssr@3.3.9":
+  version "3.3.9"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.3.9.tgz#3b3dbfa5368165fa4ff74c060503b4087ec1beed"
+  integrity sha512-NO5oobAw78R0G4SODY5A502MGnDNiDjf6qvhn7zD7TJGc8XDeIEw4fg6JU705jZ/YhuokBKz0A5a/FL/XZU73g==
+  dependencies:
+    "@vue/compiler-dom" "3.3.9"
+    "@vue/shared" "3.3.9"
+
 "@vue/devtools-api@^6.0.0":
   version "6.1.3"
   resolved "https://registry.yarnpkg.com/@vue/devtools-api/-/devtools-api-6.1.3.tgz#a44c52e8fa6d22f84db3abdcdd0be5135b7dd7cf"
@@ -2422,6 +2469,17 @@
     estree-walker "^2.0.2"
     magic-string "^0.25.7"
 
+"@vue/reactivity-transform@3.3.9":
+  version "3.3.9"
+  resolved "https://registry.yarnpkg.com/@vue/reactivity-transform/-/reactivity-transform-3.3.9.tgz#5d894dd9a42a422a2db309babb385f9a2529b52f"
+  integrity sha512-HnUFm7Ry6dFa4Lp63DAxTixUp8opMtQr6RxQCpDI1vlh12rkGIeYqMvJtK+IKyEfEOa2I9oCkD1mmsPdaGpdVg==
+  dependencies:
+    "@babel/parser" "^7.23.3"
+    "@vue/compiler-core" "3.3.9"
+    "@vue/shared" "3.3.9"
+    estree-walker "^2.0.2"
+    magic-string "^0.30.5"
+
 "@vue/reactivity@3.2.31":
   version "3.2.31"
   resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.2.31.tgz#fc90aa2cdf695418b79e534783aca90d63a46bbd"
@@ -2429,6 +2487,13 @@
   dependencies:
     "@vue/shared" "3.2.31"
 
+"@vue/reactivity@3.3.9":
+  version "3.3.9"
+  resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.3.9.tgz#e28e8071bd74edcdd9c87b667ad00e8fbd8d6920"
+  integrity sha512-VmpIqlNp+aYDg2X0xQhJqHx9YguOmz2UxuUJDckBdQCNkipJvfk9yA75woLWElCa0Jtyec3lAAt49GO0izsphw==
+  dependencies:
+    "@vue/shared" "3.3.9"
+
 "@vue/runtime-core@3.2.31":
   version "3.2.31"
   resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.2.31.tgz#9d284c382f5f981b7a7b5971052a1dc4ef39ac7a"
@@ -2437,6 +2502,14 @@
     "@vue/reactivity" "3.2.31"
     "@vue/shared" "3.2.31"
 
+"@vue/runtime-core@3.3.9":
+  version "3.3.9"
+  resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.3.9.tgz#c835b77f7dc7ae5f251e93f277b54963ea1b5c31"
+  integrity sha512-xxaG9KvPm3GTRuM4ZyU8Tc+pMVzcu6eeoSRQJ9IE7NmCcClW6z4B3Ij6L4EDl80sxe/arTtQ6YmgiO4UZqRc+w==
+  dependencies:
+    "@vue/reactivity" "3.3.9"
+    "@vue/shared" "3.3.9"
+
 "@vue/runtime-dom@3.2.31":
   version "3.2.31"
   resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.2.31.tgz#79ce01817cb3caf2c9d923f669b738d2d7953eff"
@@ -2446,6 +2519,15 @@
     "@vue/shared" "3.2.31"
     csstype "^2.6.8"
 
+"@vue/runtime-dom@3.3.9":
+  version "3.3.9"
+  resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.3.9.tgz#68081d981695a229d72f431fed0b0cdd9161ce53"
+  integrity sha512-e7LIfcxYSWbV6BK1wQv9qJyxprC75EvSqF/kQKe6bdZEDNValzeRXEVgiX7AHI6hZ59HA4h7WT5CGvm69vzJTQ==
+  dependencies:
+    "@vue/runtime-core" "3.3.9"
+    "@vue/shared" "3.3.9"
+    csstype "^3.1.2"
+
 "@vue/server-renderer@3.2.31":
   version "3.2.31"
   resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.2.31.tgz#201e9d6ce735847d5989403af81ef80960da7141"
@@ -2454,11 +2536,24 @@
     "@vue/compiler-ssr" "3.2.31"
     "@vue/shared" "3.2.31"
 
+"@vue/server-renderer@3.3.9":
+  version "3.3.9"
+  resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.3.9.tgz#ffb41bc9c7afafcc608d0c500e9d6b0af7d68fad"
+  integrity sha512-w0zT/s5l3Oa3ZjtLW88eO4uV6AQFqU8X5GOgzq7SkQQu6vVr+8tfm+OI2kDBplS/W/XgCBuFXiPw6T5EdwXP0A==
+  dependencies:
+    "@vue/compiler-ssr" "3.3.9"
+    "@vue/shared" "3.3.9"
+
 "@vue/shared@3.2.31":
   version "3.2.31"
   resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.31.tgz#c90de7126d833dcd3a4c7534d534be2fb41faa4e"
   integrity sha512-ymN2pj6zEjiKJZbrf98UM2pfDd6F2H7ksKw7NDt/ZZ1fh5Ei39X5tABugtT03ZRlWd9imccoK0hE8hpjpU7irQ==
 
+"@vue/shared@3.3.9":
+  version "3.3.9"
+  resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.3.9.tgz#df740d26d338faf03e09ca662a8031acf66051db"
+  integrity sha512-ZE0VTIR0LmYgeyhurPTpy4KzKsuDyQbMSdM49eKkMnT5X4VfFBLysMzjIZhLEFQYjjOVVfbvUDHckwjDFiO2eA==
+
 "@vue/test-utils@^2.0.0-rc.10":
   version "2.0.0-rc.17"
   resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-2.0.0-rc.17.tgz#e6dcf5b5bd3ae23595bdb154b9b578ebcdffd698"
@@ -4349,6 +4444,11 @@ csstype@^2.6.8:
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.20.tgz#9229c65ea0b260cf4d3d997cb06288e36a8d6dda"
   integrity sha512-/WwNkdXfckNgw6S5R125rrW8ez139lBHWouiBvX8dfMFtcn6V81REDqnH7+CRpRipfYlyU1CmOnOxrmGcFOjeA==
 
+csstype@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.2.tgz#1d4bf9d572f11c14031f0436e1c10bc1f571f50b"
+  integrity sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==
+
 csvtojson@^2.0.10:
   version "2.0.10"
   resolved "https://registry.yarnpkg.com/csvtojson/-/csvtojson-2.0.10.tgz#11e7242cc630da54efce7958a45f443210357574"
@@ -4943,7 +5043,7 @@ eslint-rule-composer@^0.3.0:
   resolved "https://registry.yarnpkg.com/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz#79320c927b0c5c0d3d3d2b76c8b4a488f25bbaf9"
   integrity sha512-bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg==
 
-eslint-scope@5.1.1, eslint-scope@^5.0.0, eslint-scope@^5.1.1:
+eslint-scope@5.1.1, eslint-scope@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
   integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
@@ -7725,6 +7825,13 @@ magic-string@^0.25.7:
   dependencies:
     sourcemap-codec "^1.4.8"
 
+magic-string@^0.30.5:
+  version "0.30.5"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.5.tgz#1994d980bd1c8835dc6e78db7cbd4ae4f24746f9"
+  integrity sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==
+  dependencies:
+    "@jridgewell/sourcemap-codec" "^1.4.15"
+
 make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
@@ -8973,20 +9080,6 @@ picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1:
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
-pidusage@^2.0.21:
-  version "2.0.21"
-  resolved "https://registry.npmjs.org/pidusage/-/pidusage-2.0.21.tgz"
-  integrity sha512-cv3xAQos+pugVX+BfXpHsbyz/dLzX+lr44zNMsYiGxUw+kV5sgQCIcLd1z+0vq+KyC7dJ+/ts2PsfgWfSC3WXA==
-  dependencies:
-    safe-buffer "^5.2.1"
-
-pidusage@~3.0:
-  version "3.0.2"
-  resolved "https://registry.npmjs.org/pidusage/-/pidusage-3.0.2.tgz"
-  integrity sha512-g0VU+y08pKw5M8EZ2rIGiEBaB8wrQMjYGFfW2QVIfyT8V+fq8YFLkvlz4bz5ljvFDJYNFCWT3PWqcRr2FKO81w==
-  dependencies:
-    safe-buffer "^5.2.1"
-
 pinia@^2.1.6:
   version "2.1.6"
   resolved "https://registry.yarnpkg.com/pinia/-/pinia-2.1.6.tgz#e88959f14b61c4debd9c42d0c9944e2875cbe0fa"
@@ -9282,7 +9375,7 @@ postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0:
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
   integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
 
-postcss@^8.1.10, postcss@^8.2.15, postcss@^8.3.11, postcss@^8.3.5, postcss@^8.4.4:
+postcss@^8.1.10, postcss@^8.2.15, postcss@^8.3.11, postcss@^8.3.5, postcss@^8.4.31, postcss@^8.4.4:
   version "8.4.31"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.31.tgz#92b451050a9f914da6755af352bdc0192508656d"
   integrity sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==
@@ -9617,7 +9710,7 @@ read-pkg@^5.2.0:
 read@1, read@^1.0.7, read@~1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/read/-/read-1.0.7.tgz#b3da19bd052431a97671d44a42634adf710b40c4"
-  integrity sha1-s9oZvQUkMal2cdRKQmNK33ELQMQ=
+  integrity sha512-rSOKNYUmaxy0om1BNjMN4ezNT6VKK+2xF4GBhc81mkH7L60i6dp8qPYrkndNLT3QPphoII3maL9PVC9XmhHwVQ==
   dependencies:
     mute-stream "~0.0.4"
 
@@ -11402,6 +11495,17 @@ vue@^3.0.0:
     "@vue/server-renderer" "3.2.31"
     "@vue/shared" "3.2.31"
 
+vue@^3.3.0:
+  version "3.3.9"
+  resolved "https://registry.yarnpkg.com/vue/-/vue-3.3.9.tgz#219a2ec68e8d4d0b0180460af0f5b9299b3f3f1f"
+  integrity sha512-sy5sLCTR8m6tvUk1/ijri3Yqzgpdsmxgj6n6yl7GXXCXqVbmW2RCXe9atE4cEI6Iv7L89v5f35fZRRr5dChP9w==
+  dependencies:
+    "@vue/compiler-dom" "3.3.9"
+    "@vue/compiler-sfc" "3.3.9"
+    "@vue/runtime-dom" "3.3.9"
+    "@vue/server-renderer" "3.3.9"
+    "@vue/shared" "3.3.9"
+
 w3c-hr-time@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd"

From 86c24993d8bbeb6504fe6e7abad664354b2a8fc3 Mon Sep 17 00:00:00 2001
From: Karyne Mayer <karyne@detroitledger.tech>
Date: Mon, 1 Apr 2024 17:36:44 -0700
Subject: [PATCH 03/10] Solving build issues

---
 src/boot/api.ts                               |  2 +-
 src/components/AccountCard.vue                |  2 +-
 src/components/ProposalUploadCSV.vue          |  5 ++--
 src/components/TransactionsTable.vue          |  6 ++--
 src/components/WorldMap.vue                   |  9 ++----
 src/components/contract/ContractTables.vue    |  2 +-
 src/components/resources/BuyRam.vue           | 18 +++++++-----
 src/components/resources/RefundTab.vue        | 17 +++++------
 src/components/resources/UnstakeTab.vue       |  5 ++--
 src/components/staking/ProcessingTab.vue      |  2 --
 src/components/staking/StakingDialog.vue      |  6 ++--
 .../validators/ValidatorDataTable.vue         |  2 +-
 src/pages/Account.vue                         |  4 +--
 src/pages/ProposalItem.vue                    |  6 ++--
 src/pages/ProposalNew.vue                     |  4 +--
 src/stores/account.ts                         | 13 +++++----
 src/stores/index.ts                           | 10 +++----
 src/types/Api.ts                              | 29 ++++++++++++++++---
 src/types/index.ts                            |  1 +
 yarn.lock                                     |  6 ++--
 20 files changed, 82 insertions(+), 67 deletions(-)

diff --git a/src/boot/api.ts b/src/boot/api.ts
index f52fee52..3a3bed68 100644
--- a/src/boot/api.ts
+++ b/src/boot/api.ts
@@ -2,7 +2,7 @@ import { boot } from 'quasar/wrappers';
 import { ApiClient } from 'src/types/Api';
 import { api } from 'src/api';
 
-declare module '@vue/runtime-core' {
+declare module 'vue' {
   interface ComponentCustomProperties {
     $api: ApiClient;
   }
diff --git a/src/components/AccountCard.vue b/src/components/AccountCard.vue
index 003acf99..0e7d28d4 100644
--- a/src/components/AccountCard.vue
+++ b/src/components/AccountCard.vue
@@ -411,7 +411,7 @@ export default defineComponent({
             },
         );
         watch(
-            () => resourceStore.getDelegatedToOthersAggregated(),
+            (): number => resourceStore.getDelegatedToOthersAggregated,
             () => {
                 setTotalBalance();
             },
diff --git a/src/components/ProposalUploadCSV.vue b/src/components/ProposalUploadCSV.vue
index 16f229ad..69113efb 100644
--- a/src/components/ProposalUploadCSV.vue
+++ b/src/components/ProposalUploadCSV.vue
@@ -2,15 +2,16 @@
 import { defineComponent, ref } from 'vue';
 import csvToJson from 'csvtojson';
 import { useQuasar } from 'quasar';
-import { useAntelopeStore } from 'src/store/antelope.store';
+import { useAccountStore } from 'src/stores/account';
 
 export default defineComponent({
     name: 'ProposalUploadCSV',
     emits: ['actions'],
     setup(_, context) {
         const $q = useQuasar();
+        const accountStore = useAccountStore();
         const file = ref<File | null>(null);
-        const permission = useAntelopeStore().state.account.accountPermission;
+        const permission = accountStore.accountPermission;
 
         function handleError(message: string) {
             $q.notify({
diff --git a/src/components/TransactionsTable.vue b/src/components/TransactionsTable.vue
index a6b92163..d83e682c 100644
--- a/src/components/TransactionsTable.vue
+++ b/src/components/TransactionsTable.vue
@@ -331,8 +331,8 @@ export default defineComponent({
                     timestamp: item['@timestamp'] || item.timestamp,
                     action: item,
                     data: hasActions.value
-                        ? { data: item.data as unknown, name: item.account }
-                        : { data: item.act.data as unknown, name: item.act.name },
+                        ? { data: item.data, name: item.account }
+                        : { data: item.act.data, name: item.act.name },
                     actions: [
                         {
                             name: item.trx_id,
@@ -341,7 +341,7 @@ export default defineComponent({
                             action: item,
                             data: hasActions.value
                                 ? {
-                                    data: item.data as unknown,
+                                    data: item.data,
                                     name: item.account,
                                 }
                                 : { data: item.act.data as unknown, name: item.act.name },
diff --git a/src/components/WorldMap.vue b/src/components/WorldMap.vue
index dfe53f38..a5666012 100644
--- a/src/components/WorldMap.vue
+++ b/src/components/WorldMap.vue
@@ -16,7 +16,6 @@ import Feature from 'ol/Feature';
 import { easeOut } from 'ol/easing';
 import { getVectorContext } from 'ol/render';
 import { unByKey } from 'ol/Observable';
-import { mapActions } from 'vuex';
 import { BP } from 'src/types';
 import VectorImageLayer from 'ol/layer/VectorImage';
 import { getCssVar } from 'quasar';
@@ -56,7 +55,8 @@ export default defineComponent({
             currentHeadProducer,
             schedule,
             producerToggle,
-            updateToggleOption
+            updateToggleOption,
+            chainStore,
         };
     },
     data() {
@@ -68,11 +68,8 @@ export default defineComponent({
             MapSource: null
         };
     },
-    methods: {
-        ...mapActions('chain', ['updateBpList'])
-    },
     async mounted() {
-        await this.updateBpList();
+        await this.chainStore.updateBpList();
 
         // ---- Map Styles ----
         const style = new Style({
diff --git a/src/components/contract/ContractTables.vue b/src/components/contract/ContractTables.vue
index eb6e44c0..a3e46a4e 100644
--- a/src/components/contract/ContractTables.vue
+++ b/src/components/contract/ContractTables.vue
@@ -1,5 +1,5 @@
 <script lang="ts">
-import { defineComponent, ref, computed, onMounted } from 'vue';
+import { defineComponent, ref, computed, onMounted, watch } from 'vue';
 import { api } from 'src/api/index';
 import { GetTableRowsParams, GenericTable } from 'src/types';
 import { TableIndexType } from 'src/types/Api';
diff --git a/src/components/resources/BuyRam.vue b/src/components/resources/BuyRam.vue
index 30242ab1..29eba35d 100644
--- a/src/components/resources/BuyRam.vue
+++ b/src/components/resources/BuyRam.vue
@@ -5,6 +5,7 @@ import { getChain } from 'src/config/ConfigManager';
 import { formatCurrency, isValidAccount } from 'src/utils/string-utils';
 import { API, UInt64 } from '@greymass/eosio';
 import { useAccountStore } from 'src/stores/account';
+import { useChainStore } from 'src/stores/chain';
 
 const chain = getChain();
 
@@ -15,6 +16,7 @@ export default defineComponent({
     },
     setup() {
         const accountStore = useAccountStore();
+        const chainStore = useChainStore();
         let openTransaction = ref<boolean>(false);
         const buyAmount = ref<string>('');
         const symbol = ref<string>(chain.getSystemToken().symbol);
@@ -44,17 +46,17 @@ export default defineComponent({
         const transactionError = computed(
             () => accountStore.TransactionError,
         );
-        const ramPrice = computed((): string => store.state?.chain.ram_price);
+        const ramPrice = computed((): string => chainStore.ram_price);
         const ramAvailable = computed(() =>
             UInt64.sub(
-                accountStore.data.ram_quota,
-                accountStore.data.ram_usage,
+                accountData.value.ram_quota,
+                accountData.value.ram_usage,
             ),
         );
-        const accountData = computed((): API.v1.AccountObject => store.state?.account.data);
+        const accountData = computed((): API.v1.AccountObject => accountStore.getAccountData);
 
         function formatDec() {
-            const precision = store.state.chain.token.precision;
+            const precision = chainStore.token.precision;
             if (buyOption.value === buyOptions[0]) {
                 buyAmount.value = Number(buyAmount.value)
                     .toLocaleString('en-US', {
@@ -71,7 +73,7 @@ export default defineComponent({
         }
 
         async function buy() {
-            void store.dispatch('account/resetTransaction');
+            accountStore.resetTransaction();
             if (buyOption.value === buyOptions[0]) {
                 if (
                     buyAmount.value === '0' ||
@@ -81,7 +83,7 @@ export default defineComponent({
                 ) {
                     return;
                 }
-                await store.dispatch('account/buyRam', {
+                await accountStore.buyRam({
                     amount: buyAmount.value + ' ' + symbol.value,
                     receivingAccount: receivingAccount.value,
                 });
@@ -95,7 +97,7 @@ export default defineComponent({
                 ) {
                     return;
                 }
-                await store.dispatch('account/buyRamBytes', {
+                await accountStore.buyRamBytes({
                     amount: buyAmount.value,
                     receivingAccount: receivingAccount.value,
                 });
diff --git a/src/components/resources/RefundTab.vue b/src/components/resources/RefundTab.vue
index ccca869d..c208a3a6 100644
--- a/src/components/resources/RefundTab.vue
+++ b/src/components/resources/RefundTab.vue
@@ -1,7 +1,6 @@
 <script lang="ts">
 import { defineComponent, ref, computed } from 'vue';
 import { Token } from 'src/types';
-import { mapActions } from 'vuex';
 import ViewTransaction from 'src/components/ViewTransanction.vue';
 import { API } from '@greymass/eosio';
 import { formatCurrency } from 'src/utils/string-utils';
@@ -96,7 +95,6 @@ export default defineComponent({
             formatStaked,
             refundProgress,
             refundCountdown,
-            ...mapActions({ sendAction: 'account/sendAction' }),
             transactionId: ref<string>(null),
             transactionError: null,
         };
@@ -109,14 +107,13 @@ export default defineComponent({
                 transfer: false,
             };
             try {
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-                this.transactionId = (
-                    await this.sendAction({
-                        account: 'eosio',
-                        name: 'refund',
-                        data,
-                    })
-                ).transactionId as string;
+                await this.accountStore.sendAction({
+                    account: 'eosio',
+                    name: 'refund',
+                    data,
+                });
+
+                this.transactionId = this.accountStore.TransactionId;
             } catch (e) {
                 this.transactionError = e;
                 this.accountStore.setTransactionError(e);
diff --git a/src/components/resources/UnstakeTab.vue b/src/components/resources/UnstakeTab.vue
index df94e1b0..20cbe095 100644
--- a/src/components/resources/UnstakeTab.vue
+++ b/src/components/resources/UnstakeTab.vue
@@ -1,6 +1,5 @@
 <script lang="ts">
 import { computed, defineComponent, ref } from 'vue';
-import { mapActions } from 'vuex';
 import ViewTransaction from 'src/components/ViewTransanction.vue';
 import { getChain } from 'src/config/ConfigManager';
 import { DelegatedResources, useResourceStore } from 'src/stores/resources';
@@ -85,13 +84,13 @@ export default defineComponent({
             loading,
             cpuTokens,
             netTokens,
-            ...mapActions({ undelegateResources: 'resources/undelegateResources' }),
             transactionId: ref<string>(null),
             transactionError: null,
             formatDec,
             assetToAmount,
             netStake,
             cpuStake,
+            resourceStore,
         };
     },
     watch: {
@@ -145,7 +144,7 @@ export default defineComponent({
                 return;
             }
 
-            await this.undelegateResources({
+            await this.resourceStore.undelegateResources({
                 from: this.stakingAccount,
                 to: this.receiverAccount,
                 transfer: false,
diff --git a/src/components/staking/ProcessingTab.vue b/src/components/staking/ProcessingTab.vue
index f0bb84e7..faa0231a 100644
--- a/src/components/staking/ProcessingTab.vue
+++ b/src/components/staking/ProcessingTab.vue
@@ -1,7 +1,6 @@
 <script lang="ts">
 import { defineComponent, ref, computed } from 'vue';
 import { Token } from 'src/types';
-import { mapActions } from 'vuex';
 import { API } from '@greymass/eosio';
 import { useAccountStore } from 'src/stores/account';
 import { useChainStore } from 'src/stores/chain';
@@ -71,7 +70,6 @@ export default defineComponent({
             refundProgress,
             maturitiesCountdown,
             maturingRex,
-            ...mapActions({ refund: 'account/refund' }),
             transactionId: ref<string>(null),
             transactionError: null,
         };
diff --git a/src/components/staking/StakingDialog.vue b/src/components/staking/StakingDialog.vue
index 5499669f..e9fee993 100644
--- a/src/components/staking/StakingDialog.vue
+++ b/src/components/staking/StakingDialog.vue
@@ -1,7 +1,6 @@
 <script lang="ts">
 import { computed, defineComponent, PropType, ref } from 'vue';
 import { Token } from 'src/types';
-import { mapGetters } from 'vuex';
 import StakingInfo from 'src/components/staking/StakingInfo.vue';
 import StakeFromResources from 'src/components/staking/StakeFromResources.vue';
 import ProcessingTab from 'src/components/staking/ProcessingTab.vue';
@@ -79,7 +78,6 @@ export default defineComponent({
         };
     },
     computed: {
-        ...mapGetters({ account: 'account/accountName' }),
         transactionForm(): boolean {
             return !(this.transactionError || this.transactionId);
         },
@@ -88,7 +86,7 @@ export default defineComponent({
         async sendTransaction(): Promise<void> {
             const actionAccount = this.sendToken.contract;
             const data = {
-                from: this.account as string,
+                from: this.accountStore.accountName,
                 to: this.recievingAccount,
                 quantity: `${this.sendAmount} ${this.sendToken.symbol}`,
                 memo: this.memo,
@@ -123,7 +121,7 @@ export default defineComponent({
         async loadAccountData(): Promise<void> {
             let data: API.v1.AccountObject;
             try {
-                data = await this.$api.getAccount(this.account);
+                data = await this.$api.getAccount(this.accountStore.accountName);
                 this.accountStore.setAccountData(data);
             } catch (e) {
                 return;
diff --git a/src/components/validators/ValidatorDataTable.vue b/src/components/validators/ValidatorDataTable.vue
index 30e30ade..13c84518 100644
--- a/src/components/validators/ValidatorDataTable.vue
+++ b/src/components/validators/ValidatorDataTable.vue
@@ -75,7 +75,7 @@ export default defineComponent({
                     val.splice(index, 1);
                 }
             });
-            store.commit('account/setVote', val);
+            accountStore.setVote(val);
         }
 
         function isTop21(val: string): boolean {
diff --git a/src/pages/Account.vue b/src/pages/Account.vue
index 0161fa42..a078bc18 100644
--- a/src/pages/Account.vue
+++ b/src/pages/Account.vue
@@ -35,14 +35,14 @@ export default defineComponent({
         const tokenList = ref(api.getTokens(account.value));
 
         onMounted(async () => {
-            await store.dispatch('account/updateABI', route.params.account);
+            await accountStore.updateABI(route.params.account as string);
             if (route.query.tab !== tab.value) {
                 await updateQueryParams();
             }
         });
 
         watch([account], async () => {
-            await store.dispatch('account/updateABI', route.params.account);
+            await accountStore.updateABI(route.params.account as string);
         });
 
         const updateQueryParams =  async () => {
diff --git a/src/pages/ProposalItem.vue b/src/pages/ProposalItem.vue
index ac25350b..98c51ee0 100644
--- a/src/pages/ProposalItem.vue
+++ b/src/pages/ProposalItem.vue
@@ -328,7 +328,7 @@ export default defineComponent({
                             authorization: [
                                 {
                                     actor: account.value,
-                                    permission: store.state.account.accountPermission,
+                                    permission: accountStore.accountPermission,
                                 },
                             ],
                             data,
@@ -353,7 +353,7 @@ export default defineComponent({
                         proposal_name: proposalName,
                         level: {
                             actor: account.value,
-                            permission: store.state.account.accountPermission,
+                            permission: accountStore.accountPermission,
                         },
                     },
                 });
@@ -374,7 +374,7 @@ export default defineComponent({
                         proposal_name: proposalName,
                         level: {
                             actor: account.value,
-                            permission: store.state.account.accountPermission,
+                            permission: accountStore.accountPermission,
                         },
                     },
                 });
diff --git a/src/pages/ProposalNew.vue b/src/pages/ProposalNew.vue
index 7e004ceb..6c2f5ac8 100644
--- a/src/pages/ProposalNew.vue
+++ b/src/pages/ProposalNew.vue
@@ -88,7 +88,7 @@ export default defineComponent({
                 if (item.is_active === 1) {
                     producersAccount.push({
                         actor: item.owner,
-                        permission: store.state.account.accountPermission,
+                        permission: accountStore.accountPermission,
                     });
                 }
             }
@@ -162,7 +162,7 @@ export default defineComponent({
                                 authorization: [
                                     {
                                         actor: account.value,
-                                        permission: store.state.account.accountPermission,
+                                        permission: accountStore.accountPermission,
                                     },
                                 ],
                                 data,
diff --git a/src/stores/account.ts b/src/stores/account.ts
index 1e61fae2..721fdc13 100644
--- a/src/stores/account.ts
+++ b/src/stores/account.ts
@@ -1,6 +1,6 @@
 import { defineStore } from 'pinia';
 import { ABI, Action, Authorization, GetTableRowsParams, Rexbal, RexbalRows, RexPoolRows } from 'src/types';
-import { API, Asset, Name } from '@greymass/eosio';
+import { API, Name, UInt64 } from '@greymass/eosio';
 import { Authenticator, User } from 'universal-authenticator-library';
 import { getChain } from 'src/config/ConfigManager';
 import { markRaw } from 'vue';
@@ -50,7 +50,7 @@ export const useAccountStore = defineStore('account', {
         isAuthenticated: false,
         linkedAccounts: [],
         data: {
-            account_name: Name.from(''),
+            account_name: '',
             /** Highest block number on the chain */
             // head_block_num: UInt32;
             // /** Highest block unix timestamp. */
@@ -62,13 +62,13 @@ export const useAccountStore = defineStore('account', {
             // /** Account created as unix timestamp. */
             // created: TimePoint;
             /** Account core token balance */
-            core_liquid_balance: Asset.from(0, symbol),
-            // ram_quota: Int64;
+            core_liquid_balance: UInt64.from(0),
+            ram_quota: UInt64.from(0),
             // net_weight: Int64;
             // cpu_weight: Int64;
             // net_limit: AccountResourceLimit;
             // cpu_limit: AccountResourceLimit;
-            // ram_usage: UInt64;
+            ram_usage: UInt64.from(0),
             // permissions: AccountPermission[];
             // total_resources: AccountTotalResources;
             // self_delegated_bandwidth?: AccountSelfDelegatedBandwidth;
@@ -76,7 +76,8 @@ export const useAccountStore = defineStore('account', {
             // voter_info?: AccountVoterInfo;
             // rex_info?: AccountRexInfo;
             // getPermission(permission: NameType): AccountPermission;
-        } as API.v1.AccountObject,
+        } as unknown as API.v1.AccountObject,
+
         authorization: [],
         rexActions: [],
         TransactionId: '',
diff --git a/src/stores/index.ts b/src/stores/index.ts
index 29174b36..7ef4d258 100644
--- a/src/stores/index.ts
+++ b/src/stores/index.ts
@@ -2,11 +2,11 @@ import { store } from 'quasar/wrappers';
 
 
 
-import { ContractStateInterface } from 'src/stores/contract/state';
-import { ChainStateInterface } from 'src/stores/chain/state';
-import { AccountStateInterface } from 'src/stores/account/state';
-import { TransactionStateInterface } from 'src/stores/transaction/state';
-import { ResourcesStateInterface } from 'src/stores/resources/state';
+import { ContractStateInterface } from 'src/stores/contract';
+import { ChainStateInterface } from 'src/stores/chain';
+import { AccountStateInterface } from 'src/stores/account';
+import { TransactionStateInterface } from 'src/stores/transaction';
+import { ResourcesStateInterface } from 'src/stores/resources';
 import { createPinia } from 'pinia';
 
 /*
diff --git a/src/types/Api.ts b/src/types/Api.ts
index 6b4a13d7..a0c30ced 100644
--- a/src/types/Api.ts
+++ b/src/types/Api.ts
@@ -10,8 +10,9 @@ import {
     UInt32Type,
     API,
     PublicKey,
+    ActionType,
+    ABISerializable,
 } from '@greymass/eosio';
-import { Transaction } from 'src/types/Transaction';
 import {
     AccountDetails,
     Action,
@@ -21,7 +22,15 @@ import {
     Block,
     ActionData,
     Get_actions,
-} from 'src/types/Actions';
+    Transaction,
+    ABI,
+    ChainInfo,
+    ProducerSchedule,
+    GetProposals,
+    GetProducers,
+    GetActionsResponse,
+    GetProposalsProps,
+} from 'src/types';
 
 export type AccountCreatorInfo = {
   creator: string;
@@ -93,13 +102,25 @@ export type ApiClient = {
   getHyperionAccountData: (address: string) => Promise<AccountDetails>;
   getCreator: (address: string) => Promise<any>;
   getTokens: (address: string) => Promise<Token[]>;
-  getTransactions: (filter: HyperionTransactionFilter) => Promise<Action[]>;
+  getTransactions: (filter: HyperionTransactionFilter) => Promise<GetActionsResponse>;
   getTransaction: (address: string) => Promise<ActionData>;
-  getTransactionV1: (id: string) => Promise<Transaction>;
   getChildren: (address: string) => Promise<Action[]>;
+  getTableRows: (tableInput: GetTableRowsParams) => Promise<unknown>;
+  getTokenBalances: (address: string) => Promise<unknown>;
+  getTransactionV1: (id: string) => Promise<Transaction>;
   getPermissionLinks: (address: string) => Promise<PermissionLinks[]>;
   getTableByScope: (data: unknown) => Promise<TableByScope[]>;
   getBlock: (block: string) => Promise<Block>;
   getActions: (address: string, filter: string) => Promise<Get_actions>;
+  getInfo: () => Promise<ChainInfo>;
+  getSchedule: () => Promise<ProducerSchedule>;
+  getProposals: ({ proposer, proposal, requested, provided, executed, limit, skip }: GetProposalsProps) => Promise<GetProposals>;
+  getProducers: () => Promise<GetProducers>;
+  getABI: (account: string) => Promise<ABI>;
+  deserializeActionData: (data: ActionType) => Promise<ABISerializable>;
+  serializeActionData: (account: string, name: string, data: unknown) => Promise<unknown>;
+  getProducerSchedule: () =>  Promise<{
+    active: { producers: { producer_name: string }[] };
+  }>;
   getApy: () => Promise<string>;
 };
diff --git a/src/types/index.ts b/src/types/index.ts
index b87ac10c..de3c06e4 100644
--- a/src/types/index.ts
+++ b/src/types/index.ts
@@ -20,6 +20,7 @@ export {
     Block,
     Get_actions,
     Error,
+    GetActionsResponse,
 } from 'src/types/Actions';
 export {
     TransactionTableRow,
diff --git a/yarn.lock b/yarn.lock
index 2cf91e3b..a783156f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3659,9 +3659,9 @@ caniuse-api@^3.0.0:
     lodash.uniq "^4.5.0"
 
 caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001317, caniuse-lite@^1.0.30001332:
-  version "1.0.30001515"
-  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001515.tgz"
-  integrity sha512-eEFDwUOZbE24sb+Ecsx3+OvNETqjWIdabMy52oOkIgcUtAsQifjUG9q4U9dgTHJM2mfk4uEPxc0+xuFdJ629QA==
+  version "1.0.30001603"
+  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001603.tgz"
+  integrity sha512-iL2iSS0eDILMb9n5yKQoTBim9jMZ0Yrk8g0N9K7UzYyWnfIKzXBZD5ngpM37ZcL/cv0Mli8XtVMRYMQAfFpi5Q==
 
 canvg@^3.0.6:
   version "3.0.10"

From c34970391ca18ff28f8fd2fd4c94b9406ebe8f84 Mon Sep 17 00:00:00 2001
From: Karyne Mayer <karyne@detroitledger.tech>
Date: Wed, 10 Apr 2024 12:30:16 -0700
Subject: [PATCH 04/10] resources store tests fixed

---
 package.json                                 |   1 +
 quasar.conf.js                               |   2 +-
 src/api/hyperion.ts                          |  50 ++--
 src/boot/axios.ts                            |  11 -
 src/components/Header.vue                    |   2 -
 src/stores/account.ts                        |   1 +
 src/stores/resources.ts                      |   3 +-
 src/types/vue-global.d.ts                    |   2 -
 test/jest/__tests__/stores/resources.spec.ts | 292 +++++++++----------
 yarn.lock                                    |   7 +
 10 files changed, 174 insertions(+), 197 deletions(-)
 delete mode 100644 src/boot/axios.ts

diff --git a/package.json b/package.json
index 6eee9712..930fef74 100644
--- a/package.json
+++ b/package.json
@@ -36,6 +36,7 @@
   },
   "devDependencies": {
     "@babel/eslint-parser": "^7.13.14",
+    "@pinia/testing": "^0.1.3",
     "@quasar/app-webpack": "^3.5.3",
     "@quasar/quasar-app-extension-testing-unit-jest": "^3.0.0-alpha.10",
     "@types/jest": "^27.4.0",
diff --git a/quasar.conf.js b/quasar.conf.js
index 30c97181..9c5eea74 100644
--- a/quasar.conf.js
+++ b/quasar.conf.js
@@ -30,7 +30,7 @@ module.exports = configure(function (ctx) {
     // app boot file (/src/boot)
     // --> boot files are part of "main.js"
     // https://quasar.dev/quasar-cli/boot-files
-    boot: ['config', 'axios', 'fathom', 'api', 'ual', 'fuel'],
+    boot: ['config', 'fathom', 'api', 'ual', 'fuel'],
 
     // https://quasar.dev/quasar-cli/quasar-conf-js#Property%3A-css
     css: ['app.sass'],
diff --git a/src/api/hyperion.ts b/src/api/hyperion.ts
index a5e61b7f..2dcbc30c 100644
--- a/src/api/hyperion.ts
+++ b/src/api/hyperion.ts
@@ -38,15 +38,6 @@ const name = chain.getName();
 const url =
   `https://raw.githubusercontent.com/telosnetwork/token-list/main/tokens.${name}.json`;
 
-const tokenListPromise = fetch(url)
-    .then(response => response.text())
-    .then((fileContent: string) => JSON.parse(fileContent) as { account: string }[])
-    .then(originals => originals.map(token => token as unknown as Token))
-    .catch((error) => {
-        console.error(error);
-        return [];
-    });
-
 const MAX_REQUESTS_COUNT = 5;
 const INTERVAL_MS = 10;
 let PENDING_REQUESTS = 0;
@@ -97,23 +88,32 @@ export const getCreator = async function (address: string): Promise<AccountCreat
 };
 
 export const getTokens = async function (address?: string): Promise<Token[]> {
-    if (address) {
-        const response = await hyperion.get('v2/state/get_tokens', {
-            params: { account: address },
-        });
-        const tokens = await tokenListPromise;
-        const balances = (response.data as {tokens:Token[]}).tokens;
-        return balances.map((token:Token) => {
-            const tk = tokens.find((t:Token) => t.symbol === token.symbol) as Token;
-            if (tk && tk.logo) {
-                token.logo = tk?.logo;
-            } else {
-                token.logo = DEFAULT_ICON;
-            }
-            return token;
+    try {
+        const tokens = await axios.get(url).then((response) => {
+            const nhaca = (response.data as Token[]);
+            console.log(nhaca);
+            return nhaca;
         });
-    } else {
-        return await tokenListPromise;
+        if (address) {
+            const response = await hyperion.get('v2/state/get_tokens', {
+                params: { account: address },
+            });
+            const balances = (response.data as {tokens:Token[]}).tokens;
+            // return tokens;
+            return balances.map((token:Token) => {
+                const tk = tokens.find((t:Token) => t.symbol === token.symbol);
+                if (tk && tk.logo) {
+                    token.logo = tk?.logo;
+                } else {
+                    token.logo = DEFAULT_ICON;
+                }
+                return token;
+            });
+        } else {
+            return tokens;
+        }
+    } catch(e) {
+        console.error(e);
     }
 };
 
diff --git a/src/boot/axios.ts b/src/boot/axios.ts
deleted file mode 100644
index f94375a7..00000000
--- a/src/boot/axios.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { boot } from 'quasar/wrappers';
-import axios, { AxiosInstance } from 'axios';
-declare module '@vue/runtime-core' {
-  interface ComponentCustomProperties {
-    $axios: AxiosInstance;
-  }
-}
-
-export default boot(({ app }) => {
-    app.config.globalProperties.$axios = axios;
-});
diff --git a/src/components/Header.vue b/src/components/Header.vue
index 5a4658f8..703a55dc 100644
--- a/src/components/Header.vue
+++ b/src/components/Header.vue
@@ -8,7 +8,6 @@ import ConfigManager, { getChain } from 'src/config/ConfigManager';
 import { useRouteDataNetwork } from 'src/router';
 import { HeaderSettings } from 'src/types/UiCustomization';
 import { useAccountStore } from 'src/stores/account';
-import { useChainStore } from 'src/stores/chain';
 
 export default defineComponent({
     name: 'AppHeader',
@@ -20,7 +19,6 @@ export default defineComponent({
     setup() {
         const $q = useQuasar();
         const accountStore = useAccountStore();
-        const chainStore = useChainStore();
         const headerSettings = computed((): HeaderSettings => ConfigManager.get().getCurrentChain().getUiCustomization().headerSettings);
 
         const account = computed(() => accountStore.accountName);
diff --git a/src/stores/account.ts b/src/stores/account.ts
index 721fdc13..e91829f2 100644
--- a/src/stores/account.ts
+++ b/src/stores/account.ts
@@ -234,6 +234,7 @@ export const useAccountStore = defineStore('account', {
         async loadAccountData() {
             try {
                 this.data = await api.getAccount(this.accountName);
+                console.log('account - loadAccountData', this.data);
             } catch (e) {
                 return;
             }
diff --git a/src/stores/resources.ts b/src/stores/resources.ts
index 372e531c..b7de5f8f 100644
--- a/src/stores/resources.ts
+++ b/src/stores/resources.ts
@@ -108,8 +108,8 @@ export const useResourceStore = defineStore('resource', {
 
         async updateResources({ account, force }: {account?:string, force?: boolean}) {
             const accountStore = useAccountStore();
-
             const currentAccount = (account) ?? (accountStore.accountName);
+
             try {
                 this.setLoading('updateResources');
                 this.setForceUpdate(force);
@@ -139,6 +139,7 @@ export const useResourceStore = defineStore('resource', {
 
             try {
                 this.setLoading('updateSelfStaked');
+
                 if (
                     this.currentAccount !== account ||
                     this.selfStaked?.from !== account ||
diff --git a/src/types/vue-global.d.ts b/src/types/vue-global.d.ts
index 379aedd8..e70aedb4 100644
--- a/src/types/vue-global.d.ts
+++ b/src/types/vue-global.d.ts
@@ -1,10 +1,8 @@
-import { AxiosInstance } from 'axios';
 import { ApiClient } from 'src/types/Api';
 import { UAL, User } from 'universal-authenticator-library';
 
 declare module 'vue/types/vue' {
   interface Vue {
-    $axios: AxiosInstance;
     $api: ApiClient;
     $ual: UAL;
     $user: User;
diff --git a/test/jest/__tests__/stores/resources.spec.ts b/test/jest/__tests__/stores/resources.spec.ts
index 6745be53..771a6e5a 100644
--- a/test/jest/__tests__/stores/resources.spec.ts
+++ b/test/jest/__tests__/stores/resources.spec.ts
@@ -1,66 +1,21 @@
-import { DelegatedResources, ResourcesStateInterface, useResourceStore } from 'src/stores/resources';
-import { ref, createApp } from 'vue';
-import { StateInterface } from 'src/stores';
-
+import { DelegatedResources, useResourceStore } from 'src/stores/resources';
+import { ref } from 'vue';
 import { GetTableRowsParams } from 'src/types';
 import { API } from '@greymass/eosio';
 import { createPinia, setActivePinia } from 'pinia';
+import { getTableRows } from 'src/api/eosio_core';
+import axios from 'axios';
 
-
-global.fetch = jest.fn((input: RequestInfo | URL) =>
-    Promise.resolve({
-        text: () => {
-            if (input.toString() === 'https://raw.githubusercontent.com/telosnetwork/token-list/main/telosmain.json') {
-                return `{
-                    "tokens": [
-                        {
-                            "name": "Telos",
-                            "logo_sm": "https://raw.githubusercontent.com/Viterbo/token-list/master/logos/telos.png",
-                            "logo_lg": "https://raw.githubusercontent.com/Viterbo/token-list/master/logos/telos.png",
-                            "symbol": "TLOS",
-                            "account": "eosio.token"
-                        },
-                        {
-                            "name": "pTokens BTC",
-                            "logo_sm": "https://raw.githubusercontent.com/Viterbo/token-list/master/logos/pbtc.png",
-                            "logo_lg": "https://raw.githubusercontent.com/Viterbo/token-list/master/logos/pbtc-lg.png",
-                            "symbol": "PBTC",
-                            "account": "btc.ptokens"
-                        }
-                    ]
-                }`;
-            } else {
-                return `[
-                    {
-                      "name": "Telos",
-                      "symbol": "TLOS",
-                      "contract": "eosio.token",
-                      "precision": 4,
-                      "logo": "https://raw.githubusercontent.com/Viterbo/token-list/master/logos/telos.png"
-                    },
-                    {
-                      "name": "Qubicles",
-                      "symbol": "QBE",
-                      "contract": "qubicletoken",
-                      "precision": 4,
-                      "logo": "https://raw.githubusercontent.com/Viterbo/token-list/master/logos/qbe.png"
-                    }
-                ]
-                `;
-            }
-        },
-    } as unknown as Response),
-);
+jest.spyOn(axios, 'create');
 
 const localStorageMock = {
     getItem: jest.fn(),
     setItem: jest.fn(),
-    removeItem:jest.fn(),
+    removeItem: jest.fn(),
 };
 
 Object.defineProperty(window, 'localStorage', { value: localStorageMock });
 
-
 const transactionHeaders = {
     context_free_actions: [] as never[],
     delay_sec: 123,
@@ -72,9 +27,6 @@ const transactionHeaders = {
     transaction_extensions: [] as never[],
 };
 
-// pinia required
-const app = createApp({});
-
 jest.mock('@greymass/eosio', () => ({
     // mocking static functions from
     Name: {
@@ -95,50 +47,72 @@ jest.mock('@greymass/eosio', () => ({
             },
         },
     })),
+    UInt64: {
+        from: (i: number) => Number(i),
+    },
 }));
 
+
 jest.mock('src/config/ConfigManager', () => ({
     getChain: () => ({
         getChainId: () => 'chainId',
         getSymbol: () => 'TLOS',
+        getName: () => 'Telos',
         getSystemToken: () => ({ symbol: 'TLOS', contract: 'eosio.token', precision: 4 }),
         getRPCEndpoint: () => ({ protocol: 'https', host: 'host', port: 443 }),
         getHyperionEndpoint: () => '',
+        getApiEndpoint: () => '',
         getFuelRPCEndpoint: () => ({ protocol: 'https', host: 'host', port: 443 }),
     }),
 }));
 
-const delbandResponse: {rows: DelegatedResources[]} = { rows: [] };
-// const getTableRows = jest.fn().mockImplementation((s: GetTableRowsParams) => {
-//     if (s.table === 'delband' && s.code === 'eosio') {
-//         return Promise.resolve(delbandResponse);
-//     }
-// });
+const delbandResponse: { rows: DelegatedResources[] } = { rows: [] };
 
-jest.mock('src/api', () => ({
-    api: { getTableRows: jest.fn().mockImplementation((s: GetTableRowsParams) => {
+jest.mock('src/api/eosio_core', () => ({
+    getTableRows: jest.fn((s: GetTableRowsParams) => {
         if (s.table === 'delband' && s.code === 'eosio') {
             return Promise.resolve(delbandResponse);
         }
-    })},
+    }),
 }));
 
+// ------------------------------------
+// data for getters
+const accountName = 'accountName';
+const accountDataMock = {
+    self_delegated_bandwidth: {
+        cpu_weight: ref(1),
+        net_weight: ref(1),
+    },
+    net_weight: ref(10000),
+    cpu_weight: ref(10000),
+} as unknown as API.v1.AccountObject;
+
+const AccountGetters = {
+    accountName,
+    data: accountDataMock,
+};
+// actions for account store
+const loadAccountData = jest.fn();
+const AccountActions = {
+    loadAccountData,
+};
+const AccountStore = { ...AccountGetters, ...AccountActions };
+jest.mock('src/stores/account', () => ({
+    useAccountStore: jest.fn().mockImplementation(() => AccountStore),
+}));
+// ------------------------------------
 
 describe('Store - Resources Actions', () => {
     let setLoading: jest.SpyInstance;
     let setCurrentAccount: jest.SpyInstance;
     let setDelegatedToOthers: jest.SpyInstance;
-    let setDelegatedToOthersAggregated: jest.SpyInstance;
+    let setDelegatedFromOthers: jest.SpyInstance;
+    let setForceUpdate: jest.SpyInstance;
     let unsetLoading: jest.SpyInstance;
-    let state: ResourcesStateInterface;
-    let rootState: StateInterface;
-    const accountName = 'accountName'; // logged account
-    let data: unknown = {};
-    const pinia = createPinia();
-    app.use(pinia);
-    setActivePinia(pinia);
-    const resourceStore = useResourceStore();
-
+    let setSelfStaked: jest.SpyInstance;
+    let updateSelfStaked: jest.SpyInstance;
+    let updateDelegatedToOthers: jest.SpyInstance;
 
     const setDelbandResponse = (accountList: string[]) => {
         delbandResponse.rows = [];
@@ -153,41 +127,22 @@ describe('Store - Resources Actions', () => {
     };
 
     beforeEach(() => {
-        setLoading = jest.spyOn(resourceStore, 'setLoading');
-        setCurrentAccount = jest.spyOn(resourceStore, 'setCurrentAccount');
-        setDelegatedToOthers = jest.spyOn(resourceStore, 'setDelegatedToOthers');
-        setDelegatedToOthersAggregated = jest.spyOn(resourceStore, 'setDelegatedToOthersAggregated');
-        unsetLoading = jest.spyOn(resourceStore, 'unsetLoading');
-
-        getTableRows.mockClear();
-
-        state = {
-            currentAccount: '',
-            toOthers: [],
-            fromOthers: null,
-            selfStaked: null,
-            loading: [],
-            forceUpdate: false,
-        } as ResourcesStateInterface;
-
-        rootState = {
-            account: {
-                accountName,
-                data,
-            },
-        } as unknown as StateInterface;
-
+        setActivePinia(createPinia());
     });
 
     describe('updateDelegatedToOthers()', () => {
-
         test('when executed it always brings up to 200 results for the given account', async () => {
-            data = ref(null);
+            const resourceStore = useResourceStore();
+
+            setLoading = jest.spyOn(resourceStore, 'setLoading');
+            setCurrentAccount = jest.spyOn(resourceStore, 'setCurrentAccount');
+            unsetLoading = jest.spyOn(resourceStore, 'unsetLoading');
+            setDelegatedToOthers = jest.spyOn(resourceStore, 'setDelegatedToOthers');
+
             setDelbandResponse([accountName]);
 
             // call the action login
             await resourceStore.updateDelegatedToOthers(accountName);
-
             // Verify the loading state
             expect(setLoading).toHaveBeenCalledWith('updateDelegatedToOthers');
 
@@ -199,110 +154,140 @@ describe('Store - Resources Actions', () => {
                 table: 'delband',
             } as GetTableRowsParams;
 
-            expect(api.getTableRows).toHaveBeenCalledWith(paramsdelband);
+            expect(getTableRows).toHaveBeenCalledWith(paramsdelband);
 
             // Verify the final commits
             expect(setCurrentAccount).toHaveBeenCalledWith(accountName);
-            expect(setCurrentAccount).toHaveBeenCalledWith(delbandResponse.rows);
+            expect(setDelegatedToOthers).toHaveBeenCalledWith(delbandResponse.rows);
 
             // Verify the loading state
             expect(unsetLoading).toHaveBeenCalledWith('updateDelegatedToOthers');
-
         });
     });
 
     describe('updateResources()', () => {
+        test('when the account is the same, we have its data and we don\'t force', async () => {
+            const resourceStore = useResourceStore();
+
+            // resourceStore.currentAccount = 'account1';
+
+            setLoading = jest.spyOn(resourceStore, 'setLoading');
+            setCurrentAccount = jest.spyOn(resourceStore, 'setCurrentAccount');
+            unsetLoading = jest.spyOn(resourceStore, 'unsetLoading');
+            setForceUpdate = jest.spyOn(resourceStore, 'setForceUpdate');
+            updateSelfStaked = jest.spyOn(resourceStore, 'updateSelfStaked');
+            updateDelegatedToOthers = jest.spyOn(resourceStore, 'updateDelegatedToOthers');
 
-        test('when we don\'t have account data', async () => {
+            await resourceStore.updateResources({
+                account: accountName,
+                force: false,
+            });
+
+            // Verify the loading and forceUpdate states
+            expect(setLoading).toHaveBeenCalledWith('updateResources');
+            expect(setForceUpdate).toHaveBeenCalledWith(false);
+
+            // Verify the loading and forceUpdate states
+            expect(setForceUpdate).toHaveBeenCalledWith(false);
+
+            expect(unsetLoading).toHaveBeenCalledWith('updateResources');
+            expect(resourceStore.currentAccount).toEqual(accountName);
+        });
+
+        test('when the account is the same, we have its data and we force', async () => {
             const resourceStore = useResourceStore();
-            data = ref(null);
 
-            // call the action login
-            await (resourceStore as { updateResources: (a:unknown, b:boolean) => Promise<void> }).updateResources(
-                { commit, dispatch, state, rootState },
-                false,
-            );
+            setLoading = jest.spyOn(resourceStore, 'setLoading');
+            setCurrentAccount = jest.spyOn(resourceStore, 'setCurrentAccount');
+            unsetLoading = jest.spyOn(resourceStore, 'unsetLoading');
+            setForceUpdate = jest.spyOn(resourceStore, 'setForceUpdate');
+            updateSelfStaked = jest.spyOn(resourceStore, 'updateSelfStaked');
+            updateDelegatedToOthers = jest.spyOn(resourceStore, 'updateDelegatedToOthers');
+
+            await resourceStore.updateResources({
+                account: accountName,
+                force: true,
+            });
 
             // Verify the loading and forceUpdate states
-            expect(commit).toHaveBeenCalledWith('setLoading', 'updateResources');
-            expect(commit).toHaveBeenCalledWith('setForceUpdate', false);
+            expect(setLoading).toHaveBeenCalledWith('updateResources');
+            expect(setForceUpdate).toHaveBeenCalledWith(false);
 
-            // Verify dispatch calls
-            expect(dispatch).toHaveBeenCalledWith('updateSelfStaked', accountName);
-            expect(dispatch).toHaveBeenCalledWith('updateDelegatedToOthers', accountName);
+            expect(updateSelfStaked).toHaveBeenCalledWith(accountName);
+            expect(updateDelegatedToOthers).toHaveBeenCalledWith(accountName);
 
             // Verify the final commits
-            expect(commit).toHaveBeenCalledWith('setCurrentAccount', accountName);
+            expect(setCurrentAccount).toHaveBeenCalledWith(accountName);
 
             // Verify the loading and forceUpdate states
-            expect(commit).toHaveBeenCalledWith('setForceUpdate', false);
-            expect(commit).toHaveBeenCalledWith('unsetLoading', 'updateResources');
+            expect(setForceUpdate).toHaveBeenCalledWith(false);
+
+            expect(unsetLoading).toHaveBeenCalledWith('updateResources');
+            expect(resourceStore.currentAccount).toEqual(accountName);
         });
 
-        test('when we have account data', async () => {
+        test('when we request data from a different account', async () => {
             const resourceStore = useResourceStore();
-            data = ref({});
+            const newAccount = 'newAccount';
+
+            setLoading = jest.spyOn(resourceStore, 'setLoading');
+            setCurrentAccount = jest.spyOn(resourceStore, 'setCurrentAccount');
+            setDelegatedToOthers = jest.spyOn(resourceStore, 'setDelegatedToOthers');
+            unsetLoading = jest.spyOn(resourceStore, 'unsetLoading');
+            setForceUpdate = jest.spyOn(resourceStore, 'setForceUpdate');
+            updateSelfStaked = jest.spyOn(resourceStore, 'updateSelfStaked');
+            updateDelegatedToOthers = jest.spyOn(resourceStore, 'updateDelegatedToOthers');
 
             // call the action login
-            await (resourceStore as { updateResources: (a:unknown, b:boolean) => Promise<void> }).updateResources(
-                { commit, dispatch, state, rootState },
-                false,
-            );
+            await resourceStore.updateResources({
+                account: newAccount,
+                force: false,
+            });
 
             // Verify the loading and forceUpdate states
-            expect(commit).toHaveBeenCalledWith('setLoading', 'updateResources');
-            expect(commit).toHaveBeenCalledWith('setForceUpdate', false);
+            expect(setLoading).toHaveBeenCalledWith('updateResources');
+            expect(setForceUpdate).toHaveBeenCalledWith(false);
 
             // Verify dispatch calls
-            expect(dispatch).toHaveBeenCalledWith('updateSelfStaked', accountName);
-            expect(dispatch).toHaveBeenCalledWith('updateDelegatedToOthers', accountName);
+            expect(updateSelfStaked).toHaveBeenCalledWith(newAccount);
+            expect(updateDelegatedToOthers).toHaveBeenCalledWith(newAccount);
 
             // Verify the final commits
-            expect(commit).toHaveBeenCalledWith('setCurrentAccount', accountName);
+            expect(setCurrentAccount).toHaveBeenCalledWith(newAccount);
 
             // Verify the loading and forceUpdate states
-            expect(commit).toHaveBeenCalledWith('setForceUpdate', false);
-            expect(commit).toHaveBeenCalledWith('unsetLoading', 'updateResources');
+            expect(setForceUpdate).toHaveBeenCalledWith(false);
+            expect(unsetLoading).toHaveBeenCalledWith('updateResources');
         });
-
     });
 
     describe('updateSelfStaked()', () => {
-
         test('when current account is not the given account', async () => {
             const resourceStore = useResourceStore();
 
+            setLoading = jest.spyOn(resourceStore, 'setLoading');
+            setDelegatedFromOthers = jest.spyOn(resourceStore, 'setDelegatedFromOthers');
+            setSelfStaked = jest.spyOn(resourceStore, 'setSelfStaked');
+            unsetLoading = jest.spyOn(resourceStore, 'unsetLoading');
+
             const anotheraccount = 'anotheraccount';
-            rootState.account.data = {
-                self_delegated_bandwidth: {
-                    cpu_weight: ref(1),
-                    net_weight: ref(1),
-                },
-                net_weight: ref(10000),
-                cpu_weight: ref(10000),
-            } as unknown as API.v1.AccountObject;
+
             setDelbandResponse([accountName]);
 
             // call the action login
-            await (resourceStore as { updateSelfStaked: (a:unknown, b:string) => Promise<void> }).updateSelfStaked(
-                { commit, dispatch, state, rootState },
-                anotheraccount,
-            );
+            await resourceStore.updateSelfStaked(anotheraccount);
 
             // Verify the loading state
-            expect(commit).toHaveBeenCalledWith('setLoading', 'updateSelfStaked');
-
-            // Verify the api call to get the account data
-            expect(dispatch).toHaveBeenCalledWith('account/loadAccountData', anotheraccount, { root: true });
+            expect(setLoading).toHaveBeenCalledWith('updateSelfStaked');
 
             // Verify the final commits
-            expect(commit).toHaveBeenCalledWith('setDelegatedFromOthers', {
+            expect(setDelegatedFromOthers).toHaveBeenCalledWith({
                 from: 'not-available',
                 to: anotheraccount,
                 net_weight: '0.0000 TLOS',
                 cpu_weight: '0.0000 TLOS',
             });
-            expect(commit).toHaveBeenCalledWith('setSelfStaked', {
+            expect(setSelfStaked).toHaveBeenCalledWith({
                 from: anotheraccount,
                 to: anotheraccount,
                 net_weight: '1.0000 TLOS',
@@ -310,10 +295,7 @@ describe('Store - Resources Actions', () => {
             });
 
             // Verify the loading state
-            expect(commit).toHaveBeenCalledWith('unsetLoading', 'updateSelfStaked');
-
+            expect(unsetLoading).toHaveBeenCalledWith('updateSelfStaked');
         });
-
     });
-
 });
diff --git a/yarn.lock b/yarn.lock
index a783156f..9fec945c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1772,6 +1772,13 @@
   resolved "https://registry.yarnpkg.com/@petamoriken/float16/-/float16-3.6.3.tgz#7ed8f2ae05ea4096f0ccdf2c2655d04aca545d33"
   integrity sha512-Yx6Z93kmz3JVPYoPPRFJXnt2/G4kfaxRROcZVVHsE4zOClJXvkOVidv/JfvP6hWn16lykbKYKVzUsId6mqXdGg==
 
+"@pinia/testing@^0.1.3":
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/@pinia/testing/-/testing-0.1.3.tgz#ee46a5a51d437f845ddc9c7b048c98b6a435e68b"
+  integrity sha512-D2Ds2s69kKFaRf2KCcP1NhNZEg5+we59aRyQalwRm7ygWfLM25nDH66267U3hNvRUOTx8ofL24GzodZkOmB5xw==
+  dependencies:
+    vue-demi ">=0.14.5"
+
 "@polka/url@^1.0.0-next.20":
   version "1.0.0-next.21"
   resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.21.tgz#5de5a2385a35309427f6011992b544514d559aa1"

From 37c1c9bba754e4b0c73e8e39467be6c1c847937e Mon Sep 17 00:00:00 2001
From: Karyne Mayer <karyne@detroitledger.tech>
Date: Mon, 15 Apr 2024 09:58:24 -0700
Subject: [PATCH 05/10] account store tests fixed

---
 src/stores/account.ts                      |   1 -
 test/jest/__tests__/stores/account.spec.ts | 247 +++++++++++----------
 2 files changed, 132 insertions(+), 116 deletions(-)

diff --git a/src/stores/account.ts b/src/stores/account.ts
index e91829f2..721fdc13 100644
--- a/src/stores/account.ts
+++ b/src/stores/account.ts
@@ -234,7 +234,6 @@ export const useAccountStore = defineStore('account', {
         async loadAccountData() {
             try {
                 this.data = await api.getAccount(this.accountName);
-                console.log('account - loadAccountData', this.data);
             } catch (e) {
                 return;
             }
diff --git a/test/jest/__tests__/stores/account.spec.ts b/test/jest/__tests__/stores/account.spec.ts
index 0e1d9cf4..3ff3eb49 100644
--- a/test/jest/__tests__/stores/account.spec.ts
+++ b/test/jest/__tests__/stores/account.spec.ts
@@ -1,58 +1,16 @@
-import { AccountStateInterface } from 'src/stores/account';
-import { FuelUserWrapper } from 'src/api/fuel';
-
-global.fetch = jest.fn((input: RequestInfo | URL) =>
-    Promise.resolve({
-        text: () => {
-            if (input.toString() === 'https://raw.githubusercontent.com/telosnetwork/token-list/main/telosmain.json') {
-                return `{
-                    "tokens": [
-                        {
-                            "name": "Telos",
-                            "logo_sm": "https://raw.githubusercontent.com/Viterbo/token-list/master/logos/telos.png",
-                            "logo_lg": "https://raw.githubusercontent.com/Viterbo/token-list/master/logos/telos.png",
-                            "symbol": "TLOS",
-                            "account": "eosio.token"
-                        },
-                        {
-                            "name": "pTokens BTC",
-                            "logo_sm": "https://raw.githubusercontent.com/Viterbo/token-list/master/logos/pbtc.png",
-                            "logo_lg": "https://raw.githubusercontent.com/Viterbo/token-list/master/logos/pbtc-lg.png",
-                            "symbol": "PBTC",
-                            "account": "btc.ptokens"
-                        }
-                    ]
-                }`;
-            } else {
-                return `[
-                    {
-                      "name": "Telos",
-                      "symbol": "TLOS",
-                      "contract": "eosio.token",
-                      "precision": 4,
-                      "logo": "https://raw.githubusercontent.com/Viterbo/token-list/master/logos/telos.png"
-                    },
-                    {
-                      "name": "Qubicles",
-                      "symbol": "QBE",
-                      "contract": "qubicletoken",
-                      "precision": 4,
-                      "logo": "https://raw.githubusercontent.com/Viterbo/token-list/master/logos/qbe.png"
-                    }
-                ]
-                `;
-            }
-        },
-    } as unknown as Response),
-);
+// import { AccountStateInterface } from 'src/stores/account';
+
+import { Authenticator, User, UALError, ButtonStyle, Chain } from 'universal-authenticator-library';
+import { createPinia, setActivePinia } from 'pinia';
+import { useAccountStore } from 'src/stores/account';
 
 const localStorageMock = {
     getItem: jest.fn(),
     setItem: jest.fn(),
     removeItem:jest.fn(),
 };
-Object.defineProperty(window, 'localStorage', { value: localStorageMock });
 
+Object.defineProperty(window, 'localStorage', { value: localStorageMock });
 
 const transactionHeaders = {
     context_free_actions: [] as never[],
@@ -69,6 +27,9 @@ jest.mock('@greymass/eosio', () => ({
     Name: {
         from: (s: string) => ({ toString: () => s }),
     },
+    UInt64: {
+        from: (i: number) => Number(i),
+    },
     APIClient: jest.fn().mockImplementation(() => ({
         v1: {
             chain: {
@@ -85,55 +46,89 @@ jest.mock('@greymass/eosio', () => ({
     })),
 }));
 
-import { Authenticator, User } from 'universal-authenticator-library';
-import { createPinia, setActivePinia } from 'pinia';
-import { useAccountStore } from 'src/stores/account';
-
+jest.mock('src/api/fuel', () => ({
+    FuelUserWrapper: class {
+        constructor() {
+            jest.fn();
+        }
+        getAccountName() {
+            return 'john.doe';
+        }
+        requestPermission = '';
+    },
+}));
 const chainIdMock = 'chainIdMock';
 
-describe('Store - Account Actions', () => {
-    let commit: jest.Mock;
-    let state: AccountStateInterface;
-    let users: User[] = [];
-
-    const newAuthenticatorMock = (requestName = false) => ({
-        init: jest.fn(),
-        shouldRequestAccountName: jest.fn().mockResolvedValue(new Promise(resolve => resolve(requestName))),
-        login: jest.fn().mockResolvedValue(new Promise(resolve => resolve(users))),
-        getName: jest.fn().mockReturnValue('autoLogin'),
-        chains: [{
-            chainId: chainIdMock,
-        }],
-    } as unknown as Authenticator);
-
-    let authenticator = newAuthenticatorMock();
-
+const users = [{
+    name: 'John Doe',
+    getAccountName: jest.fn().mockResolvedValue('john.doe'),
+} as unknown as User];
+
+class MockAuthenticator extends Authenticator {
+    reset(): void {
+        throw new Error('Method not implemented.');
+    }
+    isErrored(): boolean {
+        throw new Error('Method not implemented.');
+    }
+    getOnboardingLink(): string {
+        throw new Error('Method not implemented.');
+    }
+    getError(): UALError {
+        throw new Error('Method not implemented.');
+    }
+    isLoading(): boolean {
+        throw new Error('Method not implemented.');
+    }
+    getStyle(): ButtonStyle {
+        throw new Error('Method not implemented.');
+    }
+    shouldRender(): boolean {
+        throw new Error('Method not implemented.');
+    }
+    shouldAutoLogin(): boolean {
+        throw new Error('Method not implemented.');
+    }
+    login(accountName?: string): Promise<User[]> {
+        return Promise.resolve(users);
+    }
+    logout(): Promise<void> {
+        throw new Error('Method not implemented.');
+    }
+    requiresGetKeyConfirmation(): boolean {
+        throw new Error('Method not implemented.');
+    }
+    getName(): string {
+        return 'autoLogin';
+    }
+    init(): Promise<void> {
+        // Implementation for initialization logic
+        return Promise.resolve();
+    }
+    shouldRequestAccountName(): Promise<boolean> {
+        return Promise.resolve(true);
+    }
+    chains: Chain[] = [{
+        chainId: chainIdMock,
+    }] as unknown as Chain[]
+}
 
+describe('Store - Account Actions', () => {
     beforeEach(() => {
-        state = {
-            isAuthenticated: false,
-            user: null,
-            accountName: '',
-            accountPermission: '',
-        } as AccountStateInterface;
-
+        jest.clearAllMocks();
         setActivePinia(createPinia());
 
-        users = [{
-            name: 'John Doe',
-            getAccountName: jest.fn().mockResolvedValue('john.doe'),
-        } as unknown as User];
-
-        commit = jest.fn();
-        authenticator = newAuthenticatorMock();
-
-
     });
 
     describe('login()', () => {
-        test('when not account provided it should should request account', async () => {
+        test('when no account is provided it should request account', async () => {
             const accountStore = useAccountStore();
-            authenticator = newAuthenticatorMock(true);
+            //const authenticator = newAuthenticatorMock(true);
+            const authenticator = new MockAuthenticator(null);
+
+            const accountStoreLoginSpy = jest.spyOn(accountStore, 'login');
+            const mockInit = jest.spyOn(authenticator, 'init');
+            const mockShouldRequestAccountName = jest.spyOn(authenticator, 'shouldRequestAccountName');
 
             // call the action login
             await accountStore.login(
@@ -141,39 +136,41 @@ describe('Store - Account Actions', () => {
             );
 
             // verify that the action called correctly the init function of the authenticator
-            expect(authenticator.init).toHaveBeenCalled();
+            expect(accountStoreLoginSpy).toHaveBeenCalledWith({ account: null, authenticator });
 
-            // Verify that the action called correctly the commit mutation 'setRequestAccount' with the value true
-            expect(authenticator.shouldRequestAccountName).toHaveBeenCalled();
-            expect(commit).toHaveBeenCalledWith('setRequestAccount', true);
+            // // Verify that the action called correctly the commit mutation 'setRequestAccount' with the value true
+            expect(mockInit).toHaveBeenCalledTimes(1);
+
+            expect(mockShouldRequestAccountName).toHaveBeenCalledTimes(1);
+            // expect(accountStore.requestAccount).toEqual(true);
 
         });
 
         test('when not account provided but not needed', async () => {
             const accountStore = useAccountStore();
+            const authenticator = new MockAuthenticator(null);
 
             const requestAccountSpy = jest.spyOn(authenticator, 'shouldRequestAccountName');
+            const authenticatorInit = jest.spyOn(authenticator, 'init');
+            const authenticatorLogin = jest.spyOn(authenticator, 'login');
             requestAccountSpy.mockResolvedValue(false);
 
             // call the action login
-            await (accountStore as { login: (a:unknown, b:unknown) => Promise<void> }).login(
-                { commit, state },
+            await accountStore.login(
                 { account: null, authenticator },
             );
 
             // verify that the action called correctly the init function of the authenticator
-            expect(authenticator.init).toHaveBeenCalled();
+            expect(authenticatorInit).toHaveBeenCalled();
 
-            // Verify that the action called correctly the commit mutation 'setRequestAccount' with the value true
             expect(requestAccountSpy).toHaveBeenCalled();
-            expect(commit).not.toHaveBeenCalledWith('setRequestAccount', true);
+            expect(accountStore.requestAccount).toEqual(false);
 
             // Verify that the action called the login method of the authenticator
-            expect(authenticator.login).toHaveBeenCalled();
-            expect(commit).toHaveBeenCalledWith('setAccountPermission', 'active');
-            expect(commit).toHaveBeenCalledWith('setUser', expect.any(FuelUserWrapper));
-            expect(commit).toHaveBeenCalledWith('setIsAuthenticated', true);
-            expect(commit).toHaveBeenCalledWith('setAccountName', 'john.doe');
+            expect(authenticatorLogin).toHaveBeenCalled();
+            expect(accountStore.accountPermission).toBe('active');
+            expect(accountStore.isAuthenticated).toBe(true);
+            expect(accountStore.accountName).toBe('john.doe');
             expect(localStorageMock.setItem).toHaveBeenCalledWith('account_' + chainIdMock, 'john.doe');
             expect(localStorageMock.setItem).toHaveBeenCalledWith('autoLogin_' + chainIdMock, 'autoLogin');
 
@@ -181,22 +178,26 @@ describe('Store - Account Actions', () => {
 
         test('when account provided - Normal case', async () => {
             const accountStore = useAccountStore();
+            const authenticator = new MockAuthenticator(null);
+
+            const requestAccountSpy = jest.spyOn(authenticator, 'shouldRequestAccountName');
+            const authenticatorInit = jest.spyOn(authenticator, 'init');
+            const authenticatorLogin = jest.spyOn(authenticator, 'login');
+            requestAccountSpy.mockResolvedValue(false);
 
             // call the action login
-            await (accountStore as { login: (a:unknown, b:unknown) => Promise<void> }).login(
-                { commit, state },
+            await accountStore.login(
                 { account: 'john.doe', authenticator },
             );
 
             // Verify that the action called correctly the init function of the authenticator
-            expect(authenticator.init).toHaveBeenCalled();
+            expect(authenticatorInit).toHaveBeenCalled();
 
             // Verify that the action called the login method of the authenticator
-            expect(authenticator.login).toHaveBeenCalled();
-            expect(commit).toHaveBeenCalledWith('setAccountPermission', 'active');
-            expect(commit).toHaveBeenCalledWith('setUser', expect.any(FuelUserWrapper));
-            expect(commit).toHaveBeenCalledWith('setIsAuthenticated', true);
-            expect(commit).toHaveBeenCalledWith('setAccountName', 'john.doe');
+            expect(authenticatorLogin).toHaveBeenCalled();
+            expect(accountStore.accountPermission).toBe('active');
+            expect(accountStore.isAuthenticated).toBe(true);
+            expect(accountStore.accountName).toBe('john.doe');
             expect(localStorageMock.setItem).toHaveBeenCalledWith('account_' + chainIdMock, 'john.doe');
             expect(localStorageMock.setItem).toHaveBeenCalledWith('autoLogin_' + chainIdMock, 'autoLogin');
         });
@@ -204,15 +205,31 @@ describe('Store - Account Actions', () => {
     });
 
     describe('logout()', () => {
-        test('normal case', async () => {
+        beforeEach(async () => {
+            jest.clearAllMocks();
+
+            // Logs in
             const accountStore = useAccountStore();
+            const authenticator = new MockAuthenticator(null);
+            await accountStore.login(
+                { account: 'john.doe', authenticator },
+            );
+        });
+
+        test('normal case', () => {
+            const accountStore = useAccountStore();
+
+            expect(accountStore.user).not.toBe(null);
+            expect(accountStore.accountPermission).toBe('active');
+            expect(accountStore.isAuthenticated).toBe(true);
+            expect(accountStore.accountName).toBe('john.doe');
+
             // call the action logout
-            await (accountStore as { logout: (a:unknown) => void }).logout({ commit, state });
+            accountStore.logout();
 
-            // Verify that the action called the commit mutation 'setIsAuthenticated' with the value false
-            expect(commit).toHaveBeenCalledWith('setIsAuthenticated', false);
-            expect(commit).toHaveBeenCalledWith('setAccountName', '');
-            expect(commit).toHaveBeenCalledWith('setUser', null);
+            expect(accountStore.user).toBe(null);
+            expect(accountStore.isAuthenticated).toBe(false);
+            expect(accountStore.accountName).toBe('');
 
             expect(localStorageMock.removeItem).toHaveBeenCalledWith('account_' + chainIdMock);
             expect(localStorageMock.removeItem).toHaveBeenCalledWith('autoLogin_' + chainIdMock);

From fc55784e4d6062e19d7d1ea90c43da83f3349df4 Mon Sep 17 00:00:00 2001
From: Karyne Mayer <karyne@detroitledger.tech>
Date: Tue, 16 Apr 2024 17:28:48 -0700
Subject: [PATCH 06/10] Fixes hyperion unit tests

---
 src/api/hyperion.ts                      |  8 +++-----
 test/jest/__tests__/api/hyperion.spec.ts | 16 +++++++---------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/api/hyperion.ts b/src/api/hyperion.ts
index 2dcbc30c..ab1e4aa8 100644
--- a/src/api/hyperion.ts
+++ b/src/api/hyperion.ts
@@ -89,15 +89,13 @@ export const getCreator = async function (address: string): Promise<AccountCreat
 
 export const getTokens = async function (address?: string): Promise<Token[]> {
     try {
-        const tokens = await axios.get(url).then((response) => {
-            const nhaca = (response.data as Token[]);
-            console.log(nhaca);
-            return nhaca;
-        });
+        const tokens = await axios.get(url).then(response => response.data as Token[]);
+
         if (address) {
             const response = await hyperion.get('v2/state/get_tokens', {
                 params: { account: address },
             });
+
             const balances = (response.data as {tokens:Token[]}).tokens;
             // return tokens;
             return balances.map((token:Token) => {
diff --git a/test/jest/__tests__/api/hyperion.spec.ts b/test/jest/__tests__/api/hyperion.spec.ts
index 444b467c..d9552ecd 100644
--- a/test/jest/__tests__/api/hyperion.spec.ts
+++ b/test/jest/__tests__/api/hyperion.spec.ts
@@ -84,12 +84,6 @@ const userTokens = {
 
 installQuasarPlugin();
 
-global.fetch = jest.fn(() =>
-    Promise.resolve({
-        text: () => JSON.stringify(tokenList),
-    } as unknown as Response),
-);
-
 // mocking internal chain implementation
 jest.mock('src/config/ConfigManager', () => ({
     getChain: () => ({
@@ -118,12 +112,10 @@ global.AbortController = jest.fn(() => ({
 
 jest.mock('axios', () => ({
     create: () => mockHyperion,
+    get: jest.fn().mockImplementation(url => Promise.resolve({ data: tokenList })),
 }));
 
 const mockHyperion: AxiosInstance = {
-    get: () => Promise.resolve({
-        data: userTokens,
-    }),
     interceptors: {
         request: {
             use: jest.fn(),
@@ -132,6 +124,11 @@ const mockHyperion: AxiosInstance = {
             use: jest.fn(),
         } as unknown as AxiosInterceptorManager<AxiosResponse<unknown>>,
     },
+    get: jest.fn().mockImplementation((url) => {
+        if(url === 'v2/state/get_tokens') {
+            return Promise.resolve({ data: userTokens });
+        }
+    }),
 } as unknown as AxiosInstance;
 
 
@@ -148,6 +145,7 @@ describe('Hyperion API', () => {
             const tokens = await getTokens();
             expect(tokens).toEqual(tokenList);
         });
+
         it('getTokens(account) tokens for account => list of user\'s tokens (no balances)', async () => {
             const tokens = await getTokens('someaccount');
             const userTokensWithLogos = userTokens.tokens.map((token: Token) => {

From b58985106289cc2ef4774957bc65c67a2d240742 Mon Sep 17 00:00:00 2001
From: Karyne Mayer <karyne@detroitledger.tech>
Date: Tue, 16 Apr 2024 18:15:25 -0700
Subject: [PATCH 07/10] PriceChart unit tests fix

---
 package.json                                  |   1 -
 .../__tests__/components/PriceChart.spec.ts   |  43 +++-
 yarn.lock                                     | 206 +++++++++---------
 3 files changed, 144 insertions(+), 106 deletions(-)

diff --git a/package.json b/package.json
index 930fef74..6021a9fd 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,6 @@
     "ual-anchor": "1.3.0",
     "universal-authenticator-library": "^0.3.0",
     "vue": "^3.3.0",
-    "vue-class-component": "^7.2.6",
     "vue-json-viewer": "^3.0.4",
     "vue-router": "^4.0.0",
     "vue3-openlayers": "^0.1.63"
diff --git a/test/jest/__tests__/components/PriceChart.spec.ts b/test/jest/__tests__/components/PriceChart.spec.ts
index a6e641ea..f95d21a0 100644
--- a/test/jest/__tests__/components/PriceChart.spec.ts
+++ b/test/jest/__tests__/components/PriceChart.spec.ts
@@ -10,7 +10,7 @@ import {
     beforeEach,
 } from '@jest/globals';
 import { installQuasarPlugin } from '@quasar/quasar-app-extension-testing-unit-jest';
-import { shallowMount } from '@vue/test-utils';
+import { mount } from '@vue/test-utils';
 import PriceChart from 'src/components/PriceChart.vue';
 import { PriceStats, PriceHistory } from 'src/types';
 import axios from 'axios';
@@ -55,9 +55,16 @@ describe('PriceChart', () => {
             it('returns value rounded to 2 decimals as a % string', () => {
                 const testVal = 123.456;
                 const expected = '123.46 %';
-                const wrapper = shallowMount(PriceChart);
+                const wrapper = mount(PriceChart, {
+                    global: {
+                        stubs: {
+                            Highcharts: {
+                                template: '<span />',
+                            },
+                        },
+                    },
+                });
                 const received = wrapper.vm.formatPercentage(testVal);
-
                 expect(received).toBe(expected);
             });
         });
@@ -65,7 +72,15 @@ describe('PriceChart', () => {
             it('returns value as "$" rounded to 2 decimals if value is less than a million', () => {
                 const testVal = 999999.9911;
                 const expected = '$999999.99';
-                const wrapper = shallowMount(PriceChart);
+                const wrapper = mount(PriceChart, {
+                    global: {
+                        stubs: {
+                            Highcharts: {
+                                template: '<span />',
+                            },
+                        },
+                    },
+                });
                 const received = wrapper.vm.formatCurrencyValue(testVal);
 
                 expect(received).toBe(expected);
@@ -73,7 +88,15 @@ describe('PriceChart', () => {
             it('returns value "$" divided by a million rounded to 2 decimals and appended with "M" if value is greater than a million and less than a billion', () => {
                 const testVal = 1234567.89;
                 const expected = '$1.23M';
-                const wrapper = shallowMount(PriceChart);
+                const wrapper =  mount(PriceChart, {
+                    global: {
+                        stubs: {
+                            Highcharts: {
+                                template: '<span />',
+                            },
+                        },
+                    },
+                });
                 const received = wrapper.vm.formatCurrencyValue(testVal);
 
                 expect(received).toBe(expected);
@@ -81,7 +104,15 @@ describe('PriceChart', () => {
             it('returns value "$" divided by a billion rounded to 2 decimals and appended with "B" if value is greater than a billion', () => {
                 const testVal = 123456789123.45678;
                 const expected = '$123.46B';
-                const wrapper = shallowMount(PriceChart);
+                const wrapper =  mount(PriceChart, {
+                    global: {
+                        stubs: {
+                            Highcharts: {
+                                template: '<span />',
+                            },
+                        },
+                    },
+                });
                 const received = wrapper.vm.formatCurrencyValue(testVal);
 
                 expect(received).toBe(expected);
diff --git a/yarn.lock b/yarn.lock
index 9fec945c..77ed78a4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -443,10 +443,10 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.0.tgz#da950e622420bf96ca0d0f2909cdddac3acd8719"
   integrity sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==
 
-"@babel/parser@^7.23.3":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.4.tgz#409fbe690c333bb70187e2de4021e1e47a026661"
-  integrity sha512-vf3Xna6UEprW+7t6EtOmFpHNAuxw3xqPZghy+brsnusscJRW5BMUzzHZc5ICjULee81WeUV2jjakG09MDglJXQ==
+"@babel/parser@^7.24.1":
+  version "7.24.4"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.24.4.tgz#234487a110d89ad5a3ed4a8a566c36b9453e8c88"
+  integrity sha512-zTvEBcghmeBma9QIGunWevvBAp4/Qu9Bdq+2k0Ot4fVMD6v3dsC9WOcRSKk7tRRyBM/53yKMJko9xOatGQAwSg==
 
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.17.12":
   version "7.17.12"
@@ -2381,15 +2381,16 @@
     estree-walker "^2.0.2"
     source-map "^0.6.1"
 
-"@vue/compiler-core@3.3.9":
-  version "3.3.9"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.3.9.tgz#df1fc7947dcef5c2e12d257eae540057707f47d1"
-  integrity sha512-+/Lf68Vr/nFBA6ol4xOtJrW+BQWv3QWKfRwGSm70jtXwfhZNF4R/eRgyVJYoxFRhdCTk/F6g99BP0ffPgZihfQ==
+"@vue/compiler-core@3.4.23":
+  version "3.4.23"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.4.23.tgz#a08f5998e391ad75e602a66dd7255af9054df2f3"
+  integrity sha512-HAFmuVEwNqNdmk+w4VCQ2pkLk1Vw4XYiiyxEp3z/xvl14aLTUBw2OfVH3vBcx+FtGsynQLkkhK410Nah1N2yyQ==
   dependencies:
-    "@babel/parser" "^7.23.3"
-    "@vue/shared" "3.3.9"
+    "@babel/parser" "^7.24.1"
+    "@vue/shared" "3.4.23"
+    entities "^4.5.0"
     estree-walker "^2.0.2"
-    source-map-js "^1.0.2"
+    source-map-js "^1.2.0"
 
 "@vue/compiler-dom@3.2.31":
   version "3.2.31"
@@ -2399,13 +2400,13 @@
     "@vue/compiler-core" "3.2.31"
     "@vue/shared" "3.2.31"
 
-"@vue/compiler-dom@3.3.9":
-  version "3.3.9"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.3.9.tgz#67315ea4193d9d18c7a710889b8f90f7aa3914d2"
-  integrity sha512-nfWubTtLXuT4iBeDSZ5J3m218MjOy42Vp2pmKVuBKo2/BLcrFUX8nCSr/bKRFiJ32R8qbdnnnBgRn9AdU5v0Sg==
+"@vue/compiler-dom@3.4.23":
+  version "3.4.23"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.4.23.tgz#6fa622d1e5c8508551564c5dc5948e9cddf60867"
+  integrity sha512-t0b9WSTnCRrzsBGrDd1LNR5HGzYTr7LX3z6nNBG+KGvZLqrT0mY6NsMzOqlVMBKKXKVuusbbB5aOOFgTY+senw==
   dependencies:
-    "@vue/compiler-core" "3.3.9"
-    "@vue/shared" "3.3.9"
+    "@vue/compiler-core" "3.4.23"
+    "@vue/shared" "3.4.23"
 
 "@vue/compiler-sfc@3.2.31":
   version "3.2.31"
@@ -2423,21 +2424,20 @@
     postcss "^8.1.10"
     source-map "^0.6.1"
 
-"@vue/compiler-sfc@3.3.9":
-  version "3.3.9"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.3.9.tgz#5900906baba1a90389200d81753ad0f7ceb98a83"
-  integrity sha512-wy0CNc8z4ihoDzjASCOCsQuzW0A/HP27+0MDSSICMjVIFzk/rFViezkR3dzH+miS2NDEz8ywMdbjO5ylhOLI2A==
-  dependencies:
-    "@babel/parser" "^7.23.3"
-    "@vue/compiler-core" "3.3.9"
-    "@vue/compiler-dom" "3.3.9"
-    "@vue/compiler-ssr" "3.3.9"
-    "@vue/reactivity-transform" "3.3.9"
-    "@vue/shared" "3.3.9"
+"@vue/compiler-sfc@3.4.23":
+  version "3.4.23"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.4.23.tgz#7041517b9bbd1b304f0db33bfa424e9a899fda8d"
+  integrity sha512-fSDTKTfzaRX1kNAUiaj8JB4AokikzStWgHooMhaxyjZerw624L+IAP/fvI4ZwMpwIh8f08PVzEnu4rg8/Npssw==
+  dependencies:
+    "@babel/parser" "^7.24.1"
+    "@vue/compiler-core" "3.4.23"
+    "@vue/compiler-dom" "3.4.23"
+    "@vue/compiler-ssr" "3.4.23"
+    "@vue/shared" "3.4.23"
     estree-walker "^2.0.2"
-    magic-string "^0.30.5"
-    postcss "^8.4.31"
-    source-map-js "^1.0.2"
+    magic-string "^0.30.8"
+    postcss "^8.4.38"
+    source-map-js "^1.2.0"
 
 "@vue/compiler-ssr@3.2.31":
   version "3.2.31"
@@ -2447,13 +2447,13 @@
     "@vue/compiler-dom" "3.2.31"
     "@vue/shared" "3.2.31"
 
-"@vue/compiler-ssr@3.3.9":
-  version "3.3.9"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.3.9.tgz#3b3dbfa5368165fa4ff74c060503b4087ec1beed"
-  integrity sha512-NO5oobAw78R0G4SODY5A502MGnDNiDjf6qvhn7zD7TJGc8XDeIEw4fg6JU705jZ/YhuokBKz0A5a/FL/XZU73g==
+"@vue/compiler-ssr@3.4.23":
+  version "3.4.23"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.4.23.tgz#1ae4afe962a9e156b1a79eff909c37cd423dd4c2"
+  integrity sha512-hb6Uj2cYs+tfqz71Wj6h3E5t6OKvb4MVcM2Nl5i/z1nv1gjEhw+zYaNOV+Xwn+SSN/VZM0DgANw5TuJfxfezPg==
   dependencies:
-    "@vue/compiler-dom" "3.3.9"
-    "@vue/shared" "3.3.9"
+    "@vue/compiler-dom" "3.4.23"
+    "@vue/shared" "3.4.23"
 
 "@vue/devtools-api@^6.0.0":
   version "6.1.3"
@@ -2476,17 +2476,6 @@
     estree-walker "^2.0.2"
     magic-string "^0.25.7"
 
-"@vue/reactivity-transform@3.3.9":
-  version "3.3.9"
-  resolved "https://registry.yarnpkg.com/@vue/reactivity-transform/-/reactivity-transform-3.3.9.tgz#5d894dd9a42a422a2db309babb385f9a2529b52f"
-  integrity sha512-HnUFm7Ry6dFa4Lp63DAxTixUp8opMtQr6RxQCpDI1vlh12rkGIeYqMvJtK+IKyEfEOa2I9oCkD1mmsPdaGpdVg==
-  dependencies:
-    "@babel/parser" "^7.23.3"
-    "@vue/compiler-core" "3.3.9"
-    "@vue/shared" "3.3.9"
-    estree-walker "^2.0.2"
-    magic-string "^0.30.5"
-
 "@vue/reactivity@3.2.31":
   version "3.2.31"
   resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.2.31.tgz#fc90aa2cdf695418b79e534783aca90d63a46bbd"
@@ -2494,12 +2483,12 @@
   dependencies:
     "@vue/shared" "3.2.31"
 
-"@vue/reactivity@3.3.9":
-  version "3.3.9"
-  resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.3.9.tgz#e28e8071bd74edcdd9c87b667ad00e8fbd8d6920"
-  integrity sha512-VmpIqlNp+aYDg2X0xQhJqHx9YguOmz2UxuUJDckBdQCNkipJvfk9yA75woLWElCa0Jtyec3lAAt49GO0izsphw==
+"@vue/reactivity@3.4.23":
+  version "3.4.23"
+  resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.4.23.tgz#f29044a90a24994af075e4368790f31fa29ed747"
+  integrity sha512-GlXR9PL+23fQ3IqnbSQ8OQKLodjqCyoCrmdLKZk3BP7jN6prWheAfU7a3mrltewTkoBm+N7qMEb372VHIkQRMQ==
   dependencies:
-    "@vue/shared" "3.3.9"
+    "@vue/shared" "3.4.23"
 
 "@vue/runtime-core@3.2.31":
   version "3.2.31"
@@ -2509,13 +2498,13 @@
     "@vue/reactivity" "3.2.31"
     "@vue/shared" "3.2.31"
 
-"@vue/runtime-core@3.3.9":
-  version "3.3.9"
-  resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.3.9.tgz#c835b77f7dc7ae5f251e93f277b54963ea1b5c31"
-  integrity sha512-xxaG9KvPm3GTRuM4ZyU8Tc+pMVzcu6eeoSRQJ9IE7NmCcClW6z4B3Ij6L4EDl80sxe/arTtQ6YmgiO4UZqRc+w==
+"@vue/runtime-core@3.4.23":
+  version "3.4.23"
+  resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.4.23.tgz#21f6c7153c33f56081145c2819c2f194cbe3eb22"
+  integrity sha512-FeQ9MZEXoFzFkFiw9MQQ/FWs3srvrP+SjDKSeRIiQHIhtkzoj0X4rWQlRNHbGuSwLra6pMyjAttwixNMjc/xLw==
   dependencies:
-    "@vue/reactivity" "3.3.9"
-    "@vue/shared" "3.3.9"
+    "@vue/reactivity" "3.4.23"
+    "@vue/shared" "3.4.23"
 
 "@vue/runtime-dom@3.2.31":
   version "3.2.31"
@@ -2526,14 +2515,14 @@
     "@vue/shared" "3.2.31"
     csstype "^2.6.8"
 
-"@vue/runtime-dom@3.3.9":
-  version "3.3.9"
-  resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.3.9.tgz#68081d981695a229d72f431fed0b0cdd9161ce53"
-  integrity sha512-e7LIfcxYSWbV6BK1wQv9qJyxprC75EvSqF/kQKe6bdZEDNValzeRXEVgiX7AHI6hZ59HA4h7WT5CGvm69vzJTQ==
+"@vue/runtime-dom@3.4.23":
+  version "3.4.23"
+  resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.4.23.tgz#d5a9cca88b445de125c57e6b0d73faa2491e853f"
+  integrity sha512-RXJFwwykZWBkMiTPSLEWU3kgVLNAfActBfWFlZd0y79FTUxexogd0PLG4HH2LfOktjRxV47Nulygh0JFXe5f9A==
   dependencies:
-    "@vue/runtime-core" "3.3.9"
-    "@vue/shared" "3.3.9"
-    csstype "^3.1.2"
+    "@vue/runtime-core" "3.4.23"
+    "@vue/shared" "3.4.23"
+    csstype "^3.1.3"
 
 "@vue/server-renderer@3.2.31":
   version "3.2.31"
@@ -2543,23 +2532,23 @@
     "@vue/compiler-ssr" "3.2.31"
     "@vue/shared" "3.2.31"
 
-"@vue/server-renderer@3.3.9":
-  version "3.3.9"
-  resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.3.9.tgz#ffb41bc9c7afafcc608d0c500e9d6b0af7d68fad"
-  integrity sha512-w0zT/s5l3Oa3ZjtLW88eO4uV6AQFqU8X5GOgzq7SkQQu6vVr+8tfm+OI2kDBplS/W/XgCBuFXiPw6T5EdwXP0A==
+"@vue/server-renderer@3.4.23":
+  version "3.4.23"
+  resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.4.23.tgz#e605872e26d995f5ba9382e8758cd8cc7fa2e16d"
+  integrity sha512-LDwGHtnIzvKFNS8dPJ1SSU5Gvm36p2ck8wCZc52fc3k/IfjKcwCyrWEf0Yag/2wTFUBXrqizfhK9c/mC367dXQ==
   dependencies:
-    "@vue/compiler-ssr" "3.3.9"
-    "@vue/shared" "3.3.9"
+    "@vue/compiler-ssr" "3.4.23"
+    "@vue/shared" "3.4.23"
 
 "@vue/shared@3.2.31":
   version "3.2.31"
   resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.31.tgz#c90de7126d833dcd3a4c7534d534be2fb41faa4e"
   integrity sha512-ymN2pj6zEjiKJZbrf98UM2pfDd6F2H7ksKw7NDt/ZZ1fh5Ei39X5tABugtT03ZRlWd9imccoK0hE8hpjpU7irQ==
 
-"@vue/shared@3.3.9":
-  version "3.3.9"
-  resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.3.9.tgz#df740d26d338faf03e09ca662a8031acf66051db"
-  integrity sha512-ZE0VTIR0LmYgeyhurPTpy4KzKsuDyQbMSdM49eKkMnT5X4VfFBLysMzjIZhLEFQYjjOVVfbvUDHckwjDFiO2eA==
+"@vue/shared@3.4.23":
+  version "3.4.23"
+  resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.4.23.tgz#e536a6dfd2f5f950d08c2e8ebcfe7e5329a851a1"
+  integrity sha512-wBQ0gvf+SMwsCQOyusNw/GoXPV47WGd1xB5A1Pgzy0sQ3Bi5r5xm3n+92y3gCnB3MWqnRDdvfkRGxhKtbBRNgg==
 
 "@vue/test-utils@^2.0.0-rc.10":
   version "2.0.0-rc.17"
@@ -4451,10 +4440,10 @@ csstype@^2.6.8:
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.20.tgz#9229c65ea0b260cf4d3d997cb06288e36a8d6dda"
   integrity sha512-/WwNkdXfckNgw6S5R125rrW8ez139lBHWouiBvX8dfMFtcn6V81REDqnH7+CRpRipfYlyU1CmOnOxrmGcFOjeA==
 
-csstype@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.2.tgz#1d4bf9d572f11c14031f0436e1c10bc1f571f50b"
-  integrity sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==
+csstype@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81"
+  integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==
 
 csvtojson@^2.0.10:
   version "2.0.10"
@@ -4894,6 +4883,11 @@ entities@^2.0.0:
   resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
   integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==
 
+entities@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48"
+  integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==
+
 env-paths@^2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"
@@ -7832,10 +7826,10 @@ magic-string@^0.25.7:
   dependencies:
     sourcemap-codec "^1.4.8"
 
-magic-string@^0.30.5:
-  version "0.30.5"
-  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.5.tgz#1994d980bd1c8835dc6e78db7cbd4ae4f24746f9"
-  integrity sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==
+magic-string@^0.30.8:
+  version "0.30.9"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.9.tgz#8927ae21bfdd856310e07a1bc8dd5e73cb6c251d"
+  integrity sha512-S1+hd+dIrC8EZqKyT9DstTH/0Z+f76kmmvZnkfQVmOpDEF9iVgdYif3Q/pIWHmCoo59bQVGW0kVL3e2nl+9+Sw==
   dependencies:
     "@jridgewell/sourcemap-codec" "^1.4.15"
 
@@ -8215,6 +8209,11 @@ nanoid@^3.3.6:
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c"
   integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==
 
+nanoid@^3.3.7:
+  version "3.3.7"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8"
+  integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==
+
 nanomatch@^1.2.9:
   version "1.2.13"
   resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
@@ -9382,7 +9381,7 @@ postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0:
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
   integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
 
-postcss@^8.1.10, postcss@^8.2.15, postcss@^8.3.11, postcss@^8.3.5, postcss@^8.4.31, postcss@^8.4.4:
+postcss@^8.1.10, postcss@^8.2.15, postcss@^8.3.11, postcss@^8.3.5, postcss@^8.4.4:
   version "8.4.31"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.31.tgz#92b451050a9f914da6755af352bdc0192508656d"
   integrity sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==
@@ -9391,6 +9390,15 @@ postcss@^8.1.10, postcss@^8.2.15, postcss@^8.3.11, postcss@^8.3.5, postcss@^8.4.
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
+postcss@^8.4.38:
+  version "8.4.38"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.38.tgz#b387d533baf2054288e337066d81c6bee9db9e0e"
+  integrity sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==
+  dependencies:
+    nanoid "^3.3.7"
+    picocolors "^1.0.0"
+    source-map-js "^1.2.0"
+
 prelude-ls@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
@@ -10490,6 +10498,11 @@ source-map-js@^1.0.2:
   resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
   integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
 
+source-map-js@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af"
+  integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==
+
 source-map-resolve@^0.5.0, source-map-resolve@^0.5.2:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
@@ -11406,11 +11419,6 @@ vm-browserify@^1.1.2:
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
   integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
 
-vue-class-component@^7.2.6:
-  version "7.2.6"
-  resolved "https://registry.yarnpkg.com/vue-class-component/-/vue-class-component-7.2.6.tgz#8471e037b8e4762f5a464686e19e5afc708502e4"
-  integrity sha512-+eaQXVrAm/LldalI272PpDe3+i4mPis0ORiMYxF6Ae4hyuCh15W8Idet7wPUEs4N4YptgFHGys4UrgNQOMyO6w==
-
 vue-demi@>=0.14.5:
   version "0.14.6"
   resolved "https://registry.yarnpkg.com/vue-demi/-/vue-demi-0.14.6.tgz#dc706582851dc1cdc17a0054f4fec2eb6df74c92"
@@ -11503,15 +11511,15 @@ vue@^3.0.0:
     "@vue/shared" "3.2.31"
 
 vue@^3.3.0:
-  version "3.3.9"
-  resolved "https://registry.yarnpkg.com/vue/-/vue-3.3.9.tgz#219a2ec68e8d4d0b0180460af0f5b9299b3f3f1f"
-  integrity sha512-sy5sLCTR8m6tvUk1/ijri3Yqzgpdsmxgj6n6yl7GXXCXqVbmW2RCXe9atE4cEI6Iv7L89v5f35fZRRr5dChP9w==
-  dependencies:
-    "@vue/compiler-dom" "3.3.9"
-    "@vue/compiler-sfc" "3.3.9"
-    "@vue/runtime-dom" "3.3.9"
-    "@vue/server-renderer" "3.3.9"
-    "@vue/shared" "3.3.9"
+  version "3.4.23"
+  resolved "https://registry.yarnpkg.com/vue/-/vue-3.4.23.tgz#9d5a990a71c5bd5446f80377828e6587cfc488d5"
+  integrity sha512-X1y6yyGJ28LMUBJ0k/qIeKHstGd+BlWQEOT40x3auJFTmpIhpbKLgN7EFsqalnJXq1Km5ybDEsp6BhuWKciUDg==
+  dependencies:
+    "@vue/compiler-dom" "3.4.23"
+    "@vue/compiler-sfc" "3.4.23"
+    "@vue/runtime-dom" "3.4.23"
+    "@vue/server-renderer" "3.4.23"
+    "@vue/shared" "3.4.23"
 
 w3c-hr-time@^1.0.2:
   version "1.0.2"

From 3c31d7882a317b0f577298579ffc873fc3aa89d6 Mon Sep 17 00:00:00 2001
From: Viterbo Rodriguez <Viterbo@users.noreply.github.com>
Date: Fri, 10 May 2024 19:32:59 -0300
Subject: [PATCH 08/10] Removing commented code from resources.spec.ts

---
 test/jest/__tests__/stores/resources.spec.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/test/jest/__tests__/stores/resources.spec.ts b/test/jest/__tests__/stores/resources.spec.ts
index 771a6e5a..8657c57b 100644
--- a/test/jest/__tests__/stores/resources.spec.ts
+++ b/test/jest/__tests__/stores/resources.spec.ts
@@ -169,8 +169,6 @@ describe('Store - Resources Actions', () => {
         test('when the account is the same, we have its data and we don\'t force', async () => {
             const resourceStore = useResourceStore();
 
-            // resourceStore.currentAccount = 'account1';
-
             setLoading = jest.spyOn(resourceStore, 'setLoading');
             setCurrentAccount = jest.spyOn(resourceStore, 'setCurrentAccount');
             unsetLoading = jest.spyOn(resourceStore, 'unsetLoading');

From a545ffa3afa242e4b8b82482e773e6184fd0b152 Mon Sep 17 00:00:00 2001
From: Viterbo Rodriguez <Viterbo@users.noreply.github.com>
Date: Fri, 10 May 2024 19:34:31 -0300
Subject: [PATCH 09/10] Removing commented conde from account.spec.ts

---
 test/jest/__tests__/stores/account.spec.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/jest/__tests__/stores/account.spec.ts b/test/jest/__tests__/stores/account.spec.ts
index 3ff3eb49..cabee198 100644
--- a/test/jest/__tests__/stores/account.spec.ts
+++ b/test/jest/__tests__/stores/account.spec.ts
@@ -123,7 +123,7 @@ describe('Store - Account Actions', () => {
     describe('login()', () => {
         test('when no account is provided it should request account', async () => {
             const accountStore = useAccountStore();
-            //const authenticator = newAuthenticatorMock(true);
+
             const authenticator = new MockAuthenticator(null);
 
             const accountStoreLoginSpy = jest.spyOn(accountStore, 'login');
@@ -142,7 +142,6 @@ describe('Store - Account Actions', () => {
             expect(mockInit).toHaveBeenCalledTimes(1);
 
             expect(mockShouldRequestAccountName).toHaveBeenCalledTimes(1);
-            // expect(accountStore.requestAccount).toEqual(true);
 
         });
 

From 210b1451c948d7d786df70f76e476da4a0433123 Mon Sep 17 00:00:00 2001
From: Viterbo <viter.rod@gmail.com>
Date: Fri, 17 May 2024 13:33:24 -0300
Subject: [PATCH 10/10] removing account store unit test

---
 test/jest/__tests__/stores/account.spec.ts | 244 ---------------------
 1 file changed, 244 deletions(-)
 delete mode 100644 test/jest/__tests__/stores/account.spec.ts

diff --git a/test/jest/__tests__/stores/account.spec.ts b/test/jest/__tests__/stores/account.spec.ts
deleted file mode 100644
index cabee198..00000000
--- a/test/jest/__tests__/stores/account.spec.ts
+++ /dev/null
@@ -1,244 +0,0 @@
-// import { AccountStateInterface } from 'src/stores/account';
-
-import { Authenticator, User, UALError, ButtonStyle, Chain } from 'universal-authenticator-library';
-import { createPinia, setActivePinia } from 'pinia';
-import { useAccountStore } from 'src/stores/account';
-
-const localStorageMock = {
-    getItem: jest.fn(),
-    setItem: jest.fn(),
-    removeItem:jest.fn(),
-};
-
-Object.defineProperty(window, 'localStorage', { value: localStorageMock });
-
-const transactionHeaders = {
-    context_free_actions: [] as never[],
-    delay_sec: 123,
-    expiration: new Date(new Date().getTime() + 30000),
-    max_cpu_usage_ms: 99,
-    max_net_usage_words: 0,
-    ref_block_num: 0,
-    ref_block_prefix: 0,
-    transaction_extensions: [] as never[],
-};
-
-jest.mock('@greymass/eosio', () => ({
-    Name: {
-        from: (s: string) => ({ toString: () => s }),
-    },
-    UInt64: {
-        from: (i: number) => Number(i),
-    },
-    APIClient: jest.fn().mockImplementation(() => ({
-        v1: {
-            chain: {
-                get_info: () => ({
-                    getTransactionHeader: () => transactionHeaders,
-                }),
-                get_abi: () => Promise.resolve({ abi: 'abi' }),
-                push_transaction: () => ({
-                    transaction_id: 'transaction_id',
-                    processed: { receipt: { status: 'status' } },
-                }),
-            },
-        },
-    })),
-}));
-
-jest.mock('src/api/fuel', () => ({
-    FuelUserWrapper: class {
-        constructor() {
-            jest.fn();
-        }
-        getAccountName() {
-            return 'john.doe';
-        }
-        requestPermission = '';
-    },
-}));
-const chainIdMock = 'chainIdMock';
-
-const users = [{
-    name: 'John Doe',
-    getAccountName: jest.fn().mockResolvedValue('john.doe'),
-} as unknown as User];
-
-class MockAuthenticator extends Authenticator {
-    reset(): void {
-        throw new Error('Method not implemented.');
-    }
-    isErrored(): boolean {
-        throw new Error('Method not implemented.');
-    }
-    getOnboardingLink(): string {
-        throw new Error('Method not implemented.');
-    }
-    getError(): UALError {
-        throw new Error('Method not implemented.');
-    }
-    isLoading(): boolean {
-        throw new Error('Method not implemented.');
-    }
-    getStyle(): ButtonStyle {
-        throw new Error('Method not implemented.');
-    }
-    shouldRender(): boolean {
-        throw new Error('Method not implemented.');
-    }
-    shouldAutoLogin(): boolean {
-        throw new Error('Method not implemented.');
-    }
-    login(accountName?: string): Promise<User[]> {
-        return Promise.resolve(users);
-    }
-    logout(): Promise<void> {
-        throw new Error('Method not implemented.');
-    }
-    requiresGetKeyConfirmation(): boolean {
-        throw new Error('Method not implemented.');
-    }
-    getName(): string {
-        return 'autoLogin';
-    }
-    init(): Promise<void> {
-        // Implementation for initialization logic
-        return Promise.resolve();
-    }
-    shouldRequestAccountName(): Promise<boolean> {
-        return Promise.resolve(true);
-    }
-    chains: Chain[] = [{
-        chainId: chainIdMock,
-    }] as unknown as Chain[]
-}
-
-describe('Store - Account Actions', () => {
-    beforeEach(() => {
-        jest.clearAllMocks();
-        setActivePinia(createPinia());
-
-    });
-
-    describe('login()', () => {
-        test('when no account is provided it should request account', async () => {
-            const accountStore = useAccountStore();
-
-            const authenticator = new MockAuthenticator(null);
-
-            const accountStoreLoginSpy = jest.spyOn(accountStore, 'login');
-            const mockInit = jest.spyOn(authenticator, 'init');
-            const mockShouldRequestAccountName = jest.spyOn(authenticator, 'shouldRequestAccountName');
-
-            // call the action login
-            await accountStore.login(
-                { account: null, authenticator },
-            );
-
-            // verify that the action called correctly the init function of the authenticator
-            expect(accountStoreLoginSpy).toHaveBeenCalledWith({ account: null, authenticator });
-
-            // // Verify that the action called correctly the commit mutation 'setRequestAccount' with the value true
-            expect(mockInit).toHaveBeenCalledTimes(1);
-
-            expect(mockShouldRequestAccountName).toHaveBeenCalledTimes(1);
-
-        });
-
-        test('when not account provided but not needed', async () => {
-            const accountStore = useAccountStore();
-            const authenticator = new MockAuthenticator(null);
-
-            const requestAccountSpy = jest.spyOn(authenticator, 'shouldRequestAccountName');
-            const authenticatorInit = jest.spyOn(authenticator, 'init');
-            const authenticatorLogin = jest.spyOn(authenticator, 'login');
-            requestAccountSpy.mockResolvedValue(false);
-
-            // call the action login
-            await accountStore.login(
-                { account: null, authenticator },
-            );
-
-            // verify that the action called correctly the init function of the authenticator
-            expect(authenticatorInit).toHaveBeenCalled();
-
-            expect(requestAccountSpy).toHaveBeenCalled();
-            expect(accountStore.requestAccount).toEqual(false);
-
-            // Verify that the action called the login method of the authenticator
-            expect(authenticatorLogin).toHaveBeenCalled();
-            expect(accountStore.accountPermission).toBe('active');
-            expect(accountStore.isAuthenticated).toBe(true);
-            expect(accountStore.accountName).toBe('john.doe');
-            expect(localStorageMock.setItem).toHaveBeenCalledWith('account_' + chainIdMock, 'john.doe');
-            expect(localStorageMock.setItem).toHaveBeenCalledWith('autoLogin_' + chainIdMock, 'autoLogin');
-
-        });
-
-        test('when account provided - Normal case', async () => {
-            const accountStore = useAccountStore();
-            const authenticator = new MockAuthenticator(null);
-
-            const requestAccountSpy = jest.spyOn(authenticator, 'shouldRequestAccountName');
-            const authenticatorInit = jest.spyOn(authenticator, 'init');
-            const authenticatorLogin = jest.spyOn(authenticator, 'login');
-            requestAccountSpy.mockResolvedValue(false);
-
-            // call the action login
-            await accountStore.login(
-                { account: 'john.doe', authenticator },
-            );
-
-            // Verify that the action called correctly the init function of the authenticator
-            expect(authenticatorInit).toHaveBeenCalled();
-
-            // Verify that the action called the login method of the authenticator
-            expect(authenticatorLogin).toHaveBeenCalled();
-            expect(accountStore.accountPermission).toBe('active');
-            expect(accountStore.isAuthenticated).toBe(true);
-            expect(accountStore.accountName).toBe('john.doe');
-            expect(localStorageMock.setItem).toHaveBeenCalledWith('account_' + chainIdMock, 'john.doe');
-            expect(localStorageMock.setItem).toHaveBeenCalledWith('autoLogin_' + chainIdMock, 'autoLogin');
-        });
-
-    });
-
-    describe('logout()', () => {
-        beforeEach(async () => {
-            jest.clearAllMocks();
-
-            // Logs in
-            const accountStore = useAccountStore();
-            const authenticator = new MockAuthenticator(null);
-            await accountStore.login(
-                { account: 'john.doe', authenticator },
-            );
-        });
-
-        test('normal case', () => {
-            const accountStore = useAccountStore();
-
-            expect(accountStore.user).not.toBe(null);
-            expect(accountStore.accountPermission).toBe('active');
-            expect(accountStore.isAuthenticated).toBe(true);
-            expect(accountStore.accountName).toBe('john.doe');
-
-            // call the action logout
-            accountStore.logout();
-
-            expect(accountStore.user).toBe(null);
-            expect(accountStore.isAuthenticated).toBe(false);
-            expect(accountStore.accountName).toBe('');
-
-            expect(localStorageMock.removeItem).toHaveBeenCalledWith('account_' + chainIdMock);
-            expect(localStorageMock.removeItem).toHaveBeenCalledWith('autoLogin_' + chainIdMock);
-        });
-    });
-});
-
-
-
-
-
-
-