feat(wallet): sort accounts by lastSelected property in getAccounts response

packages/features/src/account-management/components/account-details.tsx

@@ -29,7 +29,7 @@ export const AccountDetails = ({
     removeCredential,
     credentials,
     setCredential,
-    setCurrentWallet,
+    updateCurrentWallet,
     keyAgentName,
   } = useVault()
 
@@ -53,7 +53,7 @@ export const AccountDetails = ({
         ) {
           removeCredential(account?.credentialName)
           setCredential(serializedList[0])
-          setCurrentWallet({
+          updateCurrentWallet({
             keyAgentName,
             credentialName: serializedList[0]?.credentialName,
             currentAccountIndex:

packages/features/src/account-management/index.stories.tsx

@@ -23,6 +23,7 @@ const accounts: SingleCredentialState[] = [
       address: "B62qjzAXN9NkX8K6JfGzYz4qVQoMrkL4uJ3FgkFjVZd4W5X5cQFQkCG",
       encryptedPrivateKeyBytes: new Uint8Array([1, 2, 3, 4, 5, 6, 7, 8, 9, 10]),
     },
+    lastSelected: undefined,
   },
   {
     credentialName: "Second",
@@ -40,6 +41,7 @@ const accounts: SingleCredentialState[] = [
       address: "B62qjzAXN9NkX8K6JfGzYz4qVQoMrkL4uJ3FgkFjVZd4W5X5cQFQkCF",
       encryptedPrivateKeyBytes: new Uint8Array([1, 2, 3, 4, 5, 6, 7, 8, 9, 11]),
     },
+    lastSelected: undefined,
   },
 ]
 

packages/features/src/account-management/routes/account-management.tsx

@@ -7,7 +7,7 @@ import { AccountManagementView } from "../views/account-management"
 export const AccountManagementRoute = () => {
   const navigate = useNavigate()
   const {
-    setCurrentWallet,
+    updateCurrentWallet,
     setCredential,
     keyAgentName,
     credentials,
@@ -23,7 +23,7 @@ export const AccountManagementRoute = () => {
   const selectAccount = (account: SingleCredentialState) => {
     setSelectedAccount(account)
     setCredential(account)
-    setCurrentWallet({
+    updateCurrentWallet({
       keyAgentName,
       credentialName: account?.credentialName,
       currentAccountIndex: account?.credential?.accountIndex ?? 0,

packages/features/src/account-management/routes/edit-account.tsx

@@ -10,7 +10,7 @@ export const EditAccountRoute = () => {
     credentials,
     setCredential,
     removeCredential,
-    setCurrentWallet,
+    updateCurrentWallet,
     keyAgentName,
   } = useVault()
   const { t } = useTranslation()
@@ -45,7 +45,7 @@ export const EditAccountRoute = () => {
         removeCredential(editingAccount.credentialName)
         setEditingAccount(updatedAccount)
         setCredential(updatedAccount)
-        setCurrentWallet({
+        updateCurrentWallet({
           keyAgentName,
           credentialName: updatedAccount?.credentialName,
           currentAccountIndex: updatedAccount?.credential?.accountIndex ?? 0,

packages/vault/src/credentials/credentialsState.ts

@@ -10,12 +10,14 @@ export type SingleCredentialState = {
   credentialName: CredentialName
   keyAgentName: KeyAgentName
   credential: StoredCredential
+  lastSelected: number | undefined
 }
 
 export const initialCredentialState: SingleCredentialState = {
   credentialName: "",
   keyAgentName: "",
   credential: undefined,
+  lastSelected: undefined,
 }
 
 export type CredentialStore = {

packages/vault/src/credentials/credentialsStore.ts

@@ -22,11 +22,11 @@ export const credentialSlice: StateCreator<CredentialStore> = (set, get) => ({
       }),
     )
   },
-  setCredential: (credentialState) => {
-    const { credentialName } = credentialState
+  setCredential: (singleCredentialState) => {
+    const { credentialName } = singleCredentialState
     set(
       produce((state) => {
-        state.credentials[credentialName] = credentialState
+        state.credentials[credentialName] = singleCredentialState
       }),
     )
   },

packages/vault/src/vault/utils/derive-account.ts

@@ -13,7 +13,7 @@ export async function deriveAccountHelper(get: any, credentialName: string) {
     setKnownAccounts,
     addAccount,
     getNetworkId,
-    setCurrentWallet,
+    updateCurrentWallet,
     setCredential,
     credentials,
   } = get()
@@ -52,7 +52,7 @@ export async function deriveAccountHelper(get: any, credentialName: string) {
   }
 
   setCredential(singleCredentialState)
-  setCurrentWallet({
+  updateCurrentWallet({
     keyAgentName,
     credentialName,
     currentAccountIndex: 0,

packages/vault/src/vault/utils/restore-wallet.ts

@@ -23,7 +23,7 @@ export async function restoreWalletHelper(
     initialiseKeyAgent,
     restoreKeyAgent,
     setCredential,
-    setCurrentWallet,
+    updateCurrentWallet,
     _syncWallet,
     ensureAccount,
     setKnownAccounts,
@@ -58,7 +58,7 @@ export async function restoreWalletHelper(
   // TODO: set the current network info, restore and create wallet
   // should take some providerConfig object
   setCredential(singleCredentialState)
-  setCurrentWallet({
+  updateCurrentWallet({
     keyAgentName,
     credentialName,
     currentAccountIndex: derivedCredential.accountIndex,

packages/vault/src/vault/utils/update-current-wallet.ts

@@ -0,0 +1,22 @@
+import type { SingleCredentialState } from "../../credentials"
+import { WalletError } from "../../lib/Errors"
+import type { CurrentWalletPayload } from "../vaultState"
+
+export async function updateCurrentWalletHelper(
+  get: any,
+  payload: CurrentWalletPayload,
+) {
+  const { credentials, _setCurrentWallet, setCredential, getCredential } = get()
+  const credential = getCredential(payload.credentialName)
+  if (!credential.credential?.address) {
+    throw new WalletError("Invalid current wallet or address")
+  }
+  const latestSelected = (
+    Object.values(credentials) as SingleCredentialState[]
+  ).reduce((a, c) => Math.max(c.lastSelected ?? 0, a), 0)
+  setCredential({
+    ...credential,
+    lastSelected: latestSelected + 1,
+  })
+  _setCurrentWallet(payload)
+}

packages/vault/src/vault/vaultState.ts

@@ -32,7 +32,7 @@ export type CurrentWallet = {
   transactions: Record<string, Tx[]> // string here is token ticker
 }
 
-type CurrentWalletPayload = {
+export type CurrentWalletPayload = {
   keyAgentName: string
   credentialName: string
   currentAccountIndex: number
@@ -59,7 +59,8 @@ export type GlobalVaultActions = {
   setChain: (chain: Network) => void
   setKnownAccounts: (address: string) => void
   getCurrentWallet: () => CurrentWallet
-  setCurrentWallet: (payload: CurrentWalletPayload) => void
+  updateCurrentWallet: (payload: CurrentWalletPayload) => void
+  _setCurrentWallet: (payload: CurrentWalletPayload) => void
   _syncAccountInfo: (
     providerConfig: ProviderConfig,
     publicKey: ChainAddress,

packages/vault/src/vault/vaultStore.ts

@@ -27,6 +27,7 @@ import {
   syncWalletHelper,
 } from "./utils"
 import { deriveAccountHelper } from "./utils/derive-account"
+import { updateCurrentWalletHelper } from "./utils/update-current-wallet"
 import type { GlobalVaultState, GlobalVaultStore } from "./vaultState"
 
 const defaultGlobalVaultState: GlobalVaultState = {
@@ -79,8 +80,11 @@ export const useVault = create<
           }),
         )
       },
+      updateCurrentWallet(payload) {
+        return updateCurrentWalletHelper(get, payload)
+      },
       // TODO: create a new store for wallet?
-      setCurrentWallet(payload) {
+      _setCurrentWallet(payload) {
         return set(
           produce((state) => {
             state.keyAgentName = payload.keyAgentName

packages/web-provider/src/vault-service/vault-service.ts

@@ -32,9 +32,9 @@ export const createVaultService = (): IVaultService => {
     await rehydrate()
     const store = useVault.getState()
     const credentials = store.credentials
-    const addresses = Object.values(credentials).map(
-      (cred) => cred?.credential?.address,
-    )
+    const addresses = Object.values(credentials)
+      .sort((a, b) => (b.lastSelected ?? 0) - (a.lastSelected ?? 0))
+      .map((cred) => cred?.credential?.address)
     return addresses.filter((address) => address !== undefined) as string[]
   }
   const isLocked = async () => {