diff --git a/electron/ipcHandlers.ts b/electron/ipcHandlers.ts
index 3f17a12..4ea0842 100644
--- a/electron/ipcHandlers.ts
+++ b/electron/ipcHandlers.ts
@@ -80,13 +80,95 @@ ipcMain.handle('wallet:checkKeystore', async () => {
 
         if (!newestFile) return { exists: false, filePath: null }
 
-        return { exists: true, filePath: path.join(walletDir, newestFile) }
+        const resolvedPath = path.join(walletDir, newestFile)
+        let minBlockHeight: number | null = null
+
+        try {
+            const json = fs.readFileSync(resolvedPath, 'utf-8')
+            const data = JSON.parse(json)
+            const height = data?.minBlockHeight
+
+            if (typeof height === 'number' && Number.isFinite(height)) {
+                minBlockHeight = height
+            }
+        } catch (error) {
+            console.warn('Unable to read minBlockHeight from keystore:', error)
+        }
+
+        return { exists: true, filePath: resolvedPath, minBlockHeight }
     } catch (error) {
         console.error('Error checking keystore ipc:', error)
-        return { exists: false, filePath: null, error: String(error) }
+        return { exists: false, filePath: null, minBlockHeight: null, error: String(error) }
     }
 })
 
+ipcMain.handle(
+    'wallet:updateMinBlockHeight',
+    async (_event, filePath: string | null, minBlockHeight: number | null) => {
+        if (!filePath) {
+            return { success: false, error: 'No keystore file path provided.' }
+        }
+
+        try {
+            const normalizedPath = path.isAbsolute(filePath)
+                ? filePath
+                : path.join(process.cwd(), filePath)
+
+            if (!fs.existsSync(normalizedPath)) {
+                return { success: false, error: 'Keystore file not found.' }
+            }
+
+            const fileContents = fs.readFileSync(normalizedPath, 'utf-8')
+            const walletJson = JSON.parse(fileContents)
+
+            if (minBlockHeight === null || Number.isNaN(minBlockHeight)) {
+                walletJson.minBlockHeight = null
+            } else {
+                walletJson.minBlockHeight = minBlockHeight
+            }
+
+            fs.writeFileSync(normalizedPath, JSON.stringify(walletJson, null, 2), 'utf-8')
+
+            return { success: true, minBlockHeight }
+        } catch (error) {
+            console.error('Error updating min block height:', error)
+            return { success: false, error: String(error) }
+        }
+    }
+)
+
+ipcMain.handle(
+    'wallet:getMinBlockHeight',
+    async (_event, filePath: string | null) => {
+        if (!filePath) {
+            return { success: false, error: 'No keystore file path provided.', minBlockHeight: null }
+        }
+
+        try {
+            const normalizedPath = path.isAbsolute(filePath)
+                ? filePath
+                : path.join(process.cwd(), filePath)
+
+            if (!fs.existsSync(normalizedPath)) {
+                return { success: false, error: 'Keystore file not found.', minBlockHeight: null }
+            }
+
+            const fileContents = fs.readFileSync(normalizedPath, 'utf-8')
+            const walletJson = JSON.parse(fileContents)
+            const height = walletJson?.minBlockHeight
+
+            if (typeof height === 'number' && Number.isFinite(height)) {
+                return { success: true, minBlockHeight: height }
+            }
+
+            return { success: true, minBlockHeight: null }
+        } catch (error) {
+            console.error('Error reading min block height:', error)
+            return { success: false, error: String(error), minBlockHeight: null }
+        }
+    }
+)
+
 ipcMain.handle('wallet:generateKeysFromSeed', async (_event, seedPhrase: string[]) => {
     try {
         const wallet = new neptuneNative.WalletManager()
@@ -97,15 +179,19 @@ ipcMain.handle('wallet:generateKeysFromSeed', async (_event, seedPhrase: string[
     }
 })
 
-ipcMain.handle('wallet:buildTransactionWithPrimitiveProof', async (_event, args) => {
+ipcMain.handle('wallet:buildTransaction', async (_event, args) => {
     const { spendingKeyHex, inputAdditionRecords, outputAddresses, outputAmounts, fee } = args
 
     try {
         const builder = new neptuneNative.SimpleTransactionBuilder()
-        const result = await builder.buildTransactionWithPrimitiveProof(
+        const result = await builder.buildTransaction(
             import.meta.env.VITE_APP_API,
             spendingKeyHex,
             inputAdditionRecords,
+            // pass minBlockHeight from args if provided, default 0
+            typeof args?.minBlockHeight === 'number' && Number.isFinite(args.minBlockHeight)
+                ? args.minBlockHeight
+                : 0,
             outputAddresses,
             outputAmounts,
             fee
diff --git a/electron/preload.ts b/electron/preload.ts
index 4b791e0..817977c 100644
--- a/electron/preload.ts
+++ b/electron/preload.ts
@@ -12,6 +12,9 @@ contextBridge.exposeInMainWorld('walletApi', {
     checkKeystore: () => ipcRenderer.invoke('wallet:checkKeystore'),
     generateKeysFromSeed: (seedPhrase: string[]) =>
         ipcRenderer.invoke('wallet:generateKeysFromSeed', seedPhrase),
-    buildTransactionWithPrimitiveProof: (args: any) =>
-        ipcRenderer.invoke('wallet:buildTransactionWithPrimitiveProof', args),
+    buildTransaction: (args: any) => ipcRenderer.invoke('wallet:buildTransaction', args),
+    updateMinBlockHeight: (filePath: string | null, minBlockHeight: number | null) =>
+        ipcRenderer.invoke('wallet:updateMinBlockHeight', filePath, minBlockHeight),
+    getMinBlockHeight: (filePath: string | null) =>
+        ipcRenderer.invoke('wallet:getMinBlockHeight', filePath),
 })
diff --git a/electron/utils/keystore.ts b/electron/utils/keystore.ts
index ec17d98..aef9d3e 100644
--- a/electron/utils/keystore.ts
+++ b/electron/utils/keystore.ts
@@ -4,7 +4,6 @@ export async function encrypt(seed: string, password: string) {
     const salt = crypto.randomBytes(16)
     const iv = crypto.randomBytes(12)
 
-    // derive 32-byte key từ password
     const key = await new Promise<Buffer>((resolve, reject) => {
         crypto.scrypt(password, salt, 32, { N: 16384, r: 8, p: 1 }, (err, derivedKey) => {
             if (err) reject(err)
diff --git a/env.d.ts b/env.d.ts
index d687c0a..7d16d80 100644
--- a/env.d.ts
+++ b/env.d.ts
@@ -2,3 +2,12 @@
 
 declare const MAIN_WINDOW_VITE_DEV_SERVER_URL: string | undefined;
 declare const MAIN_WINDOW_VITE_NAME: string | undefined;
+
+interface ImportMetaEnv {
+  readonly VITE_APP_API: string
+  readonly VITE_NODE_NETWORK?: 'mainnet' | 'testnet'
+}
+
+interface ImportMeta {
+  readonly env: ImportMetaEnv
+}
diff --git a/packages/neptune-native-0.1.0.tgz b/packages/neptune-native-0.1.0.tgz
deleted file mode 100644
index 7089c75..0000000
Binary files a/packages/neptune-native-0.1.0.tgz and /dev/null differ
diff --git a/packages/neptune-native/index.d.ts b/packages/neptune-native/index.d.ts
index a5d663b..c59ff10 100644
--- a/packages/neptune-native/index.d.ts
+++ b/packages/neptune-native/index.d.ts
@@ -3,12 +3,9 @@
 
 /* auto-generated by NAPI-RS */
 
-/** Module initialization */
 export declare function initNativeModule(): string
-/** Quick VM test (can call immediately) */
 export declare function quickVmTest(): string
 export declare function getVersion(): string
-/** Wallet manager for key generation and transaction signing */
 export declare class WalletManager {
   constructor()
   /**
@@ -64,7 +61,7 @@ export declare class WalletManager {
   getStateCall(rpcUrl: string): Promise<string>
   /** Call mempool_submitTransaction to broadcast a pre-built transaction */
   submitTransactionCall(rpcUrl: string, transactionHex: string): Promise<string>
-  getUtxosFromViewKeyCall(rpcUrl: string, viewKeyHex: string, startBlock: number, endBlock: number, maxSearchDepth?: number | undefined | null): Promise<string>
+  getUtxosFromViewKeyCall(rpcUrl: string, viewKeyHex: string, startBlock: number, maxSearchDepth?: number | undefined | null): Promise<string>
   getArchivalMutatorSet(rpcUrl: string): Promise<string>
   /**
    * Build JSON-RPC request to find the canonical block that created a UTXO (by addition_record)
@@ -78,5 +75,5 @@ export declare class WalletManager {
 }
 export declare class SimpleTransactionBuilder {
   constructor()
-  buildTransactionWithPrimitiveProof(rpcUrl: string, spendingKeyHex: string, inputAdditionRecords: Array<string>, outputAddresses: Array<string>, outputAmounts: Array<string>, fee: string): Promise<string>
+  buildTransaction(rpcUrl: string, spendingKeyHex: string, inputAdditionRecords: Array<string>, minBlockHeight: number, outputAddresses: Array<string>, outputAmounts: Array<string>, fee: string): Promise<string>
 }
diff --git a/packages/neptune-native/neptune-native.darwin-arm64.node b/packages/neptune-native/neptune-native.darwin-arm64.node
new file mode 100755
index 0000000..46809d2
Binary files /dev/null and b/packages/neptune-native/neptune-native.darwin-arm64.node differ
diff --git a/packages/neptune-native/neptune-native.linux-x64-gnu.node b/packages/neptune-native/neptune-native.linux-x64-gnu.node
new file mode 100755
index 0000000..8906209
Binary files /dev/null and b/packages/neptune-native/neptune-native.linux-x64-gnu.node differ
diff --git a/packages/neptune-native/neptune-native.win32-x64-msvc.node b/packages/neptune-native/neptune-native.win32-x64-msvc.node
index 2ec83cf..c6188c4 100644
Binary files a/packages/neptune-native/neptune-native.win32-x64-msvc.node and b/packages/neptune-native/neptune-native.win32-x64-msvc.node differ
diff --git a/src/App.vue b/src/App.vue
index a06885c..66a2a72 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,4 @@
 <script setup lang="ts">
-import { LayoutVue } from '@/components'
-
 const config = {
     token: {
         colorPrimary: '#42A5F5',
diff --git a/src/api/neptuneApi.ts b/src/api/neptuneApi.ts
index 1c1461a..883a9c9 100644
--- a/src/api/neptuneApi.ts
+++ b/src/api/neptuneApi.ts
@@ -2,7 +2,7 @@ import { callJsonRpc } from '@/api/request'
 
 export const getUtxosFromViewKey = async (
     viewKey: string,
-    startBlock: number = 0,
+    startBlock: number | null = 0,
     endBlock: number | null = null,
     maxSearchDepth: number = 1000
 ): Promise<any> => {
@@ -17,7 +17,7 @@ export const getUtxosFromViewKey = async (
 
 export const getBalance = async (
     viewKey: string,
-    startBlock: number = 0,
+    startBlock: number | null = 0,
     endBlock: number | null = null,
     maxSearchDepth: number = 1000
 ): Promise<any> => {
diff --git a/src/components/common/ButtonCommon.vue b/src/components/common/ButtonCommon.vue
index 7a6c0e4..1e45717 100644
--- a/src/components/common/ButtonCommon.vue
+++ b/src/components/common/ButtonCommon.vue
@@ -1,7 +1,6 @@
 <script setup lang="ts">
 import type { ButtonProps } from '@/interface'
 import { computed } from 'vue'
-import { SpinnerCommon } from '@/components'
 
 const props = withDefaults(defineProps<ButtonProps>(), {
     type: 'default',
diff --git a/src/components/common/PasswordForm.vue b/src/components/common/PasswordForm.vue
index 4da69de..7cc4b4d 100644
--- a/src/components/common/PasswordForm.vue
+++ b/src/components/common/PasswordForm.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import { ref, computed } from 'vue'
-import { ButtonCommon, CardBase, FormCommon } from '@/components'
 
 interface Props {
     title?: string
diff --git a/src/composables/useNeptuneWallet.ts b/src/composables/useNeptuneWallet.ts
index f2c0fc9..dc7669a 100644
--- a/src/composables/useNeptuneWallet.ts
+++ b/src/composables/useNeptuneWallet.ts
@@ -7,6 +7,7 @@ import type {
     WalletState,
 } from '@/interface'
 import initWasm, { generate_seed, address_from_seed, validate_seed_phrase } from '@neptune/wasm'
+import { toFiniteNumber } from '@/utils'
 
 let wasmInitialized = false
 let initPromise: Promise<void> | null = null
@@ -125,6 +126,8 @@ export function useNeptuneWallet() {
 
             const addressResult = await getAddressFromSeed(seedPhrase)
             store.setAddress(addressResult)
+
+            await loadMinBlockHeightFromKeystore()
         } catch (err) {
             if (
                 err instanceof Error &&
@@ -142,6 +145,7 @@ export function useNeptuneWallet() {
         try {
             const result = await (window as any).walletApi.createKeystore(seed, password)
             store.setKeystorePath(result.filePath)
+            store.setMinBlockHeight(null)
             return result.filePath
         } catch (err) {
             console.error('Error creating keystore:', err)
@@ -166,6 +170,10 @@ export function useNeptuneWallet() {
             if (!keystoreFile.exists) return false
 
             store.setKeystorePath(keystoreFile.filePath)
+            if ('minBlockHeight' in keystoreFile) {
+                const height = keystoreFile.minBlockHeight
+                store.setMinBlockHeight(toFiniteNumber(height))
+            }
             return true
         } catch (err) {
             console.error('Error checking keystore:', err)
@@ -173,18 +181,73 @@ export function useNeptuneWallet() {
         }
     }
 
-    // ===== API METHODS =====
+    const persistMinBlockHeight = async (utxos: any[]) => {
+        const keystorePath = store.getKeystorePath
+        if (!keystorePath) return
 
+        try {
+            const minBlockHeight = utxos.reduce((min, utxo) => {
+                const h = +(
+                    utxo?.blockHeight ??
+                    utxo?.block_height ??
+                    utxo?.height ??
+                    utxo?.block?.height
+                )
+                return Number.isFinite(h) && (min === null || h < min) ? h : min
+            }, null)
+
+            const response = await (window as any).walletApi.updateMinBlockHeight(
+                keystorePath,
+                minBlockHeight
+            )
+            if (!response.success) throw new Error('Failed to update min block height')
+            store.setMinBlockHeight(minBlockHeight)
+        } catch (err) {
+            console.error('Error saving min block height:', err)
+            throw err
+        }
+    }
+
+    const loadMinBlockHeightFromKeystore = async (): Promise<number | null> => {
+        const keystorePath = store.getKeystorePath
+        if (!keystorePath) return null
+
+        try {
+            const response = await (window as any).walletApi.getMinBlockHeight(keystorePath)
+            if (!response?.success) return null
+
+            const minBlockHeight = toFiniteNumber(response.minBlockHeight)
+
+            store.setMinBlockHeight(minBlockHeight)
+            return minBlockHeight
+        } catch (err) {
+            console.error('Error loading min block height:', err)
+            throw err
+        }
+    }
+
+    // ===== API METHODS =====
     const getUtxos = async (): Promise<any> => {
         try {
             if (!store.getViewKey) {
                 throw new Error('No view key available. Please import or generate a wallet first.')
             }
 
-            const response = await API.getUtxosFromViewKey(store.getViewKey || '')
+            let startBlock: number | null = store.getMinBlockHeight
+            if (startBlock == null) startBlock = await loadMinBlockHeightFromKeystore()
+
+            const response = await API.getUtxosFromViewKey(
+                store.getViewKey || '',
+                toFiniteNumber(startBlock, 0)
+            )
 
             const result = response?.result || response
-            store.setUtxos(result.utxos || result || [])
+            const utxos = result?.utxos ?? result
+            const utxoList = Array.isArray(utxos) ? utxos : []
+
+            store.setUtxos(utxoList)
+
+            await persistMinBlockHeight(utxoList)
             return result
         } catch (err) {
             console.error('Error getting UTXOs:', err)
@@ -194,8 +257,18 @@ export function useNeptuneWallet() {
 
     const getBalance = async (): Promise<any> => {
         try {
-            const response = await API.getBalance(store.getViewKey || '')
+            let startBlock: number | null | undefined = store.getMinBlockHeight
+
+            if (startBlock === null || startBlock === undefined) {
+                startBlock = await loadMinBlockHeightFromKeystore()
+            }
+
+            const response = await API.getBalance(
+                store.getViewKey || '',
+                toFiniteNumber(startBlock, 0)
+            )
             const result = response?.result || response
+
             store.setBalance(result?.balance || result)
             store.setPendingBalance(result?.pendingBalance || result)
             return {
@@ -232,17 +305,21 @@ export function useNeptuneWallet() {
         }
     }
 
-    const buildTransactionWithPrimitiveProof = async (
-        args: PayloadBuildTransaction
-    ): Promise<any> => {
+    const buildTransaction = async (args: PayloadBuildTransaction): Promise<any> => {
+        let minBlockHeight: number | null | undefined = store.getMinBlockHeight
+        if (minBlockHeight === null || minBlockHeight === undefined) {
+            minBlockHeight = await loadMinBlockHeightFromKeystore()
+        }
+
         const payload = {
             spendingKeyHex: store.getSpendingKey,
             inputAdditionRecords: args.inputAdditionRecords,
+            minBlockHeight: toFiniteNumber(minBlockHeight, 0),
             outputAddresses: args.outputAddresses,
             outputAmounts: args.outputAmounts,
             fee: args.fee,
         }
-        return await (window as any).walletApi.buildTransactionWithPrimitiveProof(payload)
+        return await (window as any).walletApi.buildTransaction(payload)
     }
 
     const broadcastSignedTransaction = async (transactionHex: string): Promise<any> => {
@@ -290,7 +367,7 @@ export function useNeptuneWallet() {
         getBalance,
         getBlockHeight,
         getNetworkInfo,
-        buildTransactionWithPrimitiveProof,
+        buildTransaction,
         broadcastSignedTransaction,
         decryptKeystore,
         createKeystore,
diff --git a/src/interface/neptune.ts b/src/interface/neptune.ts
index 90be6e5..e8066ce 100644
--- a/src/interface/neptune.ts
+++ b/src/interface/neptune.ts
@@ -9,6 +9,7 @@ export interface WalletState {
     balance?: string | null
     pendingBalance?: string | null
     utxos?: Utxo[]
+    minBlockHeight?: number | null
 }
 
 export interface GenerateSeedResult {
diff --git a/src/stores/neptuneStore.ts b/src/stores/neptuneStore.ts
index c740f2b..6cb67ca 100644
--- a/src/stores/neptuneStore.ts
+++ b/src/stores/neptuneStore.ts
@@ -1,6 +1,7 @@
 import { defineStore } from 'pinia'
 import { ref, computed } from 'vue'
 import type { WalletState } from '@/interface'
+import { toFiniteNumber } from '@/utils'
 
 export const useNeptuneStore = defineStore('neptune', () => {
     const defaultNetwork = (import.meta.env.VITE_NODE_NETWORK || 'mainnet') as 'mainnet' | 'testnet'
@@ -17,6 +18,7 @@ export const useNeptuneStore = defineStore('neptune', () => {
         balance: null,
         pendingBalance: null,
         utxos: [],
+        minBlockHeight: null,
     })
 
     const keystorePath = ref<null | string>(null)
@@ -63,6 +65,10 @@ export const useNeptuneStore = defineStore('neptune', () => {
         wallet.value.utxos = utxos
     }
 
+    const setMinBlockHeight = (minBlockHeight: number | null) => {
+        wallet.value.minBlockHeight = toFiniteNumber(minBlockHeight)
+    }
+
     const setWallet = (walletData: Partial<WalletState>) => {
         wallet.value = { ...wallet.value, ...walletData }
     }
@@ -83,6 +89,7 @@ export const useNeptuneStore = defineStore('neptune', () => {
             balance: null,
             pendingBalance: null,
             utxos: [],
+            minBlockHeight: null,
         }
     }
 
@@ -99,6 +106,7 @@ export const useNeptuneStore = defineStore('neptune', () => {
     const getBalance = computed(() => wallet.value.balance)
     const getPendingBalance = computed(() => wallet.value.pendingBalance)
     const getUtxos = computed(() => wallet.value.utxos)
+    const getMinBlockHeight = computed(() => wallet.value.minBlockHeight ?? null)
     const hasWallet = computed(() => wallet.value.address !== null)
     const getKeystorePath = computed(() => keystorePath.value)
     return {
@@ -114,6 +122,7 @@ export const useNeptuneStore = defineStore('neptune', () => {
         getBalance,
         getPendingBalance,
         getUtxos,
+        getMinBlockHeight,
         hasWallet,
         getKeystorePath,
         setSeedPhrase,
@@ -126,6 +135,7 @@ export const useNeptuneStore = defineStore('neptune', () => {
         setBalance,
         setPendingBalance,
         setUtxos,
+        setMinBlockHeight,
         setWallet,
         setKeystorePath,
         clearWallet,
diff --git a/src/utils/helpers/helpers.ts b/src/utils/helpers/helpers.ts
new file mode 100644
index 0000000..a09ac63
--- /dev/null
+++ b/src/utils/helpers/helpers.ts
@@ -0,0 +1,3 @@
+export function toFiniteNumber(value: number | null, defaultValue?: number): number | null {
+    return Number.isFinite(value) ? value : (defaultValue ?? null)
+}
diff --git a/src/utils/index.ts b/src/utils/index.ts
index b7d3db2..dc50546 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -2,3 +2,4 @@ export * from './constants/code'
 export * from './constants/constants'
 export * from './helpers/format'
 export * from './helpers/seedPhrase'
+export * from './helpers/helpers'
diff --git a/src/views/Auth/components/LoginTab.vue b/src/views/Auth/components/LoginTab.vue
index a1dea1f..e37ce30 100644
--- a/src/views/Auth/components/LoginTab.vue
+++ b/src/views/Auth/components/LoginTab.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import { ref } from 'vue'
-import { PasswordForm } from '@/components'
 import { useNeptuneWallet } from '@/composables/useNeptuneWallet'
 import { useRouter } from 'vue-router'
 import { useAuthStore } from '@/stores/authStore'
diff --git a/src/views/Auth/components/OnboardingTab.vue b/src/views/Auth/components/OnboardingTab.vue
index 796228e..77c9d4a 100644
--- a/src/views/Auth/components/OnboardingTab.vue
+++ b/src/views/Auth/components/OnboardingTab.vue
@@ -1,6 +1,4 @@
 <script setup lang="ts">
-import { ButtonCommon } from '@/components'
-
 const emit = defineEmits<{
     goToCreate: []
     goToRecover: []
diff --git a/src/views/Auth/components/SeedPhraseDisplayComponent.vue b/src/views/Auth/components/SeedPhraseDisplayComponent.vue
index 0ce6a1c..9b6bc80 100644
--- a/src/views/Auth/components/SeedPhraseDisplayComponent.vue
+++ b/src/views/Auth/components/SeedPhraseDisplayComponent.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import { computed } from 'vue'
-import { ButtonCommon } from '@/components'
 import { useNeptuneStore } from '@/stores/neptuneStore'
 import { message } from 'ant-design-vue'
 
diff --git a/src/views/Auth/components/create/ConfirmSeedComponent.vue b/src/views/Auth/components/create/ConfirmSeedComponent.vue
index 48c2167..480b38c 100644
--- a/src/views/Auth/components/create/ConfirmSeedComponent.vue
+++ b/src/views/Auth/components/create/ConfirmSeedComponent.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import { ref, onMounted, computed } from 'vue'
-import { ButtonCommon } from '@/components'
 import { useNeptuneStore } from '@/stores/neptuneStore'
 import { message } from 'ant-design-vue'
 
diff --git a/src/views/Auth/components/create/CreatePasswordStep.vue b/src/views/Auth/components/create/CreatePasswordStep.vue
index 2b5dc57..b0a7f15 100644
--- a/src/views/Auth/components/create/CreatePasswordStep.vue
+++ b/src/views/Auth/components/create/CreatePasswordStep.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import { ref, computed } from 'vue'
-import { ButtonCommon, FormCommon } from '@/components'
 import { useNeptuneStore } from '@/stores'
 
 const emit = defineEmits<{
diff --git a/src/views/Auth/components/create/CreateWalletComponent.vue b/src/views/Auth/components/create/CreateWalletComponent.vue
index 7236798..e111cbf 100644
--- a/src/views/Auth/components/create/CreateWalletComponent.vue
+++ b/src/views/Auth/components/create/CreateWalletComponent.vue
@@ -4,7 +4,6 @@ import { SeedPhraseDisplayComponent, ConfirmSeedComponent } from '..'
 import { CreatePasswordStep, WalletCreatedStep } from '.'
 import { useNeptuneWallet } from '@/composables/useNeptuneWallet'
 import { message } from 'ant-design-vue'
-import { CardBaseScrollable } from '@/components'
 import { useRouter } from 'vue-router'
 
 const emit = defineEmits<{
diff --git a/src/views/Auth/components/create/WalletCreatedStep.vue b/src/views/Auth/components/create/WalletCreatedStep.vue
index f4e8921..ee9f8ff 100644
--- a/src/views/Auth/components/create/WalletCreatedStep.vue
+++ b/src/views/Auth/components/create/WalletCreatedStep.vue
@@ -1,5 +1,4 @@
 <script setup lang="ts">
-import { ButtonCommon } from '@/components'
 import { useNeptuneStore } from '@/stores/neptuneStore'
 import { useNeptuneWallet } from '@/composables/useNeptuneWallet'
 import { message } from 'ant-design-vue'
diff --git a/src/views/Auth/components/recover/RecoverWalletComponent.vue b/src/views/Auth/components/recover/RecoverWalletComponent.vue
index f2dcfd4..db33df5 100644
--- a/src/views/Auth/components/recover/RecoverWalletComponent.vue
+++ b/src/views/Auth/components/recover/RecoverWalletComponent.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import { ref } from 'vue'
-import { ButtonCommon, PasswordForm } from '@/components'
 import { RecoverSeedComponent } from '..'
 import { useNeptuneWallet } from '@/composables/useNeptuneWallet'
 import { message } from 'ant-design-vue'
diff --git a/src/views/Home/HomeView.vue b/src/views/Home/HomeView.vue
index 57691ab..af905ee 100644
--- a/src/views/Home/HomeView.vue
+++ b/src/views/Home/HomeView.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import { onMounted, ref } from 'vue'
-import { TabsCommon, TabPaneCommon } from '@/components'
 import { WalletTab, NetworkTab, UTXOTab } from './components'
 import { useNeptuneWallet } from '@/composables/useNeptuneWallet'
 
diff --git a/src/views/Home/components/NetworkTab.vue b/src/views/Home/components/NetworkTab.vue
index 2c6e437..0834068 100644
--- a/src/views/Home/components/NetworkTab.vue
+++ b/src/views/Home/components/NetworkTab.vue
@@ -1,7 +1,6 @@
 <script setup lang="ts">
 import { ref, computed, onMounted, onUnmounted } from 'vue'
 import { formatNumberToLocaleString } from '@/utils'
-import { CardBase, SpinnerCommon } from '@/components'
 import { useNeptuneStore } from '@/stores/neptuneStore'
 import { useNeptuneWallet } from '@/composables/useNeptuneWallet'
 import { message } from 'ant-design-vue'
diff --git a/src/views/Home/components/UTXOTab.vue b/src/views/Home/components/UTXOTab.vue
index 5acfec7..67a1e86 100644
--- a/src/views/Home/components/UTXOTab.vue
+++ b/src/views/Home/components/UTXOTab.vue
@@ -1,17 +1,19 @@
 <script setup lang="ts">
-import { ref, computed, onMounted } from 'vue'
+import { ref, computed, onMounted, inject, watch, type ComputedRef } from 'vue'
 import { Table, message } from 'ant-design-vue'
 import { useNeptuneWallet } from '@/composables/useNeptuneWallet'
 import { useNeptuneStore } from '@/stores/neptuneStore'
-import { CardBaseScrollable, SpinnerCommon } from '@/components'
 import { columns } from '../utils'
 
 const { getUtxos } = useNeptuneWallet()
 const neptuneStore = useNeptuneStore()
+const activeTabKey = inject<ComputedRef<string>>('activeTabKey')
 
 const loading = ref(false)
 
-const utxosList = computed(() => (neptuneStore.getUtxos?.length ? neptuneStore.getUtxos : []))
+const utxosList = computed(() => [
+    ...(neptuneStore.getUtxos || []),
+])
 
 const inUseUtxosCount = computed(() => (utxosList.value?.length ? utxosList.value.length : 0))
 const inUseUtxosAmount = computed(() => {
@@ -47,6 +49,13 @@ const loadUtxos = async () => {
 onMounted(() => {
     loadUtxos()
 })
+
+watch(
+    () => activeTabKey?.value,
+    (newTab) => {
+        if (newTab === 'UTXOs') loadUtxos()
+    }
+)
 </script>
 
 <template>
diff --git a/src/views/Home/components/wallet-tab/SendTransactionComponent.vue b/src/views/Home/components/wallet-tab/SendTransactionComponent.vue
index 533fed9..d874995 100644
--- a/src/views/Home/components/wallet-tab/SendTransactionComponent.vue
+++ b/src/views/Home/components/wallet-tab/SendTransactionComponent.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import { ref, computed } from 'vue'
-import { ButtonCommon, ModalCommon } from '@/components'
 
 interface Props {
     isLoading?: boolean
diff --git a/src/views/Home/components/wallet-tab/WalletBalance.vue b/src/views/Home/components/wallet-tab/WalletBalance.vue
index 76e2988..0382c8d 100644
--- a/src/views/Home/components/wallet-tab/WalletBalance.vue
+++ b/src/views/Home/components/wallet-tab/WalletBalance.vue
@@ -27,7 +27,9 @@ const props = defineProps<Props>()
 
 <style lang="scss" scoped>
 .balance-section {
-    text-align: center;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
     margin-bottom: var(--spacing-xl);
     padding-bottom: var(--spacing-lg);
     border-bottom: 2px solid var(--border-color);
diff --git a/src/views/Home/components/wallet-tab/WalletInfo.vue b/src/views/Home/components/wallet-tab/WalletInfo.vue
index 208ad17..12c1d77 100644
--- a/src/views/Home/components/wallet-tab/WalletInfo.vue
+++ b/src/views/Home/components/wallet-tab/WalletInfo.vue
@@ -1,15 +1,8 @@
 <script setup lang="ts">
-import { ref, computed, onMounted, onUnmounted } from 'vue'
+import { ref, computed, onMounted, onUnmounted, inject, watch, type ComputedRef } from 'vue'
 import { useNeptuneStore } from '@/stores/neptuneStore'
 import { useNeptuneWallet } from '@/composables/useNeptuneWallet'
 import { message } from 'ant-design-vue'
-import {
-    ButtonCommon,
-    CardBaseScrollable,
-    ModalCommon,
-    SpinnerCommon,
-    PasswordForm,
-} from '@/components'
 import SeedPhraseDisplayComponent from '@/views/Auth/components/SeedPhraseDisplayComponent.vue'
 import SendTransactionComponent from './SendTransactionComponent.vue'
 import { WalletAddress, WalletBalance } from '.'
@@ -19,10 +12,11 @@ const neptuneStore = useNeptuneStore()
 const {
     getBalance,
     saveKeystoreAs,
-    buildTransactionWithPrimitiveProof,
+    buildTransaction,
     broadcastSignedTransaction,
     decryptKeystore,
 } = useNeptuneWallet()
+const activeTabKey = inject<ComputedRef<string>>('activeTabKey')
 
 const availableBalance = ref<string>('0.00000000')
 const pendingBalance = ref<string>('0.00000000')
@@ -78,7 +72,7 @@ const handleSendTransaction = async (data: {
             fee: data.fee,
         }
 
-        const result = await buildTransactionWithPrimitiveProof(payload)
+        const result = await buildTransaction(payload)
         if (!result.success) {
             message.error('Failed to build transaction')
             return
@@ -172,6 +166,13 @@ onMounted(() => {
 onUnmounted(() => {
     window.removeEventListener('resize', handleResize)
 })
+
+watch(
+    () => activeTabKey?.value,
+    (newTab) => {
+        if (newTab === 'WALLET') loadWalletData()
+    }
+)
 </script>
 
 <template>