From e89bda844af76ea37bfa83cded8418caa5361467 Mon Sep 17 00:00:00 2001
From: Vincent Tse <river_run@126.com>
Date: Mon, 2 Oct 2023 17:25:25 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20FIX:=20Migrate=20to=20v2=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                | 2 +-
 public/manifest.json        | 2 +-
 src/data/config.ts          | 2 +-
 src/lib/account.ts          | 5 +++--
 src/pages/migrate/Index.vue | 7 ++++---
 src/router.ts               | 7 ++++---
 6 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index 6e2d414..a178693 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "metalet",
   "private": true,
-  "version": "2.0.2",
+  "version": "2.0.3",
   "type": "module",
   "scripts": {
     "dev": "vite --config vite.dev.config.ts",
diff --git a/public/manifest.json b/public/manifest.json
index 9bacfc0..76f9687 100644
--- a/public/manifest.json
+++ b/public/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "Metalet",
   "description": "An MVC Crypto Wallet Extension",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "manifest_version": 3,
   "action": {
     "default_popup": "index.html",
diff --git a/src/data/config.ts b/src/data/config.ts
index 11d5e6b..88de9df 100644
--- a/src/data/config.ts
+++ b/src/data/config.ts
@@ -2,4 +2,4 @@ export const FEEB = 1
 export const NOTIFICATION_WIDTH = 360
 export const NOTIFICATION_HEIGHT = 620
 
-export const VERSION = '2.0.2'
+export const VERSION = '2.0.3'
diff --git a/src/lib/account.ts b/src/lib/account.ts
index a7d98bb..c0e69b5 100644
--- a/src/lib/account.ts
+++ b/src/lib/account.ts
@@ -104,9 +104,10 @@ export async function getCurrentAccount(): Promise<Account | null> {
     return null
   }
 
-  currentAccount.value = await getAccount(currentAccountId)
+  const account = await getAccount(currentAccountId)
+  currentAccount.value = account
 
-  return currentAccount.value
+  return account
 }
 
 export async function removeCurrentAccount(): Promise<boolean> {
diff --git a/src/pages/migrate/Index.vue b/src/pages/migrate/Index.vue
index ca8d801..1495568 100644
--- a/src/pages/migrate/Index.vue
+++ b/src/pages/migrate/Index.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import MetaletLogoImg from '@/assets/images/metalet-logo.png?url'
-import accountManager from '@/lib/account'
+import accountManager, { getAccounts } from '@/lib/account'
 import type { Account } from '@/lib/account'
 import { mvc } from 'meta-contract'
 import { setNetwork } from '@/lib/network'
@@ -18,8 +18,9 @@ const importWallet = async () => {
     const mneStr = oldRecord.currentAccount.mnemonicStr
 
     // 比照查看有无该助记词的账号
-    const accounts: Account[] = await accountManager.all().then((res) => Object.values(res))
-    const hasAccount = accounts.some((account) => account.mnemonic === mneStr)
+    const accounts = await getAccounts()
+    const accountsArr = Array.from(accounts.values())
+    const hasAccount = accountsArr.some((account) => account.mnemonic === mneStr)
 
     if (!hasAccount) {
       // 迁移过程
diff --git a/src/router.ts b/src/router.ts
index 1a086ca..1633dc8 100644
--- a/src/router.ts
+++ b/src/router.ts
@@ -1,7 +1,7 @@
 import * as VueRouter from 'vue-router'
 import Wallet from './pages/wallet/Index.vue'
 import { getStorage } from './lib/storage'
-import accountManager, { getCurrentAccount } from './lib/account'
+import accountManager, { Account, getAccounts, getCurrentAccount } from './lib/account'
 
 const routes = [
   { path: '/', redirect: '/wallet' },
@@ -254,8 +254,9 @@ router.beforeEach(async (to, from) => {
     const mneStr = oldRecord.currentAccount.mnemonicStr
 
     // 比照查看有无该助记词的账号
-    const accounts: any[] = await accountManager.all().then((res) => Object.values(res))
-    const hasAccount = accounts.some((account) => account.mnemonic === mneStr)
+    const accounts = await getAccounts()
+    const accountsArr = Array.from(accounts.values())
+    const hasAccount = accountsArr.some((account) => account.mnemonic === mneStr)
 
     if (!hasAccount && to.path !== '/migrate') {
       return '/migrate'