Skip to content

fix: fetch injected provider from window.top first #67

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
fan-zhang-sv merged 2 commits into from
Jul 28, 2025
Merged

fix: fetch injected provider from window.top first #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19e1e29
window.top first
fan-zhang-sv Jul 25, 2025
a8082c4
test
fan-zhang-sv Jul 25, 2025
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
15 changes: 5 additions & 10 deletions packages/account-sdk/src/interface/builder/core/getInjectedProvider.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ describe('getInjectedProvider', () => {
});

describe('when both window.ethereum and window.top.ethereum exist', () => {
it('should prefer window.ethereum over window.top.ethereum', () => {
it('should prefer window.top.ethereum', () => {
const windowProvider = {
isCoinbaseBrowser: true,
request: vi.fn(),
Expand All @@ -121,23 +121,18 @@ describe('getInjectedProvider', () => {

const result = getInjectedProvider();

expect(result).toBe(windowProvider);
expect(result).not.toBe(topProvider);
expect(result).not.toBe(windowProvider);
expect(result).toBe(topProvider);
});

it('should return null when window.ethereum exists but lacks TBA identifier (does not fallback)', () => {
it('should return null when window.top.ethereum exists but lacks TBA identifier (does not fallback)', () => {
const windowProvider = {
request: vi.fn(),
source: 'window',
};
const topProvider = {
isCoinbaseBrowser: true,
request: vi.fn(),
source: 'top',
};

mockWindow.ethereum = windowProvider;
mockWindow.top.ethereum = topProvider;
mockWindow.top.ethereum = windowProvider;

const result = getInjectedProvider();

Expand Down
2 changes: 1 addition & 1 deletion packages/account-sdk/src/interface/builder/core/getInjectedProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ type InjectedProvider = ProviderInterface & {
};

export function getInjectedProvider(): InjectedProvider | null {
const injectedProvider = window.ethereum ?? window.top?.ethereum;
const injectedProvider = window.top?.ethereum ?? window.ethereum;

if (injectedProvider?.[TBA_PROVIDER_IDENTIFIER]) {
return injectedProvider;
Expand Down