diff --git a/packages/wallet-ts/src/strategies/wallet-strategy/strategies/Metamask/utils.ts b/packages/wallet-ts/src/strategies/wallet-strategy/strategies/Metamask/utils.ts index 37a65bac8..4ae3e7d05 100644 --- a/packages/wallet-ts/src/strategies/wallet-strategy/strategies/Metamask/utils.ts +++ b/packages/wallet-ts/src/strategies/wallet-strategy/strategies/Metamask/utils.ts @@ -48,7 +48,6 @@ function getMetamaskFromWindow() { return null } - // Metamask Wallet was injected into $window.ethereum. if (isMetamask($window.ethereum)) { return $window.ethereum } @@ -57,6 +56,5 @@ function getMetamaskFromWindow() { return $window.providers.find(isMetamask) ?? null } - // @ts-ignore - return window['ethereum'] ?? null + return null } diff --git a/packages/wallet-ts/src/strategies/wallet-strategy/strategies/TrustWallet/utils.ts b/packages/wallet-ts/src/strategies/wallet-strategy/strategies/TrustWallet/utils.ts index 7a82df1a9..1f4724ef2 100644 --- a/packages/wallet-ts/src/strategies/wallet-strategy/strategies/TrustWallet/utils.ts +++ b/packages/wallet-ts/src/strategies/wallet-strategy/strategies/TrustWallet/utils.ts @@ -46,15 +46,21 @@ function getTrustWalletFromWindow() { } const injectedProviderExist = - typeof window !== 'undefined' && typeof $window.ethereum !== 'undefined' + typeof window !== 'undefined' && + (typeof $window.ethereum !== 'undefined' || + typeof $window.trustWallet !== 'undefined') // No injected providers exist. if (!injectedProviderExist) { return null } - // Trust Wallet was injected into $window.ethereum. + if ($window.trustWallet) { + return $window.trustWallet + } + if (isTrustWallet($window.ethereum)) { + // Trust Wallet was injected into $window.ethereum. return $window.ethereum } @@ -62,6 +68,5 @@ function getTrustWalletFromWindow() { return $window.providers.find(isTrustWallet) ?? null } - // @ts-ignore - return window['trustwallet'] ?? null + return null } diff --git a/packages/wallet-ts/src/strategies/wallet-strategy/types.ts b/packages/wallet-ts/src/strategies/wallet-strategy/types.ts index 0ccae5335..3c8aeaf8c 100644 --- a/packages/wallet-ts/src/strategies/wallet-strategy/types.ts +++ b/packages/wallet-ts/src/strategies/wallet-strategy/types.ts @@ -10,6 +10,7 @@ export interface BrowserEip1993Provider extends Eip1993Provider { export interface WindowWithEip1193Provider extends Window { ethereum: BrowserEip1993Provider providers: BrowserEip1993Provider[] + trustWallet?: BrowserEip1993Provider } export interface WindowWithLedgerSupport extends Window {