diff --git a/packages/ui-keyring/src/Keyring.ts b/packages/ui-keyring/src/Keyring.ts index 5ff1e7c1..3955e4b1 100644 --- a/packages/ui-keyring/src/Keyring.ts +++ b/packages/ui-keyring/src/Keyring.ts @@ -15,7 +15,7 @@ import { base64Decode, createKeyMulti } from '@polkadot/util-crypto'; import env from './observable/development'; import Base from './Base'; import { accountKey, addressKey, accountRegex, addressRegex, contractKey, contractRegex } from './defaults'; -import keyringOption from './options'; +import { KeyringOption } from './options'; const RECENT_EXPIRY = 24 * 60 * 60; @@ -23,6 +23,8 @@ const RECENT_EXPIRY = 24 * 60 * 60; // Chain determination occurs outside of Keyring. Loading `keyring.loadAll({ type: 'ed25519' | 'sr25519' })` is triggered // from the API after the chain is received export class Keyring extends Base implements KeyringStruct { + public readonly keyringOption = new KeyringOption(); + #stores = { account: (): AddressSubject => this.accounts, address: (): AddressSubject => this.addresses, @@ -277,7 +279,7 @@ export class Keyring extends Base implements KeyringStruct { } }); - keyringOption.init(this); + this.keyringOption.init(this); } public restoreAccount (json: KeyringPair$Json, password: string): KeyringPair { diff --git a/packages/ui-keyring/src/options/index.spec.ts b/packages/ui-keyring/src/options/index.spec.ts index 64cbffc1..71f682a5 100644 --- a/packages/ui-keyring/src/options/index.spec.ts +++ b/packages/ui-keyring/src/options/index.spec.ts @@ -2,7 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 import { KeyringStruct } from '../types'; -import keyringOption from '.'; +import { KeyringOption } from '.'; + +const keyringOption = new KeyringOption(); describe('KeyringOption', (): void => { it('should not allow initOptions to be called more than once', (): void => { diff --git a/packages/ui-keyring/src/options/index.ts b/packages/ui-keyring/src/options/index.ts index 5db50212..826614df 100644 --- a/packages/ui-keyring/src/options/index.ts +++ b/packages/ui-keyring/src/options/index.ts @@ -138,7 +138,3 @@ export class KeyringOption implements KeyringOptionInstance { }; } } - -const keyringOption = new KeyringOption(); - -export default keyringOption;