From 69e44665276af1daef03272f8493988811274df5 Mon Sep 17 00:00:00 2001
From: AricRedemption <aricredemption@gmail.com>
Date: Tue, 3 Sep 2024 17:53:00 +0800
Subject: [PATCH] feat: encrypet mnemonic

---
 src/components/ResetModal.vue                 | 31 ++-----
 src/lib/account.ts                            | 14 ++-
 src/lib/crypto.ts                             |  4 +
 src/lib/lock.ts                               | 14 +--
 src/lib/migrate.ts                            | 89 +++++++++++++-----
 src/lib/storage/key.ts                        |  1 +
 src/lib/wallet.ts                             | 91 ++++++++++---------
 src/pages/manage/Edit.vue                     | 43 +++------
 src/pages/manage/Index.vue                    |  7 +-
 src/pages/migrateV2/Index.vue                 | 11 ++-
 src/pages/wallet/AccountHeader.vue            | 48 ++++------
 src/pages/wallet/Backup.vue                   | 47 +++++-----
 src/pages/wallet/SetPassword.vue              | 30 +++---
 src/pages/welcome/components/Activate.vue     | 69 ++++++--------
 src/pages/welcome/components/ImportPhrase.vue |  4 +-
 src/router.ts                                 | 13 +--
 src/stores/WalletStore.ts                     |  5 +-
 17 files changed, 268 insertions(+), 253 deletions(-)

diff --git a/src/components/ResetModal.vue b/src/components/ResetModal.vue
index f7795cd7..0b390947 100644
--- a/src/components/ResetModal.vue
+++ b/src/components/ResetModal.vue
@@ -4,7 +4,7 @@ import useStorage from '@/lib/storage'
 import { PASSWORD_KEY } from '@/lib/password'
 import { Checkbox } from '@/components/ui/checkbox'
 import { XMarkIcon } from '@heroicons/vue/20/solid'
