Skip to content

Added emitPostSelectAccountUiSync to main.ts #2393

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

Draft
Maskln wants to merge 1 commit into
base: v2
Choose a base branch
from
Draft

Added emitPostSelectAccountUiSync to main.ts #2393

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
39 changes: 28 additions & 11 deletions src/controllers/main/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,9 @@ export class MainController extends EventEmitter implements IMainController {
const defaultSelectedAccount = getDefaultSelectedAccount(accounts)
if (defaultSelectedAccount) {
await this.#selectAccount(defaultSelectedAccount.addr)
if (this.selectedAccount.account?.addr === defaultSelectedAccount.addr) {
await this.#emitPostSelectAccountUiSync(defaultSelectedAccount.addr)
}
}
},
this.providers.updateProviderIsWorking.bind(this.providers),
Expand Down Expand Up @@ -746,6 +749,26 @@ export class MainController extends EventEmitter implements IMainController {
await this.initialLoadPromise

await this.withStatus('selectAccount', async () => this.#selectAccount(toAccountAddr), true)
// Run after `withStatus` so `selectAccount` is INITIAL again before heavy `forceEmitUpdate`
// calls (large wallet + many accounts can block the UI for a long time otherwise).
if (this.selectedAccount.account?.addr === toAccountAddr) {
await this.#emitPostSelectAccountUiSync(toAccountAddr)
}
}

/**
* Pushes controller state to the UI after the selected account has switched.
* Kept outside `#selectAccount` / `withStatus` so list rows are not stuck disabled until this finishes.
*/
async #emitPostSelectAccountUiSync(toAccountAddr: string) {
await Promise.all([
this.activity.forceEmitUpdate(),
this.requests.forceEmitUpdate(),
this.addressBook.forceEmitUpdate(),
this.swapAndBridge.forceEmitUpdate(),
this.dapps.broadcastDappSessionEvent('accountsChanged', [toAccountAddr]),
this.forceEmitUpdate()
])
}

async #selectAccount(toAccountAddr: string | null) {
Expand Down Expand Up @@ -790,16 +813,6 @@ export class MainController extends EventEmitter implements IMainController {
maxDataAgeMs: 5 * 60 * 1000,
maxDataAgeMsUnused: 60 * 60 * 1000
})

// forceEmitUpdate to update the getters in the FE state of the ctrls
await Promise.all([
this.activity.forceEmitUpdate(),
this.requests.forceEmitUpdate(),
this.addressBook.forceEmitUpdate(),
this.swapAndBridge.forceEmitUpdate(),
this.dapps.broadcastDappSessionEvent('accountsChanged', [toAccountAddr]),
this.forceEmitUpdate()
])
}

async #onAccountPickerSuccess() {
Expand Down Expand Up @@ -1439,7 +1452,11 @@ export class MainController extends EventEmitter implements IMainController {
this.signMessage.removeAccountData(address)

if (this.selectedAccount.account?.addr === address) {
await this.#selectAccount(this.accounts.accounts[0]?.addr ?? null)
const nextAddr = this.accounts.accounts[0]?.addr ?? null
await this.#selectAccount(nextAddr)
if (nextAddr && this.selectedAccount.account?.addr === nextAddr) {
await this.#emitPostSelectAccountUiSync(nextAddr)
}
}

this.emitUpdate()
Expand Down