fixup! Cache and restore wallets

Author: paullinator

src/core/account/account-pixie.ts

@@ -112,7 +112,7 @@ const accountPixie: TamePixie<AccountProps> = combinePixies({
       async update() {
         const ai = toApiInput(input)
         const { accountId, accountState, log } = input.props
-        const { accountWalletInfos } = accountState
+        const { accountWalletInfo, accountWalletInfos } = accountState
 
         async function loadAllFiles(): Promise<void> {
           await Promise.all([
@@ -127,12 +127,7 @@ const accountPixie: TamePixie<AccountProps> = combinePixies({
         // Assumes storage wallets are already initialized.
         async function tryLoadCache(): Promise<WalletCacheSetup | undefined> {
           try {
-            const storageWalletId = accountWalletInfos[0]?.id
-            if (storageWalletId == null) {
-              return undefined
-            }
-
-            const cachePath = getWalletCachePath(storageWalletId)
+            const cachePath = getWalletCachePath(accountWalletInfo.id)
             const cacheJson = await ai.props.io.disklet.getText(cachePath)
 
             // Build currency info map from loaded plugins.
@@ -358,18 +353,17 @@ const accountPixie: TamePixie<AccountProps> = combinePixies({
 
           // Initialize cache saver once account API exists
           if (accountApi != null && cacheSaver == null) {
-            const storageWalletId = accountState.accountWalletInfos[0]?.id
-            if (storageWalletId != null) {
-              const cachePath = getWalletCachePath(storageWalletId)
-
-              cacheSaver = makeWalletCacheSaver(
-                accountApi,
-                ai.props.io.disklet,
-                cachePath,
-                input.props.log.warn.bind(input.props.log)
-              )
-              input.props.log('[WalletCache] Cache saver initialized')
-            }
+            const cachePath = getWalletCachePath(
+              accountState.accountWalletInfo.id
+            )
+
+            cacheSaver = makeWalletCacheSaver(
+              accountApi,
+              ai.props.io.disklet,
+              cachePath,
+              input.props.log.warn.bind(input.props.log)
+            )
+            input.props.log('[WalletCache] Cache saver initialized')
           }
 
           if (cacheSaver == null) return