-import { V3_WALLETS_STORAGE_KEY } from '@/lib/storage/key'
+import { V3_ENCRYPTED_WALLETS_STORAGE_KEY } from '@/lib/storage/key'
 
 defineProps<{
   show: boolean
@@ -24,7 +24,7 @@ const checkedAll = computed(() => checked1.value && checked2.value && checked3.v
 const disconnect = async () => {
   emit('update:show', false)
   await storage.delete(PASSWORD_KEY)
-  await storage.delete(V3_WALLETS_STORAGE_KEY)
+  await storage.delete(V3_ENCRYPTED_WALLETS_STORAGE_KEY)
   window.location.reload()
 }
 
@@ -44,10 +44,8 @@ const close = () => {
   <Teleport to="main" v-if="show">
     <div class="absolute inset-0 isolate z-50 flex items-end bg-black/20 backdrop-blur-sm flex-col overflow-hidden">
       <div class="grow w-full" @click="close"></div>
-      <div
-        :data-state="modalState"
-        class="data-[state=open]:animate-drawer-modal-up data-[state=closed]:animate-drawer-modal-down"
-      >
+      <div :data-state="modalState"
+        class="data-[state=open]:animate-drawer-modal-up data-[state=closed]:animate-drawer-modal-down">
         <div class="rounded-t-xl bg-white p-4 pb-8">
           <div class="flex items-center justify-between border-b border-gray-100 pb-4">
             <span class="text-base">Reset Wallet</span>
@@ -83,27 +81,18 @@ const close = () => {
                 To confirm wallet reset, please enter:
                 <span class="text-red-500">RESET</span>
               </p>
-              <input
-                type="text"
-                class="w-full rounded-lg focus:outline-blue-primary border p-4 text-sm"
-                v-model="resetText"
-                placeholder="RESET"
-              />
+              <input type="text" class="w-full rounded-lg focus:outline-blue-primary border p-4 text-sm"
+                v-model="resetText" placeholder="RESET" />
             </div>
 
             <div class="flex items-center justify-center gap-2">
-              <button
-                class="w-30 h-12 bg-blue-light text-blue-primary rounded-3xl text-ss"
-                @click="$emit('update:show', false)"
-              >
+              <button class="w-30 h-12 bg-blue-light text-blue-primary rounded-3xl text-ss"
+                @click="$emit('update:show', false)">
                 Cancel
               </button>
-              <button
-                @click="disconnect"
-                :disabled="!checkedAll"
+              <button @click="disconnect" :disabled="!checkedAll"
                 class="w-30 h-12 bg-red-600 text-white rounded-3xl text-ss"
-                :class="[checkedAll ? 'cursor-pointer' : 'cursor-not-allowed opacity-50 saturate-50']"
-              >
+                :class="[checkedAll ? 'cursor-pointer' : 'cursor-not-allowed opacity-50 saturate-50']">
                 Reset
               </button>
             </div>
diff --git a/src/lib/account.ts b/src/lib/account.ts
index 205b3ab4..64f26368 100644
--- a/src/lib/account.ts
+++ b/src/lib/account.ts
@@ -5,7 +5,7 @@ import { fetchUtxos } from '@/queries/utxos'
 import { notifyContent } from '@/lib/notify-content'
 import { generateRandomString } from '@/lib/helpers'
 import { getBtcNetwork, getNetwork } from '@/lib/network'
-import { getActiveWalletOnlyAccount, getCurrentWallet } from './wallet'
+import { getActiveWalletOnlyAccount, getCurrentWallet, getV3EncryptedWallets } from './wallet'
 import type { V1Account, V2Account, Chain, ChainDetail } from './types'
 import { ScriptType, Chain as UtxoChain } from '@metalet/utxo-wallet-service'
 import { fetchSpaceBalance, fetchBtcBalance, doNothing } from '@/queries/balance'
@@ -128,7 +128,17 @@ export async function getAccount(accountId: string): Promise<V2Account | undefin
 }
 
 export async function getCurrentAccountId() {
-  return await storage.get(CURRENT_ACCOUNT_ID)
+  const currentAccountId = await storage.get(CURRENT_ACCOUNT_ID)
+  if (!currentAccountId) {
+    const wallets = await getV3EncryptedWallets()
+    if (wallets.length && wallets[0].accounts.length) {
+      await setCurrentAccountId(wallets[0].accounts[0].id)
+      return wallets[0].accounts[0].id
+    } else {
+      throw new Error('current account id not found')
+    }
+  }
+  return currentAccountId
 }
 
 export async function setCurrentAccountId(accountId: string) {
diff --git a/src/lib/crypto.ts b/src/lib/crypto.ts
index bcab0f0f..a7fdef3b 100644
--- a/src/lib/crypto.ts
+++ b/src/lib/crypto.ts
@@ -543,3 +543,7 @@ export function decrypt(encryptedText: string, password: string) {
   const decryptedStr = decrypt.toString(CryptoJS.enc.Utf8)
   return decryptedStr.toString()
 }
+
+export function hashWithSha256(data: string) {
+  return CryptoJS.SHA256(data).toString()
+}
diff --git a/src/lib/lock.ts b/src/lib/lock.ts
index 7328fc17..68abb1c1 100644
--- a/src/lib/lock.ts
+++ b/src/lib/lock.ts
@@ -1,11 +1,9 @@
 import useStorage from './storage'
 import { IS_DEV } from '@/data/config'
 import { notifyBg } from './notify-bg'
-import usePasswordStore from '@/stores/PasswordStore'
-import { checkPassword, hasPassword } from './password'
+import { checkPassword, hasPassword, getEncryptedPassword } from './password'
 
 const storage = useStorage()
-const { password, setPassword } = usePasswordStore()
 
 const LOCK_KEY = 'locked'
 const LAST_LOCK_TIME_KEY = 'LAST_LOCK_TIME'
@@ -27,9 +25,7 @@ export async function unlock(password: string) {
   if (!isCorrect) {
     throw new Error('Password incorrect')
   }
-  if (IS_DEV) {
-    setPassword(password)
-  } else {
+  if (!IS_DEV) {
     await notifyBg('setPassword')(password)
   }
   await storage.set(LOCK_KEY, false)
@@ -50,10 +46,10 @@ export async function setLastLockTime() {
   return await storage.set(LAST_LOCK_TIME_KEY, Date.now())
 }
 
-export async function getPassword() {
+export async function getPassword():Promise<string> {
   if (IS_DEV) {
-    return password.value
+    return (await getEncryptedPassword()) || ''
   } else {
-    return await notifyBg('getPassword')()
+    return (await notifyBg('getPassword')()) || ''
   }
 }
diff --git a/src/lib/migrate.ts b/src/lib/migrate.ts
index a3345945..a326b72e 100644
--- a/src/lib/migrate.ts
+++ b/src/lib/migrate.ts
@@ -38,6 +38,7 @@ import {
   getLegacyAccounts,
   getCurrentAccountId,
 } from './account'
+import { getPassword } from './lock'
 
 const storage = useStorage()
 
@@ -125,7 +126,11 @@ async function needEncryptV3(): Promise<boolean> {
   }
   const v3Wallets = await getV3Wallets()
   const v3EncryptedWallets = await getV3EncryptedWallets()
-  const needed = v3Wallets.some((mne) => !v3EncryptedWallets.includes(mne))
+  const v3EncryptedMnemonics = v3EncryptedWallets.map((encryptedWallet) => encryptedWallet.mnemonic)
+  const password = await getPassword()
+  const needed = v3Wallets.some((wallet) => !v3EncryptedMnemonics.includes(encrypt(wallet.mnemonic, password)))
+
+  console.log('needEncryptV3', needed)
 
   if (!needed) {
     await storage.set(ACCOUNT_V3_Encrypted_KEY, true)
@@ -339,7 +344,9 @@ export async function migrateToV2() {
 }
 
 export async function needMigrate() {
-  return (await needMigrateV1ToV2()) || (await needMigrateV0ToV2()) || (await needMigrateV2ToV3())
+  return (
+    (await needMigrateV1ToV2()) || (await needMigrateV0ToV2()) || (await needMigrateV2ToV3()) || (await needEncryptV3())
+  )
 }
 
 async function migrateV2ToV3(): Promise<MigrateResult> {
@@ -467,44 +474,82 @@ async function migrateV2ToV3(): Promise<MigrateResult> {
 }
 
 export async function migrateToV3() {
-  const title = 'Migrate V2 account'
-  const { code, message: description } = await migrateV2ToV3()
-  if (code === MigrateResultCode.FAILED) {
-    toast({ title, toastType: 'fail', description })
-  } else if (code === MigrateResultCode.SUCCESS) {
-    toast({ title, toastType: 'success', description })
-  } else if (code === MigrateResultCode.UNDO) {
-    toast({ title, toastType: 'info', description })
+  if (await needMigrateV2ToV3()) {
+    const title = 'Migrate V2 account'
+    const { code, message: description } = await migrateV2ToV3()
+    if (code === MigrateResultCode.FAILED) {
+      toast({ title, toastType: 'fail', description })
+    } else if (code === MigrateResultCode.SUCCESS) {
+      toast({ title, toastType: 'success', description })
+    } else if (code === MigrateResultCode.UNDO) {
+      toast({ title, toastType: 'info', description })
+    }
   }
 }
 
-async function encryptV3Accounts(password: string) {
+async function encryptV3Accounts(): Promise<MigrateResult> {
   const v3Wallets = await getV3Wallets()
   const v3EncryptedWallets = await getV3EncryptedWallets()
 
   const encryptedMnemonics = new Set(v3EncryptedWallets.map((wallet) => wallet.mnemonic))
 
+  let totalEncryptions = v3Wallets.length
+  let successfulEncryptions = 0
+  let alreadyEncryptedCount = 0
+  let failedEncryptions = 0
+
+  const password = await getPassword()
+
   v3Wallets.forEach((wallet) => {
-    if (!encryptedMnemonics.has(wallet.mnemonic)) {
-      v3EncryptedWallets.push({ ...wallet, mnemonic: encrypt(wallet.mnemonic, password) })
+    try {
+      if (!encryptedMnemonics.has(encrypt(wallet.mnemonic, password))) {
+        v3EncryptedWallets.push({ ...wallet, mnemonic: encrypt(wallet.mnemonic, password) })
+        successfulEncryptions++
+      } else {
+        alreadyEncryptedCount++
+      }
+    } catch (e: any) {
+      addMigrateErrorAccount(wallet.mnemonic, JSON.stringify(wallet), 'V3', e)
+      failedEncryptions++
     }
   })
+
   setV3EncryptedWalletsStorage(
     v3EncryptedWallets.reduce<Record<string, V3Wallet>>((acc, wallet) => {
       acc[wallet.id] = wallet
       return acc
     }, {})
   )
-}
 
-export async function encryptV2Accounts(password: string): Promise<void> {
-  const v2Accounts = await getV2AccountsObj()
-  console.log('v2Accounts', v2Accounts)
+  let code = MigrateResultCode.UNDO
+  if (failedEncryptions === totalEncryptions) {
+    code = MigrateResultCode.FAILED
+  } else if (successfulEncryptions > 0 && failedEncryptions === 0) {
+    code = MigrateResultCode.SUCCESS
+  }
 
-  const encryptedText = encrypt(JSON.stringify(v2Accounts), password)
-  console.log('encryptedText', encryptedText)
+  return {
+    code,
+    message: `
+    Encryption Summary:\n
+    - Total Wallets Processed: ${totalEncryptions}\n
+    - Successful Encryptions: ${successfulEncryptions}\n
+    - Already Encrypted Wallets: ${alreadyEncryptedCount}\n
+    - Failed Encryptions: ${failedEncryptions}
+    `,
+  }
+}
 
-  const decryptedText = decrypt(encryptedText, password)
-  console.log('decryptedText', decryptedText)
-  console.log('JSON decryptedText', JSON.parse(decryptedText))
+export async function migrateToV3Encrypted() {
+  if (await needEncryptV3()) {
+    const title = 'Encrypt V3 wallet'
+    const { code, message: description } = await encryptV3Accounts()
+    if (code === MigrateResultCode.FAILED) {
+      toast({ title, toastType: 'fail', description })
+    } else if (code === MigrateResultCode.SUCCESS) {
+      toast({ title, toastType: 'success', description })
+    } else if (code === MigrateResultCode.UNDO) {
+      toast({ title, toastType: 'info', description })
+    }
+  }
 }
diff --git a/src/lib/storage/key.ts b/src/lib/storage/key.ts
index 2f422d64..038e1e03 100644
--- a/src/lib/storage/key.ts
+++ b/src/lib/storage/key.ts
@@ -22,3 +22,4 @@ export const WALLET_NUM = 'wallet_num'
 export const CURRENT_WALLET_ID = 'currentWalletId'
 export const V3_WALLETS_STORAGE_KEY = 'wallets_v3'
 export const V3_ENCRYPTED_WALLETS_STORAGE_KEY = 'encrypted_wallets_v3'
+export const V3_ENCRYPTED_WALLETS_STORAGE_BACKUP_KEY = 'encrypted_wallets_v3_backup'
diff --git a/src/lib/wallet.ts b/src/lib/wallet.ts
index 704405ae..bafdcdbe 100644
--- a/src/lib/wallet.ts
+++ b/src/lib/wallet.ts
@@ -4,42 +4,55 @@ import { type V3Wallet } from './types'
 import { getCurrentAccountId } from './account'
 import { getV3AddressTypeStorage } from './addressType'
 import { Chain, MvcWallet, BtcWallet, AddressType, CoinType } from '@metalet/utxo-wallet-service'
-
 import {
   WALLET_NUM,
   CURRENT_WALLET_ID,
   V3_WALLETS_STORAGE_KEY,
   V3_ENCRYPTED_WALLETS_STORAGE_KEY,
+  V3_ENCRYPTED_WALLETS_STORAGE_BACKUP_KEY,
 } from '@/lib/storage/key'
 
 const storage = useStorage()
 
-export async function hasV3Wallets(): Promise<boolean> {
-  return !!(await storage.get<Record<string, V3Wallet>>(V3_WALLETS_STORAGE_KEY))
-}
-
 export async function getV3WalletsStorage() {
   return await storage.get<Record<string, V3Wallet>>(V3_WALLETS_STORAGE_KEY, {
     defaultValue: {},
   })
 }
 
+export async function getV3Wallets() {
+  return Object.values(await getV3WalletsStorage())
+}
+
+export async function setV3WalletsStorage(wallets: Record<string, V3Wallet>) {
+  await storage.set(V3_WALLETS_STORAGE_KEY, JSON.stringify(wallets))
+}
+
+export async function hasV3EncryptedWallets(): Promise<boolean> {
+  return !!(await storage.get<Record<string, V3Wallet>>(V3_ENCRYPTED_WALLETS_STORAGE_KEY))
+}
+
 export async function getV3EncryptedWalletsStorage() {
-  return await storage.get<Record<string, V3Wallet>>(V3_WALLETS_STORAGE_KEY, {
+  return await storage.get<Record<string, V3Wallet>>(V3_ENCRYPTED_WALLETS_STORAGE_KEY, {
     defaultValue: {},
   })
 }
 
-export async function getV3EncryptedWallets() {
-  return Object.values(await getV3EncryptedWalletsStorage())
+export async function setV3EncryptedWalletsStorage(wallets: Record<string, V3Wallet>) {
+  await storage.set(V3_ENCRYPTED_WALLETS_STORAGE_KEY, JSON.stringify(wallets))
 }
 
-export async function getV3Wallets() {
-  return Object.values(await getV3WalletsStorage())
+export async function backupV3EncryptedWalletsStorage() {
+  const wallets = await getV3EncryptedWalletsStorage()
+  await storage.set(V3_ENCRYPTED_WALLETS_STORAGE_BACKUP_KEY, JSON.stringify(wallets))
+}
+
+export async function getV3EncryptedWallets() {
+  return Object.values(await getV3EncryptedWalletsStorage())
 }
 
 export async function getV3WalletsNum() {
-  const wallets = await getV3Wallets()
+  const wallets = await getV3EncryptedWallets()
   return await storage.get<number>(WALLET_NUM, {
     defaultValue: wallets.length,
   })
@@ -50,25 +63,27 @@ export async function setV3WalletsNum(num: number) {
 }
 
 export async function addV3Wallet(wallet: V3Wallet) {
-  const v3Wallet = await getV3Wallets()
+  const v3Wallet = await getV3EncryptedWallets()
   if (v3Wallet.find((w) => w.mnemonic === wallet.mnemonic)) {
     throw new Error('Wallet already exists')
   }
-  const wallets = await getV3WalletsStorage()
+  const wallets = await getV3EncryptedWalletsStorage()
   wallets[wallet.id] = wallet
-  await setV3WalletsStorage(wallets)
-}
-
-export async function setV3WalletsStorage(wallets: Record<string, V3Wallet>) {
-  await storage.set(V3_WALLETS_STORAGE_KEY, JSON.stringify(wallets))
-}
-
-export async function setV3EncryptedWalletsStorage(wallets: Record<string, V3Wallet>) {
-  await storage.set(V3_ENCRYPTED_WALLETS_STORAGE_KEY, JSON.stringify(wallets))
+  await setV3EncryptedWalletsStorage(wallets)
 }
 
 export async function getCurrentWalletId() {
-  return await storage.get(CURRENT_WALLET_ID)
+  const currentWalletId = await storage.get(CURRENT_WALLET_ID)
+  if (!currentWalletId) {
+    const wallets = await getV3EncryptedWallets()
+    if (wallets.length) {
+      await setCurrentWalletId(wallets[0].id)
+      return wallets[0].id
+    } else {
+      throw new Error('current wallet id not found')
+    }
+  }
+  return currentWalletId
 }
 
 export async function setCurrentWalletId(walletId: string) {
@@ -80,7 +95,7 @@ export async function getV3CurrentWallet() {
   if (!walletId) {
     throw new Error('current wallet id not found')
   }
-  const wallets = await getV3Wallets()
+  const wallets = await getV3EncryptedWallets()
   if (!wallets.length) {
     throw new Error('wallets not found')
   }
@@ -95,7 +110,7 @@ export async function getWalletOnlyAccount(walletId: string, accountId: string)
   if (!walletId) {
     throw new Error('wallet id not found')
   }
-  const wallets = await getV3Wallets()
+  const wallets = await getV3EncryptedWallets()
   if (!wallets.length) {
     throw new Error('wallets not found')
   }
@@ -122,13 +137,7 @@ export async function getWalletOnlyAccount(walletId: string, accountId: string)
 
 export async function getActiveWalletOnlyAccount() {
   const currentWalletId = await getCurrentWalletId()
-  if (!currentWalletId) {
-    throw new Error('current wallet id not found')
-  }
   const currentAccountId = await getCurrentAccountId()
-  if (!currentAccountId) {
-    throw new Error('current account id not found')
-  }
   return getWalletOnlyAccount(currentWalletId, currentAccountId)
 }
 
@@ -137,7 +146,7 @@ export async function getInactiveWallets() {
   if (!currentWalletId) {
     throw new Error('Current wallet id not found.')
   }
-  const wallets = await getV3Wallets()
+  const wallets = await getV3EncryptedWallets()
   if (!wallets.length) {
     throw new Error('No wallets found. Please create a wallet first.')
   }
@@ -148,7 +157,7 @@ export async function getWalletOtherAccounts(walletId: string, accountId: string
   if (!walletId) {
     throw new Error('wallet id not found')
   }
-  const wallets = await getV3Wallets()
+  const wallets = await getV3EncryptedWallets()
   if (!wallets.length) {
     throw new Error('wallets not found')
   }
@@ -183,7 +192,7 @@ export async function getActiveWalletOtherAccounts() {
 
 export async function getV3CurrentAccount() {
   const walletId = await getCurrentWalletId()
-  const wallets = await getV3Wallets()
+  const wallets = await getV3EncryptedWallets()
   if (!walletId || !wallets.length) {
     throw new Error('current wallet id not found')
   }
@@ -208,7 +217,7 @@ export async function getV3CurrentAccount() {
 }
 
 export async function updateWalletName(walletId: string, name: string) {
-  const walletsMap = await getV3WalletsStorage()
+  const walletsMap = await getV3EncryptedWalletsStorage()
   if (!walletsMap) {
     throw new Error('V3 wallets storage not found.')
   }
@@ -217,11 +226,11 @@ export async function updateWalletName(walletId: string, name: string) {
     throw new Error(`Wallet not found with id ${walletId}.`)
   }
   wallet.name = name
-  await setV3WalletsStorage(walletsMap)
+  await setV3EncryptedWalletsStorage(walletsMap)
 }
 
 export async function updateAccountName(walletId: string, accountId: string, name: string) {
-  const walletsMap = await getV3WalletsStorage()
+  const walletsMap = await getV3EncryptedWalletsStorage()
   if (!walletsMap) {
     throw new Error('V3 wallets storage not found.')
   }
@@ -238,11 +247,11 @@ export async function updateAccountName(walletId: string, accountId: string, nam
     throw new Error(`Account not found with id ${accountId}.`)
   }
   account.name = name
-  await setV3WalletsStorage(walletsMap)
+  await setV3EncryptedWalletsStorage(walletsMap)
 }
 
 export async function hasWallets() {
-  const wallets = await getV3Wallets()
+  const wallets = await getV3EncryptedWallets()
   return !!wallets.length
 }
 
@@ -269,10 +278,10 @@ export async function getCurrentWallet<T extends Chain>(chain: T, _addressIndex?
 }
 
 export async function deleteV3Wallet(walletId: string) {
-  const walletsMap = await getV3WalletsStorage()
+  const walletsMap = await getV3EncryptedWalletsStorage()
   if (!walletsMap) {
     throw new Error('V3 wallets storage not found.')
   }
   delete walletsMap[walletId]
-  await setV3WalletsStorage(walletsMap)
+  await setV3EncryptedWalletsStorage(walletsMap)
 }
diff --git a/src/pages/manage/Edit.vue b/src/pages/manage/Edit.vue
index 3dfc8dfb..a8d2a3ad 100644
--- a/src/pages/manage/Edit.vue
+++ b/src/pages/manage/Edit.vue
@@ -12,7 +12,7 @@ import PencilIcon from '@/assets/icons-v3/pencil.svg'
 import { EllipsisHorizontalIcon } from '@heroicons/vue/24/solid'
 import { useChainWalletsStore } from '@/stores/ChainWalletsStore'
 import { getCurrentAccountId, setCurrentAccountId } from '@/lib/account'
-import { deleteV3Wallet, getCurrentWalletId, setCurrentWalletId, getV3WalletsStorage, getV3Wallets } from '@/lib/wallet'
+import { deleteV3Wallet, getCurrentWalletId, setCurrentWalletId, getV3WalletsStorage, getV3EncryptedWallets } from '@/lib/wallet'
 
 const { updateAllWallets } = useChainWalletsStore()
 
@@ -72,7 +72,7 @@ const updataAccountName = (walletId: string, accountId: string, accountName: str
 
 const deleteWallet = async (walletId: string) => {
   await deleteV3Wallet(walletId)
-  const wallets = await getV3Wallets()
+  const wallets = await getV3EncryptedWallets()
   if (wallets.length) {
     await setCurrentWalletId(wallets[0].id)
     await setCurrentAccountId(wallets[0].accounts[0].id)
@@ -88,13 +88,8 @@ const deleteWallet = async (walletId: string) => {
 <template>
   <div class="flex flex-col w-full -mt-3 relative h-full">
     <DeleteWallet v-model:open="deleteWalletOpen" :name="editName" :confirm="() => deleteWallet(editWalletId)" />
-    <EditName
-      :name="editName"
-      :type="editNameType"
-      :walletId="editWalletId"
-      :accountId="editAccountId"
-      v-model:open="editNameOpen"
-    />
+    <EditName :name="editName" :type="editNameType" :walletId="editWalletId" :accountId="editAccountId"
+      v-model:open="editNameOpen" />
     <div class="flex items-center justify-end w-full h-15 shrink-0">
       <div @click="$router.go(-1)" class="text-sm cursor-pointer text-blue-primary">Done</div>
     </div>
@@ -102,34 +97,24 @@ const deleteWallet = async (walletId: string) => {
       <div class="flex flex-col w-full">
         <div class="w-full" v-for="wallet in Object.values(walletObj)">
           <div class="flex items-center gap-2 w-full h-15" :key="wallet.id" :value="wallet.id">
-            <RemoveIcon
-              class="cursor-pointer"
-              @click="
-                () => {
-                  deleteWalletOpen = true
-                  editName = wallet.name
-                  editWalletId = wallet.id
-                }
-              "
-            />
+            <RemoveIcon class="cursor-pointer" @click="() => {
+                deleteWalletOpen = true
+                editName = wallet.name
+                editWalletId = wallet.id
+              }
+              " />
             <span>{{ wallet.name }}</span>
             <PencilIcon class="w-3.5 hover:text-blue-primary" @click.stop="updataWalletName(wallet.id, wallet.name)" />
             <EllipsisHorizontalIcon class="w-8 font-bold ml-auto cursor-pointer" v-if="false" />
           </div>
           <div>
-            <div
-              :key="account.id"
-              class="h-15 cursor-pointer flex items-center justify-between"
-              v-for="account in wallet.accounts"
-              @click="relaodAccout(wallet.id, account.id)"
-            >
+            <div :key="account.id" class="h-15 cursor-pointer flex items-center justify-between"
+              v-for="account in wallet.accounts" @click="relaodAccout(wallet.id, account.id)">
               <div class="flex items-center gap-3">
                 <Avatar :id="account.id" />
                 <span>{{ account.name }}</span>
-                <PencilIcon
-                  class="w-3.5 hover:text-blue-primary"
-                  @click.stop="updataAccountName(wallet.id, account.id, account.name)"
-                />
+                <PencilIcon class="w-3.5 hover:text-blue-primary"
+                  @click.stop="updataAccountName(wallet.id, account.id, account.name)" />
               </div>
               <EllipsisHorizontalIcon class="w-8 font-bold cursor-pointer" v-if="false" />
             </div>
diff --git a/src/pages/manage/Index.vue b/src/pages/manage/Index.vue
index c3e54187..d1f8480f 100644
--- a/src/pages/manage/Index.vue
+++ b/src/pages/manage/Index.vue
@@ -21,7 +21,7 @@ import SuccessIcon from '@/assets/icons-v3/success-checked.svg'
 import { useChainWalletsStore } from '@/stores/ChainWalletsStore'
 import { getCurrentAccountId, setCurrentAccountId } from '@/lib/account'
 import { Accordion, AccordionContent, AccordionItem, AccordionTrigger } from '@/components/ui/accordion'
-import { getCurrentWalletId, setV3WalletsStorage, getV3WalletsStorage, setCurrentWalletId } from '@/lib/wallet'
+import { getCurrentWalletId, setV3EncryptedWalletsStorage, setCurrentWalletId, getV3EncryptedWalletsStorage } from '@/lib/wallet'
 
 const { updateAllWallets, getAddress } = useChainWalletsStore()
 
@@ -39,7 +39,7 @@ const backupWallets = ref<string[]>([])
 const btcAddress = getAddress(Chain.BTC)
 const mvcAddress = getAddress(Chain.MVC)
 
-getV3WalletsStorage().then(async (_wallets) => {
+getV3EncryptedWalletsStorage().then(async (_wallets) => {
   walletObj.value = _wallets
 })
 
@@ -63,9 +63,8 @@ const addAccount = async (wallet: V3Wallet) => {
     addressIndex: maxAddressIndex + 1,
   })
   wallet.accounts.push(account)
-  setV3WalletsStorage(walletObj.value)
+  setV3EncryptedWalletsStorage(walletObj.value)
   toast({ title: 'New account created', toastType: 'success' })
-  // TODO: put into function
   currentWalletId.value = wallet.id
   currentAccountId.value = account.id
   await setCurrentWalletId(wallet.id)
diff --git a/src/pages/migrateV2/Index.vue b/src/pages/migrateV2/Index.vue
index 8f4a838e..1f4dd5fb 100644
--- a/src/pages/migrateV2/Index.vue
+++ b/src/pages/migrateV2/Index.vue
@@ -1,15 +1,17 @@
 <script lang="ts" setup>
-import { sleep } from '@/lib/helpers'
+import { onMounted } from 'vue'
 import { useRouter } from 'vue-router'
 import { getCurrentAccount } from '@/lib/account'
 import { WalletsStore } from '@/stores/WalletStore'
-import { migrateToV2, migrateToV3 } from '@/lib/migrate'
 import MetaletLogoImg from '@/assets/images/metalet-logo-v3.svg?url'
+import { migrateToV2, migrateToV3, migrateToV3Encrypted } from '@/lib/migrate'
 
 const router = useRouter()
-migrateToV2().then(async () => {
-  await sleep(1500)
+
+onMounted(async () => {
+  await migrateToV2()
   await migrateToV3()
+  await migrateToV3Encrypted()
   await WalletsStore.initWalletManager()
   if (await getCurrentAccount()) {
     router.push('/wallet')
@@ -17,6 +19,7 @@ migrateToV2().then(async () => {
     router.push('/manage/wallets')
   }
 })
+
 </script>
 
 <template>
diff --git a/src/pages/wallet/AccountHeader.vue b/src/pages/wallet/AccountHeader.vue
index e376f750..7b3eeac7 100644
--- a/src/pages/wallet/AccountHeader.vue
+++ b/src/pages/wallet/AccountHeader.vue
@@ -31,18 +31,17 @@ import {
   DrawerDescription,
 } from '@/components/ui/drawer'
 
-const { getAddress } = useChainWalletsStore()
-
-const { toast } = useToast()
-
 const network = ref()
-const chainWallets = ref()
 const isOpen = ref(false)
 const router = useRouter()
+const chainWallets = ref()
 const wallet = ref<V3Wallet>()
 const account = ref<V3Account>()
 const serviceNetwork = ref<Service>([])
 
+const { toast } = useToast()
+const { getAddress } = useChainWalletsStore()
+
 const btcAddress = getAddress(Chain.BTC)
 const mvcAddress = getAddress(Chain.MVC)
 
@@ -113,15 +112,10 @@ const copy = (address: string, addressType: string, type: string) => {
 
         <template v-if="btcAddress !== mvcAddress && serviceNetwork.includes(Chain.MVC)">
           <Avatar :id="mvcAddress" :class="{ '-ml-5': serviceNetwork.includes(Chain.BTC) }" v-if="!mvcMetaidInfo" />
-          <UseImage
-            v-else
-            :src="mvcMetaidInfo.avatar"
-            :class="
-              serviceNetwork.includes(Chain.BTC)
-                ? '-ml-5 z-10 h-10 w-10 rounded-full border border-gray-soft'
-                : 'z-10 h-10 w-10 rounded-full border border-gray-soft'
-            "
-          >
+          <UseImage v-else :src="mvcMetaidInfo.avatar" :class="serviceNetwork.includes(Chain.BTC)
+            ? '-ml-5 z-10 h-10 w-10 rounded-full border border-gray-soft'
+            : 'z-10 h-10 w-10 rounded-full border border-gray-soft'
+            ">
             <template #loading>
               <Avatar :id="mvcAddress" :class="{ '-ml-5': serviceNetwork.includes(Chain.BTC) }" />
             </template>
@@ -136,7 +130,8 @@ const copy = (address: string, addressType: string, type: string) => {
           <span>{{ wallet.name }}</span>
         </div>
         <div class="flex items-center gap-x-2 text-gray-black">
-          <span class="text-ss max-w-28 truncate">{{ btcMetaidInfo?.name || mvcMetaidInfo?.name || account.name }}</span>
+          <span class="text-ss max-w-28 truncate">{{ btcMetaidInfo?.name || mvcMetaidInfo?.name || account.name
+            }}</span>
           <!-- <template v-if="btcAddress !== mvcAddress && mvcMetaidInfo?.name">
             <span>/</span>
             <span class="text-ss">{{ mvcMetaidInfo?.name }}</span>
@@ -182,16 +177,13 @@ const copy = (address: string, addressType: string, type: string) => {
             </div>
             <div class="text-xs text-gray-primary w-64">{{ prettifyAddress(btcWallet.address) }}</div>
           </div>
-          <CopyIcon
-            class="cursor-pointer hover:text-blue-primary w-4.5"
-            @click="
-              copy(
-                btcWallet.address,
-                btcWallet.addressType === 'Same as MVC' ? 'Default' : btcWallet.addressType,
-                'Bitcoin'
-              )
-            "
-          />
+          <CopyIcon class="cursor-pointer hover:text-blue-primary w-4.5" @click="
+            copy(
+              btcWallet.address,
+              btcWallet.addressType === 'Same as MVC' ? 'Default' : btcWallet.addressType,
+              'Bitcoin'
+            )
+            " />
         </FlexBox>
         <FlexBox ai="center" :gap="2" v-if="chainWallets.mvc" v-for="mvcWallet in chainWallets.mvc">
           <img :src="SpaceLogo" alt="Bitcoin" class="w-8" />
@@ -202,10 +194,8 @@ const copy = (address: string, addressType: string, type: string) => {
             </div>
             <div class="text-xs text-gray-primary w-64">{{ prettifyAddress(mvcWallet.address) }}</div>
           </div>
-          <CopyIcon
-            class="cursor-pointer hover:text-blue-primary w-4.5"
-            @click="copy(mvcWallet.address, mvcWallet.addressType, 'MicrovisionChain')"
-          />
+          <CopyIcon class="cursor-pointer hover:text-blue-primary w-4.5"
+            @click="copy(mvcWallet.address, mvcWallet.addressType, 'MicrovisionChain')" />
         </FlexBox>
       </FlexBox>
     </DrawerContent>
diff --git a/src/pages/wallet/Backup.vue b/src/pages/wallet/Backup.vue
index 5facd1a0..99c66c9b 100644
--- a/src/pages/wallet/Backup.vue
+++ b/src/pages/wallet/Backup.vue
@@ -1,31 +1,38 @@
 <script lang="ts" setup>
-import { Ref, ref } from 'vue'
+import { computed, Ref, ref } from 'vue'
+import { IS_DEV } from '@/data/config'
+import { decrypt, hashWithSha256 } from '@/lib/crypto'
 import { useRouter } from 'vue-router'
 import passwordManager from '@/lib/password'
 import { toast } from '@/components/ui/toast'
 import { EyeIcon } from '@heroicons/vue/24/solid'
 import ResetModal from '@/components/ResetModal.vue'
 import { ChevronLeftIcon } from '@heroicons/vue/24/outline'
-import { useChainWalletsStore } from '@/stores/ChainWalletsStore'
 import { getCurrentWalletId, getV3CurrentWallet } from '@/lib/wallet'
 import { PasswordInput, SeedPhrase, VerifySeedPhrase } from '@/components'
 import { getBackupV3Wallet, hasBackupCurrentWallet, setBackupV3Wallet } from '@/lib/backup'
 
 const router = useRouter()
 
-const mnemonic = ref()
+const error = ref('')
+const wallet = ref()
+const password = ref('')
+const isCoveredMne = ref(true)
 const showResetModal = ref(false)
+const phase: Ref<1 | 2 | 3> = ref(1)
 const verifySeedPhrase = ref<typeof VerifySeedPhrase>()
 
 getV3CurrentWallet().then((_wallet) => {
-  mnemonic.value = _wallet.mnemonic
+  wallet.value = _wallet
 })
 
-const error = ref('')
-const password = ref('')
-const phase: Ref<1 | 2 | 3> = ref(1)
+const mnemonic = computed(() => {
+  if (wallet.value && password) {
+    return decrypt(wallet.value.mnemonic, IS_DEV ? hashWithSha256(password.value) : password.value)
+  }
+  return ''
+})
 
-const isCoveredMne = ref(true)
 
 const next = async () => {
   if (phase.value === 1) {
@@ -94,14 +101,10 @@ const back = () => {
         </div>
         <div class="relative mt-2">
           <SeedPhrase :words="mnemonic.split(' ')" :edit="false" :noCopied="true" />
-          <div
-            v-if="isCoveredMne"
-            class="absolute inset-0 z-10 flex flex-col items-center justify-center gap-6 rounded-lg bg-gray-100/30 backdrop-blur"
-          >
-            <button
-              class="w- flex w-32 items-center justify-center gap-x-2 rounded-full border border-black py-2"
-              @click="isCoveredMne = false"
-            >
+          <div v-if="isCoveredMne"
+            class="absolute inset-0 z-10 flex flex-col items-center justify-center gap-6 rounded-lg bg-gray-100/30 backdrop-blur">
+            <button class="w- flex w-32 items-center justify-center gap-x-2 rounded-full border border-black py-2"
+              @click="isCoveredMne = false">
               <EyeIcon class="h-5 w-5" />
               <span>Show</span>
             </button>
@@ -121,14 +124,10 @@ const back = () => {
 
     <!-- buttons -->
     <div class="flex flex-col items-center justify-center py-5 relative">
-      <button
-        @click="next"
-        :disabled="!password"
-        :class="[
-          'bg-blue-primary w-61.5 h-12 rounded-3xl py-4 text-ss leading-none text-white',
-          !password && 'opacity-50 saturate-50 cursor-not-allowed',
-        ]"
-      >
+      <button @click="next" :disabled="!password" :class="[
+        'bg-blue-primary w-61.5 h-12 rounded-3xl py-4 text-ss leading-none text-white',
+        !password && 'opacity-50 saturate-50 cursor-not-allowed',
+      ]">
         {{ [1, 3].includes(phase) ? 'Continue' : phase === 2 ? "OK, I've noted them down." : 'Confirm' }}
       </button>
       <button @click="showResetModal = true" class="mt-4 text-ss text-gray-primary" v-if="phase === 1">
diff --git a/src/pages/wallet/SetPassword.vue b/src/pages/wallet/SetPassword.vue
index 330bc755..bbb37458 100644
--- a/src/pages/wallet/SetPassword.vue
+++ b/src/pages/wallet/SetPassword.vue
@@ -5,6 +5,9 @@ import passwordManager from '@/lib/password'
 import { PasswordInput } from '@/components'
 import { toast } from '@/components/ui/toast'
 import { ChevronLeftIcon } from '@heroicons/vue/24/outline'
+import { backupV3EncryptedWalletsStorage, getV3EncryptedWalletsStorage, setV3EncryptedWalletsStorage } from '@/lib/wallet'
+import { decrypt, encrypt, hashWithSha256 } from '@/lib/crypto'
+import { IS_DEV } from '@/data/config'
 
 const router = useRouter()
 const phase = ref<1 | 2>(1)
@@ -46,6 +49,14 @@ const next = async () => {
     if (password.value !== confirmPassword.value) {
       error.value = "Passwords don't match. Try again."
     } else {
+      await backupV3EncryptedWalletsStorage()
+      const wallets = await getV3EncryptedWalletsStorage()
+      for (const key in wallets) {
+        if (wallets.hasOwnProperty(key)) {
+          wallets[key].mnemonic = encrypt(wallets[key].mnemonic, IS_DEV ? hashWithSha256(password.value) : password.value);
+        }
+      }
+      await setV3EncryptedWalletsStorage(wallets)
       await passwordManager.set(password.value)
       toast({ title: 'Set Password successfully.', toastType: 'success' })
       router.push('/wallet')
@@ -57,7 +68,7 @@ const next = async () => {
 <template>
   <div class="flex h-full flex-col">
     <div class="h-15 -my-3 flex items-center gap-3">
-      <ChevronLeftIcon class="w-6 h-6 cursor-pointer" @click="back" />
+      <ChevronLeftIcon class="w-6 h-6 cursor-pointer" @click="$router.back()" />
     </div>
     <div class="space-y-2 pt-4">
       <h3 class="text-2xl font-medium">Change Password</h3>
@@ -67,13 +78,8 @@ const next = async () => {
       </p>
     </div>
     <div class="grow">
-      <PasswordInput
-        v-if="phase === 1"
-        v-model:password="password"
-        title="Old Password"
-        v-model:error="error"
-        class="mt-9"
-      />
+      <PasswordInput v-if="phase === 1" v-model:password="password" title="Old Password" v-model:error="error"
+        class="mt-9" />
 
       <div v-if="phase === 2" class="mt-9 space-y-9">
         <PasswordInput v-model:password="password" title="New Password" :validate="true" />
@@ -82,12 +88,8 @@ const next = async () => {
     </div>
     <div class="flex items-center justify-center gap-2 my-6">
       <button class="w-30 h-12 bg-blue-light rounded-3xl text-blue-primary" @click="back">Back</button>
-      <button
-        class="w-30 h-12 bg-blue-primary rounded-3xl text-white"
-        :class="!canPass && 'opacity-50 cursor-not-allowed'"
-        :disabled="!canPass"
-        @click="next"
-      >
+      <button class="w-30 h-12 bg-blue-primary rounded-3xl text-white"
+        :class="!canPass && 'opacity-50 cursor-not-allowed'" :disabled="!canPass" @click="next">
         Next
       </button>
     </div>
diff --git a/src/pages/welcome/components/Activate.vue b/src/pages/welcome/components/Activate.vue
index 0cd3d3ee..32ab9f1a 100644
--- a/src/pages/welcome/components/Activate.vue
+++ b/src/pages/welcome/components/Activate.vue
@@ -2,8 +2,10 @@
 import * as z from 'zod'
 import { computed, ref } from 'vue'
 import { Button } from '@/components'
-import { useRouter } from 'vue-router'
 import { useForm } from 'vee-validate'
+import { encrypt } from '@/lib/crypto'
+import { useRouter } from 'vue-router'
+import { getPassword } from '@/lib/lock'
 import { toast } from '@/components/ui/toast'
 import { toTypedSchema } from '@vee-validate/zod'
 import FailIcon from '@/assets/icons-v3/fail.svg'
@@ -20,7 +22,8 @@ import { getCurrentAccountId, setCurrentAccountId } from '@/lib/account'
 import { genUID, formatIndex, Chain } from '@metalet/utxo-wallet-service'
 import { getServiceNetworkStorage, setServiceNetwork } from '@/lib/network'
 import { FormControl, FormField, FormItem, FormLabel, FormMessage } from '@/components/ui/form'
-import { addV3Wallet, getV3Wallets, getV3WalletsNum, setCurrentWalletId, setV3WalletsNum } from '@/lib/wallet'
+import { addV3Wallet, getV3EncryptedWallets, getV3WalletsNum, setCurrentWalletId, setV3WalletsNum } from '@/lib/wallet'
+
 
 const { updateAllWallets } = useChainWalletsStore()
 
@@ -103,7 +106,7 @@ if (!mnemonic) {
 
 const addWallet = async () => {
   try {
-    const wallets = await getV3Wallets()
+    const wallets = await getV3EncryptedWallets()
     const hasWallet = wallets.find((wallet) => wallet.mnemonic === mnemonic)
     if (hasWallet) {
       loading.value = false
@@ -113,10 +116,11 @@ const addWallet = async () => {
     const walletId = genUID()
     const accountId = genUID()
     const walletNum = await getV3WalletsNum()
+    const password = await getPassword()
     await addV3Wallet({
       id: walletId,
       name: `Wallet ${formatIndex(walletNum + 1)}`,
-      mnemonic,
+      mnemonic: encrypt(mnemonic, password),
       mvcTypes: mvcTypes.value,
       accounts: [
         {
@@ -153,10 +157,8 @@ const addWallet = async () => {
 <template>
   <div class="flex flex-col w-82">
     <!-- TODO: Add a loading screen -->
-    <div
-      v-if="loading"
-      class="absolute top-0 left-0 w-screen h-screen bg-black bg-opacity-50 flex items-center justify-center z-10"
-    >
+    <div v-if="loading"
+      class="absolute top-0 left-0 w-screen h-screen bg-black bg-opacity-50 flex items-center justify-center z-10">
       <div class="w-[108px] h-[108px] bg-white rounded-lg flex flex-col items-center justify-center gap-4">
         <LoadingIcon class="text-blue-primary" />
         <span>Loading</span>
@@ -179,45 +181,29 @@ const addWallet = async () => {
         <form @submit="onSubmit" class="mt-9 relative w-full">
           <FormField name="chains">
             <FormItem class="flex flex-col items-center gap-8 w-full relative">
-              <FormField
-                name="chains"
-                :key="chain.id"
-                type="checkbox"
-                :value="chain.id"
-                v-for="chain in chains"
-                :unchecked-value="false"
-                v-slot="{ value, handleChange }"
-              >
-                <FormItem
-                  :class="[
-                    'flex items-center justify-between cursor-pointer px-[18px] py-3 bg-[#F8F8FA] w-full rounded-lg gap-2 relative',
-                    { 'border border-blue-primary': selectedChains.includes(chain.id) },
-                  ]"
-                >
+              <FormField name="chains" :key="chain.id" type="checkbox" :value="chain.id" v-for="chain in chains"
+                :unchecked-value="false" v-slot="{ value, handleChange }">
+                <FormItem :class="[
+                  'flex items-center justify-between cursor-pointer px-[18px] py-3 bg-[#F8F8FA] w-full rounded-lg gap-2 relative',
+                  { 'border border-blue-primary': selectedChains.includes(chain.id) },
+                ]">
                   <FormLabel class="flex items-center gap-2 cursor-pointer">
                     <img :src="chain.logo" alt="Bitcoin" class="inline-block size-10" />
                     <div class="text-xs flex flex-col gap-1">
                       <span>{{ chain.name }}</span>
-                      <span
-                        v-if="chain.name === 'MicrovisionChain'"
-                        class="text-xs px-2 py-1 scale-75 origin-left rounded-full bg-[#F7931A]/20 text-[#F7931A]"
-                      >
+                      <span v-if="chain.name === 'MicrovisionChain'"
+                        class="text-xs px-2 py-1 scale-75 origin-left rounded-full bg-[#F7931A]/20 text-[#F7931A]">
                         Bitcoin sidechain
                       </span>
                     </div>
                   </FormLabel>
                   <FormControl>
-                    <Checkbox
-                      @click="selectChain(chain.id)"
-                      @update:checked="handleChange"
+                    <Checkbox @click="selectChain(chain.id)" @update:checked="handleChange"
                       :checked="value.includes(chain.id)"
-                      class="rounded-full data-[state=checked]:bg-green-success data-[state=checked]:border-none w-5 h-5 text-xs"
-                    />
+                      class="rounded-full data-[state=checked]:bg-green-success data-[state=checked]:border-none w-5 h-5 text-xs" />
                   </FormControl>
-                  <p
-                    class="absolute -bottom-8 left-0 flex items-center gap-x-1 text-sm"
-                    v-if="chain.name === 'MicrovisionChain' && value.includes(chain.id) && type === 'Import'"
-                  >
+                  <p class="absolute -bottom-8 left-0 flex items-center gap-x-1 text-sm"
+                    v-if="chain.name === 'MicrovisionChain' && value.includes(chain.id) && type === 'Import'">
                     <span class="text-gray-primary">Choose</span>
                     <span class="underline text-blue-primary" @click="$emit('openSelectMvcPath')">MVC Address</span>
                     <span v-tooltip="'Import the MVC wallet by modifying the HD Path.'">
@@ -230,13 +216,10 @@ const addWallet = async () => {
             <FormMessage class="text-red-500 text-ss text-center absolute bottom-[60px] w-full" />
           </FormField>
 
-          <button
-            type="submit"
-            :class="[
-              'w-full rounded-3xl py-4 text-center text-ss text-white bg-blue-primary mt-16',
-              { 'opacity-50 cursor-not-allowed': !selectedChains.length },
-            ]"
-          >
+          <button type="submit" :class="[
+            'w-full rounded-3xl py-4 text-center text-ss text-white bg-blue-primary mt-16',
+            { 'opacity-50 cursor-not-allowed': !selectedChains.length },
+          ]">
             Launch Metalet
           </button>
         </form>
diff --git a/src/pages/welcome/components/ImportPhrase.vue b/src/pages/welcome/components/ImportPhrase.vue
index acca9622..59b9cd87 100644
--- a/src/pages/welcome/components/ImportPhrase.vue
+++ b/src/pages/welcome/components/ImportPhrase.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { ref, computed, watch } from 'vue'
-import { getV3Wallets } from '@/lib/wallet'
+import { getV3EncryptedWallets } from '@/lib/wallet'
 import BrushIcon from '@/assets/icons-v3/brush.svg'
 import { FlexBox, Button, SeedPhrase } from '@/components'
 import ArrowLeftIcon from '@/assets/icons-v3/arrow-left.svg'
@@ -42,7 +42,7 @@ const onPasteWords = (e: ClipboardEvent, index: number) => {
 }
 
 const next = async () => {
-  const wallets = await getV3Wallets()
+  const wallets = await getV3EncryptedWallets()
   const hasWallet = wallets.find((wallet) => wallet.mnemonic === props.words.join(' '))
   if (hasWallet) {
     error.value = 'Wallet already exists.'
diff --git a/src/router.ts b/src/router.ts
index d072d78b..e94888c1 100644
--- a/src/router.ts
+++ b/src/router.ts
@@ -1,11 +1,11 @@
 import { goToTab } from '@/lib/utils'
-import { getPassword, isLocked } from './lib/lock'
 import { IS_DEV } from '@/data/config'
 import * as VueRouter from 'vue-router'
 import { assetList } from '@/lib/balance'
 import { needMigrate } from './lib/migrate'
 import { hasPassword } from './lib/password'
 import Wallet from './pages/wallet/Index.vue'
+import { getPassword, isLocked } from './lib/lock'
 import { getCurrentAccountId } from './lib/account'
 import { getCurrentWalletId, hasWallets } from './lib/wallet'
 
@@ -24,8 +24,6 @@ const routes = [
         },
       },
       {
-        // path: '/migrate',
-        // component: () => import('./pages/migrate/Index.vue'),
         path: '/migrateV2',
         component: () => import('./pages/migrateV2/Index.vue'),
         name: 'migrateV2',
@@ -617,8 +615,9 @@ const authPages = [
 ]
 
 router.beforeEach(async (to, _, next) => {
-  const password = await getPassword()
-  if (to.fullPath !== '/migrateV2' && (await needMigrate())) {
+  if (to.fullPath !== '/wallet/set-password' && !(await hasPassword())) {
+    next('/wallet/set-password')
+  } else if (to.fullPath !== '/migrateV2' && (await needMigrate())) {
     next('/migrateV2')
   } else if (!authPages.includes(to.path)) {
     if (!(await hasWallets())) {
@@ -626,9 +625,7 @@ router.beforeEach(async (to, _, next) => {
       next('/welcome')
     } else if (!(await getCurrentAccountId()) || !(await getCurrentWalletId())) {
       next('/manage/wallets')
-    } else if (!(await hasPassword())) {
-      next('/wallet/set-password')
-    } else if ((await isLocked()) || !password) {
+    } else if ((await isLocked()) || !(await getPassword())) {
       next('/lock')
     } else {
       if (['asset', 'token', 'brc20'].includes(to.name as string)) {
diff --git a/src/stores/WalletStore.ts b/src/stores/WalletStore.ts
index 3d4c9ab4..84cebcba 100644
--- a/src/stores/WalletStore.ts
+++ b/src/stores/WalletStore.ts
@@ -12,6 +12,8 @@ import {
   getActiveWalletOnlyAccount,
   getActiveWalletOtherAccounts,
 } from '@/lib/wallet'
+import { getPassword } from '@/lib/lock'
+import { decrypt } from '@/lib/crypto'
 
 let walletManager: WalletManager | null = null
 
@@ -21,11 +23,12 @@ const initWalletManager = async (): Promise<WalletManager> => {
     return walletManager
   }
   try {
+    const password = await getPassword()
     const activeWallet = await getActiveWalletOnlyAccount()
     const walletsOptions = [
       {
         id: activeWallet.id,
-        mnemonic: activeWallet.mnemonic,
+        mnemonic: decrypt(activeWallet.mnemonic, password),
         name: activeWallet.name,
         mvcTypes: activeWallet.mvcTypes,
         accountsOptions: activeWallet.accounts.map(({ id, name, addressIndex }) => ({ id, name, addressIndex })),