Skip to content

fix: handle emptyMainAccount for revoked key during multi-restore #2427

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lmcmz merged 2 commits into from
Feb 25, 2026
Merged

fix: handle emptyMainAccount for revoked key during multi-restore #2427

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6402384
fix: handle emptyMainAccount error for revoked key during multi-restore
lmcmz Feb 24, 2026
fe86c1f
Merge branch 'dev' into fix-revoked-key-empty-account
lmcmz Feb 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions FRW/Modules/MultiRestore/ViewModel/RestoreMultiAccountViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,13 @@ class RestoreMultiAccountViewModel: ObservableObject {
await WalletManager.shared.cleanupRevokedAccount(userId: selectedUserId)
// Add the key again with new data
addKey(item: selectedUser)
} catch WalletError.emptyMainAccount {
log.warning("[RestoreMultiAccountVM] Key revoked and no on-chain account found, cleaning up and adding new key")
HUD.dismissLoading()
// Key was revoked so keyIndexer returns no account for this public key
// Clean up and create a new key
await WalletManager.shared.cleanupRevokedAccount(userId: selectedUserId)
addKey(item: selectedUser)
} catch {
log.error("switch account failed", context: error)
HUD.dismissLoading()
Expand Down
Loading