From ae5155051c0478cab909de452f2541cea8e73e4e Mon Sep 17 00:00:00 2001 From: Sebastian Pape <0xneo11@gmail.com> Date: Fri, 8 Mar 2024 17:55:22 +0100 Subject: [PATCH] v16.5.1: fix OKX wallet detection --- dist/esm/index.evm.js | 30 ++++++++++++++------------ dist/esm/index.js | 40 +++++++++++++++++++---------------- dist/esm/index.solana.js | 10 +++++---- dist/umd/index.evm.js | 30 ++++++++++++++------------ dist/umd/index.js | 40 +++++++++++++++++++---------------- dist/umd/index.solana.js | 10 +++++---- package.evm.json | 2 +- package.json | 2 +- package.solana.json | 2 +- src/wallets/WindowEthereum.js | 4 +++- src/wallets/WindowSolana.js | 4 +++- 11 files changed, 97 insertions(+), 77 deletions(-) diff --git a/dist/esm/index.evm.js b/dist/esm/index.evm.js index 402842f..f517abe 100644 --- a/dist/esm/index.evm.js +++ b/dist/esm/index.evm.js @@ -280,33 +280,35 @@ class WindowEthereum { static __initStatic2() {this.isAvailable = async()=>{ return ( - _optionalChain$l([window, 'optionalAccess', _33 => _33.ethereum]) && + _optionalChain$l([window, 'optionalAccess', _34 => _34.ethereum]) && // not MetaMask - !(_optionalChain$l([window, 'optionalAccess', _34 => _34.ethereum, 'optionalAccess', _35 => _35.isMetaMask]) && Object.keys(window.ethereum).filter((key)=>key.match(/^is(?!Connected)(?!PocketUniverse)(?!RevokeCash)/)).length == 1) && + !(_optionalChain$l([window, 'optionalAccess', _35 => _35.ethereum, 'optionalAccess', _36 => _36.isMetaMask]) && Object.keys(window.ethereum).filter((key)=>key.match(/^is(?!Connected)(?!PocketUniverse)(?!RevokeCash)/)).length == 1) && // not Coin98 - !_optionalChain$l([window, 'optionalAccess', _36 => _36.coin98]) && + !_optionalChain$l([window, 'optionalAccess', _37 => _37.coin98]) && // not Trust Wallet - !(_optionalChain$l([window, 'optionalAccess', _37 => _37.ethereum, 'optionalAccess', _38 => _38.isTrust]) || _optionalChain$l([window, 'optionalAccess', _39 => _39.ethereum, 'optionalAccess', _40 => _40.isTrustWallet])) && + !(_optionalChain$l([window, 'optionalAccess', _38 => _38.ethereum, 'optionalAccess', _39 => _39.isTrust]) || _optionalChain$l([window, 'optionalAccess', _40 => _40.ethereum, 'optionalAccess', _41 => _41.isTrustWallet])) && // not crypto.com - !_optionalChain$l([window, 'optionalAccess', _41 => _41.ethereum, 'optionalAccess', _42 => _42.isDeficonnectProvider]) && + !_optionalChain$l([window, 'optionalAccess', _42 => _42.ethereum, 'optionalAccess', _43 => _43.isDeficonnectProvider]) && // not HyperPay - !_optionalChain$l([window, 'optionalAccess', _43 => _43.ethereum, 'optionalAccess', _44 => _44.isHyperPay]) && + !_optionalChain$l([window, 'optionalAccess', _44 => _44.ethereum, 'optionalAccess', _45 => _45.isHyperPay]) && // not Phantom - !(window.phantom && !window.glow && !_optionalChain$l([window, 'optionalAccess', _45 => _45.solana, 'optionalAccess', _46 => _46.isGlow]) && !['isBitKeep'].some((identifier)=>window.solana && window.solana[identifier])) && + !(window.phantom && !window.glow && !_optionalChain$l([window, 'optionalAccess', _46 => _46.solana, 'optionalAccess', _47 => _47.isGlow]) && !['isBitKeep'].some((identifier)=>window.solana && window.solana[identifier])) && // not Rabby - !_optionalChain$l([window, 'optionalAccess', _47 => _47.ethereum, 'optionalAccess', _48 => _48.isRabby]) && + !_optionalChain$l([window, 'optionalAccess', _48 => _48.ethereum, 'optionalAccess', _49 => _49.isRabby]) && // not Backpack - !_optionalChain$l([window, 'optionalAccess', _49 => _49.backpack, 'optionalAccess', _50 => _50.isBackpack]) && + !_optionalChain$l([window, 'optionalAccess', _50 => _50.backpack, 'optionalAccess', _51 => _51.isBackpack]) && // not TokenPocket - !_optionalChain$l([window, 'optionalAccess', _51 => _51.ethereum, 'optionalAccess', _52 => _52.isTokenPocket]) && + !_optionalChain$l([window, 'optionalAccess', _52 => _52.ethereum, 'optionalAccess', _53 => _53.isTokenPocket]) && // not BitKeep - !_optionalChain$l([window, 'optionalAccess', _53 => _53.ethereum, 'optionalAccess', _54 => _54.isBitKeep]) && + !_optionalChain$l([window, 'optionalAccess', _54 => _54.ethereum, 'optionalAccess', _55 => _55.isBitKeep]) && // not Coinbase - !(_optionalChain$l([window, 'optionalAccess', _55 => _55.ethereum, 'optionalAccess', _56 => _56.isCoinbaseWallet]) || _optionalChain$l([window, 'optionalAccess', _57 => _57.ethereum, 'optionalAccess', _58 => _58.isWalletLink])) && + !(_optionalChain$l([window, 'optionalAccess', _56 => _56.ethereum, 'optionalAccess', _57 => _57.isCoinbaseWallet]) || _optionalChain$l([window, 'optionalAccess', _58 => _58.ethereum, 'optionalAccess', _59 => _59.isWalletLink])) && // MetaMask through ProviderMap - !_optionalChain$l([window, 'optionalAccess', _59 => _59.ethereum, 'optionalAccess', _60 => _60.providerMap, 'optionalAccess', _61 => _61.has, 'call', _62 => _62('MetaMask')]) && + !_optionalChain$l([window, 'optionalAccess', _60 => _60.ethereum, 'optionalAccess', _61 => _61.providerMap, 'optionalAccess', _62 => _62.has, 'call', _63 => _63('MetaMask')]) && // Brave Wallet - !_optionalChain$l([window, 'optionalAccess', _63 => _63.ethereum, 'optionalAccess', _64 => _64.isBraveWallet]) + !_optionalChain$l([window, 'optionalAccess', _64 => _64.ethereum, 'optionalAccess', _65 => _65.isBraveWallet]) && + // OKX Wallet + !_optionalChain$l([window, 'optionalAccess', _66 => _66.okxwallet]) ) };} diff --git a/dist/esm/index.js b/dist/esm/index.js index fdd69c3..7be840e 100644 --- a/dist/esm/index.js +++ b/dist/esm/index.js @@ -274,19 +274,21 @@ class WindowSolana { static __initStatic2() {this.isAvailable = async()=>{ return ( - _optionalChain$x([window, 'optionalAccess', _5 => _5.solana]) && + _optionalChain$x([window, 'optionalAccess', _6 => _6.solana]) && // not Phantom !(window.phantom && !window.glow && !window.solana.isGlow && !['isBitKeep'].some((identifier)=>window.solana && window.solana[identifier])) && // not Coin98 !window.coin98 && // not BitKeep - !(_optionalChain$x([window, 'optionalAccess', _6 => _6.solana]) && _optionalChain$x([window, 'optionalAccess', _7 => _7.solana, 'access', _8 => _8.isBitKeep])) && + !(_optionalChain$x([window, 'optionalAccess', _7 => _7.solana]) && _optionalChain$x([window, 'optionalAccess', _8 => _8.solana, 'access', _9 => _9.isBitKeep])) && // not Glow !window.solana.isGlow && // not trust !window.trustwallet && // Brave Wallet - !window.solana.isBraveWallet + !window.solana.isBraveWallet && + // OKX Wallet + !_optionalChain$x([window, 'optionalAccess', _10 => _10.okxwallet]) ) };} @@ -333,7 +335,7 @@ class WindowSolana { let internalCallback; switch (event) { case 'account': - internalCallback = (publicKey) => callback(_optionalChain$x([publicKey, 'optionalAccess', _9 => _9.toString, 'call', _10 => _10()])); + internalCallback = (publicKey) => callback(_optionalChain$x([publicKey, 'optionalAccess', _11 => _11.toString, 'call', _12 => _12()])); this.getProvider().on('accountChanged', internalCallback); break } @@ -549,33 +551,35 @@ class WindowEthereum { static __initStatic2() {this.isAvailable = async()=>{ return ( - _optionalChain$u([window, 'optionalAccess', _33 => _33.ethereum]) && + _optionalChain$u([window, 'optionalAccess', _34 => _34.ethereum]) && // not MetaMask - !(_optionalChain$u([window, 'optionalAccess', _34 => _34.ethereum, 'optionalAccess', _35 => _35.isMetaMask]) && Object.keys(window.ethereum).filter((key)=>key.match(/^is(?!Connected)(?!PocketUniverse)(?!RevokeCash)/)).length == 1) && + !(_optionalChain$u([window, 'optionalAccess', _35 => _35.ethereum, 'optionalAccess', _36 => _36.isMetaMask]) && Object.keys(window.ethereum).filter((key)=>key.match(/^is(?!Connected)(?!PocketUniverse)(?!RevokeCash)/)).length == 1) && // not Coin98 - !_optionalChain$u([window, 'optionalAccess', _36 => _36.coin98]) && + !_optionalChain$u([window, 'optionalAccess', _37 => _37.coin98]) && // not Trust Wallet - !(_optionalChain$u([window, 'optionalAccess', _37 => _37.ethereum, 'optionalAccess', _38 => _38.isTrust]) || _optionalChain$u([window, 'optionalAccess', _39 => _39.ethereum, 'optionalAccess', _40 => _40.isTrustWallet])) && + !(_optionalChain$u([window, 'optionalAccess', _38 => _38.ethereum, 'optionalAccess', _39 => _39.isTrust]) || _optionalChain$u([window, 'optionalAccess', _40 => _40.ethereum, 'optionalAccess', _41 => _41.isTrustWallet])) && // not crypto.com - !_optionalChain$u([window, 'optionalAccess', _41 => _41.ethereum, 'optionalAccess', _42 => _42.isDeficonnectProvider]) && + !_optionalChain$u([window, 'optionalAccess', _42 => _42.ethereum, 'optionalAccess', _43 => _43.isDeficonnectProvider]) && // not HyperPay - !_optionalChain$u([window, 'optionalAccess', _43 => _43.ethereum, 'optionalAccess', _44 => _44.isHyperPay]) && + !_optionalChain$u([window, 'optionalAccess', _44 => _44.ethereum, 'optionalAccess', _45 => _45.isHyperPay]) && // not Phantom - !(window.phantom && !window.glow && !_optionalChain$u([window, 'optionalAccess', _45 => _45.solana, 'optionalAccess', _46 => _46.isGlow]) && !['isBitKeep'].some((identifier)=>window.solana && window.solana[identifier])) && + !(window.phantom && !window.glow && !_optionalChain$u([window, 'optionalAccess', _46 => _46.solana, 'optionalAccess', _47 => _47.isGlow]) && !['isBitKeep'].some((identifier)=>window.solana && window.solana[identifier])) && // not Rabby - !_optionalChain$u([window, 'optionalAccess', _47 => _47.ethereum, 'optionalAccess', _48 => _48.isRabby]) && + !_optionalChain$u([window, 'optionalAccess', _48 => _48.ethereum, 'optionalAccess', _49 => _49.isRabby]) && // not Backpack - !_optionalChain$u([window, 'optionalAccess', _49 => _49.backpack, 'optionalAccess', _50 => _50.isBackpack]) && + !_optionalChain$u([window, 'optionalAccess', _50 => _50.backpack, 'optionalAccess', _51 => _51.isBackpack]) && // not TokenPocket - !_optionalChain$u([window, 'optionalAccess', _51 => _51.ethereum, 'optionalAccess', _52 => _52.isTokenPocket]) && + !_optionalChain$u([window, 'optionalAccess', _52 => _52.ethereum, 'optionalAccess', _53 => _53.isTokenPocket]) && // not BitKeep - !_optionalChain$u([window, 'optionalAccess', _53 => _53.ethereum, 'optionalAccess', _54 => _54.isBitKeep]) && + !_optionalChain$u([window, 'optionalAccess', _54 => _54.ethereum, 'optionalAccess', _55 => _55.isBitKeep]) && // not Coinbase - !(_optionalChain$u([window, 'optionalAccess', _55 => _55.ethereum, 'optionalAccess', _56 => _56.isCoinbaseWallet]) || _optionalChain$u([window, 'optionalAccess', _57 => _57.ethereum, 'optionalAccess', _58 => _58.isWalletLink])) && + !(_optionalChain$u([window, 'optionalAccess', _56 => _56.ethereum, 'optionalAccess', _57 => _57.isCoinbaseWallet]) || _optionalChain$u([window, 'optionalAccess', _58 => _58.ethereum, 'optionalAccess', _59 => _59.isWalletLink])) && // MetaMask through ProviderMap - !_optionalChain$u([window, 'optionalAccess', _59 => _59.ethereum, 'optionalAccess', _60 => _60.providerMap, 'optionalAccess', _61 => _61.has, 'call', _62 => _62('MetaMask')]) && + !_optionalChain$u([window, 'optionalAccess', _60 => _60.ethereum, 'optionalAccess', _61 => _61.providerMap, 'optionalAccess', _62 => _62.has, 'call', _63 => _63('MetaMask')]) && // Brave Wallet - !_optionalChain$u([window, 'optionalAccess', _63 => _63.ethereum, 'optionalAccess', _64 => _64.isBraveWallet]) + !_optionalChain$u([window, 'optionalAccess', _64 => _64.ethereum, 'optionalAccess', _65 => _65.isBraveWallet]) && + // OKX Wallet + !_optionalChain$u([window, 'optionalAccess', _66 => _66.okxwallet]) ) };} diff --git a/dist/esm/index.solana.js b/dist/esm/index.solana.js index e8bc88b..adcfd1d 100644 --- a/dist/esm/index.solana.js +++ b/dist/esm/index.solana.js @@ -271,19 +271,21 @@ class WindowSolana { static __initStatic2() {this.isAvailable = async()=>{ return ( - _optionalChain$a([window, 'optionalAccess', _5 => _5.solana]) && + _optionalChain$a([window, 'optionalAccess', _6 => _6.solana]) && // not Phantom !(window.phantom && !window.glow && !window.solana.isGlow && !['isBitKeep'].some((identifier)=>window.solana && window.solana[identifier])) && // not Coin98 !window.coin98 && // not BitKeep - !(_optionalChain$a([window, 'optionalAccess', _6 => _6.solana]) && _optionalChain$a([window, 'optionalAccess', _7 => _7.solana, 'access', _8 => _8.isBitKeep])) && + !(_optionalChain$a([window, 'optionalAccess', _7 => _7.solana]) && _optionalChain$a([window, 'optionalAccess', _8 => _8.solana, 'access', _9 => _9.isBitKeep])) && // not Glow !window.solana.isGlow && // not trust !window.trustwallet && // Brave Wallet - !window.solana.isBraveWallet + !window.solana.isBraveWallet && + // OKX Wallet + !_optionalChain$a([window, 'optionalAccess', _10 => _10.okxwallet]) ) };} @@ -330,7 +332,7 @@ class WindowSolana { let internalCallback; switch (event) { case 'account': - internalCallback = (publicKey) => callback(_optionalChain$a([publicKey, 'optionalAccess', _9 => _9.toString, 'call', _10 => _10()])); + internalCallback = (publicKey) => callback(_optionalChain$a([publicKey, 'optionalAccess', _11 => _11.toString, 'call', _12 => _12()])); this.getProvider().on('accountChanged', internalCallback); break } diff --git a/dist/umd/index.evm.js b/dist/umd/index.evm.js index 5003884..3dad9d4 100644 --- a/dist/umd/index.evm.js +++ b/dist/umd/index.evm.js @@ -283,33 +283,35 @@ static __initStatic2() {this.isAvailable = async()=>{ return ( - _optionalChain$l([window, 'optionalAccess', _33 => _33.ethereum]) && + _optionalChain$l([window, 'optionalAccess', _34 => _34.ethereum]) && // not MetaMask - !(_optionalChain$l([window, 'optionalAccess', _34 => _34.ethereum, 'optionalAccess', _35 => _35.isMetaMask]) && Object.keys(window.ethereum).filter((key)=>key.match(/^is(?!Connected)(?!PocketUniverse)(?!RevokeCash)/)).length == 1) && + !(_optionalChain$l([window, 'optionalAccess', _35 => _35.ethereum, 'optionalAccess', _36 => _36.isMetaMask]) && Object.keys(window.ethereum).filter((key)=>key.match(/^is(?!Connected)(?!PocketUniverse)(?!RevokeCash)/)).length == 1) && // not Coin98 - !_optionalChain$l([window, 'optionalAccess', _36 => _36.coin98]) && + !_optionalChain$l([window, 'optionalAccess', _37 => _37.coin98]) && // not Trust Wallet - !(_optionalChain$l([window, 'optionalAccess', _37 => _37.ethereum, 'optionalAccess', _38 => _38.isTrust]) || _optionalChain$l([window, 'optionalAccess', _39 => _39.ethereum, 'optionalAccess', _40 => _40.isTrustWallet])) && + !(_optionalChain$l([window, 'optionalAccess', _38 => _38.ethereum, 'optionalAccess', _39 => _39.isTrust]) || _optionalChain$l([window, 'optionalAccess', _40 => _40.ethereum, 'optionalAccess', _41 => _41.isTrustWallet])) && // not crypto.com - !_optionalChain$l([window, 'optionalAccess', _41 => _41.ethereum, 'optionalAccess', _42 => _42.isDeficonnectProvider]) && + !_optionalChain$l([window, 'optionalAccess', _42 => _42.ethereum, 'optionalAccess', _43 => _43.isDeficonnectProvider]) && // not HyperPay - !_optionalChain$l([window, 'optionalAccess', _43 => _43.ethereum, 'optionalAccess', _44 => _44.isHyperPay]) && + !_optionalChain$l([window, 'optionalAccess', _44 => _44.ethereum, 'optionalAccess', _45 => _45.isHyperPay]) && // not Phantom - !(window.phantom && !window.glow && !_optionalChain$l([window, 'optionalAccess', _45 => _45.solana, 'optionalAccess', _46 => _46.isGlow]) && !['isBitKeep'].some((identifier)=>window.solana && window.solana[identifier])) && + !(window.phantom && !window.glow && !_optionalChain$l([window, 'optionalAccess', _46 => _46.solana, 'optionalAccess', _47 => _47.isGlow]) && !['isBitKeep'].some((identifier)=>window.solana && window.solana[identifier])) && // not Rabby - !_optionalChain$l([window, 'optionalAccess', _47 => _47.ethereum, 'optionalAccess', _48 => _48.isRabby]) && + !_optionalChain$l([window, 'optionalAccess', _48 => _48.ethereum, 'optionalAccess', _49 => _49.isRabby]) && // not Backpack - !_optionalChain$l([window, 'optionalAccess', _49 => _49.backpack, 'optionalAccess', _50 => _50.isBackpack]) && + !_optionalChain$l([window, 'optionalAccess', _50 => _50.backpack, 'optionalAccess', _51 => _51.isBackpack]) && // not TokenPocket - !_optionalChain$l([window, 'optionalAccess', _51 => _51.ethereum, 'optionalAccess', _52 => _52.isTokenPocket]) && + !_optionalChain$l([window, 'optionalAccess', _52 => _52.ethereum, 'optionalAccess', _53 => _53.isTokenPocket]) && // not BitKeep - !_optionalChain$l([window, 'optionalAccess', _53 => _53.ethereum, 'optionalAccess', _54 => _54.isBitKeep]) && + !_optionalChain$l([window, 'optionalAccess', _54 => _54.ethereum, 'optionalAccess', _55 => _55.isBitKeep]) && // not Coinbase - !(_optionalChain$l([window, 'optionalAccess', _55 => _55.ethereum, 'optionalAccess', _56 => _56.isCoinbaseWallet]) || _optionalChain$l([window, 'optionalAccess', _57 => _57.ethereum, 'optionalAccess', _58 => _58.isWalletLink])) && + !(_optionalChain$l([window, 'optionalAccess', _56 => _56.ethereum, 'optionalAccess', _57 => _57.isCoinbaseWallet]) || _optionalChain$l([window, 'optionalAccess', _58 => _58.ethereum, 'optionalAccess', _59 => _59.isWalletLink])) && // MetaMask through ProviderMap - !_optionalChain$l([window, 'optionalAccess', _59 => _59.ethereum, 'optionalAccess', _60 => _60.providerMap, 'optionalAccess', _61 => _61.has, 'call', _62 => _62('MetaMask')]) && + !_optionalChain$l([window, 'optionalAccess', _60 => _60.ethereum, 'optionalAccess', _61 => _61.providerMap, 'optionalAccess', _62 => _62.has, 'call', _63 => _63('MetaMask')]) && // Brave Wallet - !_optionalChain$l([window, 'optionalAccess', _63 => _63.ethereum, 'optionalAccess', _64 => _64.isBraveWallet]) + !_optionalChain$l([window, 'optionalAccess', _64 => _64.ethereum, 'optionalAccess', _65 => _65.isBraveWallet]) && + // OKX Wallet + !_optionalChain$l([window, 'optionalAccess', _66 => _66.okxwallet]) ) };} diff --git a/dist/umd/index.js b/dist/umd/index.js index 92dfbd4..9c42eb8 100644 --- a/dist/umd/index.js +++ b/dist/umd/index.js @@ -276,19 +276,21 @@ static __initStatic2() {this.isAvailable = async()=>{ return ( - _optionalChain$x([window, 'optionalAccess', _5 => _5.solana]) && + _optionalChain$x([window, 'optionalAccess', _6 => _6.solana]) && // not Phantom !(window.phantom && !window.glow && !window.solana.isGlow && !['isBitKeep'].some((identifier)=>window.solana && window.solana[identifier])) && // not Coin98 !window.coin98 && // not BitKeep - !(_optionalChain$x([window, 'optionalAccess', _6 => _6.solana]) && _optionalChain$x([window, 'optionalAccess', _7 => _7.solana, 'access', _8 => _8.isBitKeep])) && + !(_optionalChain$x([window, 'optionalAccess', _7 => _7.solana]) && _optionalChain$x([window, 'optionalAccess', _8 => _8.solana, 'access', _9 => _9.isBitKeep])) && // not Glow !window.solana.isGlow && // not trust !window.trustwallet && // Brave Wallet - !window.solana.isBraveWallet + !window.solana.isBraveWallet && + // OKX Wallet + !_optionalChain$x([window, 'optionalAccess', _10 => _10.okxwallet]) ) };} @@ -335,7 +337,7 @@ let internalCallback; switch (event) { case 'account': - internalCallback = (publicKey) => callback(_optionalChain$x([publicKey, 'optionalAccess', _9 => _9.toString, 'call', _10 => _10()])); + internalCallback = (publicKey) => callback(_optionalChain$x([publicKey, 'optionalAccess', _11 => _11.toString, 'call', _12 => _12()])); this.getProvider().on('accountChanged', internalCallback); break } @@ -551,33 +553,35 @@ static __initStatic2() {this.isAvailable = async()=>{ return ( - _optionalChain$u([window, 'optionalAccess', _33 => _33.ethereum]) && + _optionalChain$u([window, 'optionalAccess', _34 => _34.ethereum]) && // not MetaMask - !(_optionalChain$u([window, 'optionalAccess', _34 => _34.ethereum, 'optionalAccess', _35 => _35.isMetaMask]) && Object.keys(window.ethereum).filter((key)=>key.match(/^is(?!Connected)(?!PocketUniverse)(?!RevokeCash)/)).length == 1) && + !(_optionalChain$u([window, 'optionalAccess', _35 => _35.ethereum, 'optionalAccess', _36 => _36.isMetaMask]) && Object.keys(window.ethereum).filter((key)=>key.match(/^is(?!Connected)(?!PocketUniverse)(?!RevokeCash)/)).length == 1) && // not Coin98 - !_optionalChain$u([window, 'optionalAccess', _36 => _36.coin98]) && + !_optionalChain$u([window, 'optionalAccess', _37 => _37.coin98]) && // not Trust Wallet - !(_optionalChain$u([window, 'optionalAccess', _37 => _37.ethereum, 'optionalAccess', _38 => _38.isTrust]) || _optionalChain$u([window, 'optionalAccess', _39 => _39.ethereum, 'optionalAccess', _40 => _40.isTrustWallet])) && + !(_optionalChain$u([window, 'optionalAccess', _38 => _38.ethereum, 'optionalAccess', _39 => _39.isTrust]) || _optionalChain$u([window, 'optionalAccess', _40 => _40.ethereum, 'optionalAccess', _41 => _41.isTrustWallet])) && // not crypto.com - !_optionalChain$u([window, 'optionalAccess', _41 => _41.ethereum, 'optionalAccess', _42 => _42.isDeficonnectProvider]) && + !_optionalChain$u([window, 'optionalAccess', _42 => _42.ethereum, 'optionalAccess', _43 => _43.isDeficonnectProvider]) && // not HyperPay - !_optionalChain$u([window, 'optionalAccess', _43 => _43.ethereum, 'optionalAccess', _44 => _44.isHyperPay]) && + !_optionalChain$u([window, 'optionalAccess', _44 => _44.ethereum, 'optionalAccess', _45 => _45.isHyperPay]) && // not Phantom - !(window.phantom && !window.glow && !_optionalChain$u([window, 'optionalAccess', _45 => _45.solana, 'optionalAccess', _46 => _46.isGlow]) && !['isBitKeep'].some((identifier)=>window.solana && window.solana[identifier])) && + !(window.phantom && !window.glow && !_optionalChain$u([window, 'optionalAccess', _46 => _46.solana, 'optionalAccess', _47 => _47.isGlow]) && !['isBitKeep'].some((identifier)=>window.solana && window.solana[identifier])) && // not Rabby - !_optionalChain$u([window, 'optionalAccess', _47 => _47.ethereum, 'optionalAccess', _48 => _48.isRabby]) && + !_optionalChain$u([window, 'optionalAccess', _48 => _48.ethereum, 'optionalAccess', _49 => _49.isRabby]) && // not Backpack - !_optionalChain$u([window, 'optionalAccess', _49 => _49.backpack, 'optionalAccess', _50 => _50.isBackpack]) && + !_optionalChain$u([window, 'optionalAccess', _50 => _50.backpack, 'optionalAccess', _51 => _51.isBackpack]) && // not TokenPocket - !_optionalChain$u([window, 'optionalAccess', _51 => _51.ethereum, 'optionalAccess', _52 => _52.isTokenPocket]) && + !_optionalChain$u([window, 'optionalAccess', _52 => _52.ethereum, 'optionalAccess', _53 => _53.isTokenPocket]) && // not BitKeep - !_optionalChain$u([window, 'optionalAccess', _53 => _53.ethereum, 'optionalAccess', _54 => _54.isBitKeep]) && + !_optionalChain$u([window, 'optionalAccess', _54 => _54.ethereum, 'optionalAccess', _55 => _55.isBitKeep]) && // not Coinbase - !(_optionalChain$u([window, 'optionalAccess', _55 => _55.ethereum, 'optionalAccess', _56 => _56.isCoinbaseWallet]) || _optionalChain$u([window, 'optionalAccess', _57 => _57.ethereum, 'optionalAccess', _58 => _58.isWalletLink])) && + !(_optionalChain$u([window, 'optionalAccess', _56 => _56.ethereum, 'optionalAccess', _57 => _57.isCoinbaseWallet]) || _optionalChain$u([window, 'optionalAccess', _58 => _58.ethereum, 'optionalAccess', _59 => _59.isWalletLink])) && // MetaMask through ProviderMap - !_optionalChain$u([window, 'optionalAccess', _59 => _59.ethereum, 'optionalAccess', _60 => _60.providerMap, 'optionalAccess', _61 => _61.has, 'call', _62 => _62('MetaMask')]) && + !_optionalChain$u([window, 'optionalAccess', _60 => _60.ethereum, 'optionalAccess', _61 => _61.providerMap, 'optionalAccess', _62 => _62.has, 'call', _63 => _63('MetaMask')]) && // Brave Wallet - !_optionalChain$u([window, 'optionalAccess', _63 => _63.ethereum, 'optionalAccess', _64 => _64.isBraveWallet]) + !_optionalChain$u([window, 'optionalAccess', _64 => _64.ethereum, 'optionalAccess', _65 => _65.isBraveWallet]) && + // OKX Wallet + !_optionalChain$u([window, 'optionalAccess', _66 => _66.okxwallet]) ) };} diff --git a/dist/umd/index.solana.js b/dist/umd/index.solana.js index 35bdcc8..ced6ad6 100644 --- a/dist/umd/index.solana.js +++ b/dist/umd/index.solana.js @@ -276,19 +276,21 @@ static __initStatic2() {this.isAvailable = async()=>{ return ( - _optionalChain$a([window, 'optionalAccess', _5 => _5.solana]) && + _optionalChain$a([window, 'optionalAccess', _6 => _6.solana]) && // not Phantom !(window.phantom && !window.glow && !window.solana.isGlow && !['isBitKeep'].some((identifier)=>window.solana && window.solana[identifier])) && // not Coin98 !window.coin98 && // not BitKeep - !(_optionalChain$a([window, 'optionalAccess', _6 => _6.solana]) && _optionalChain$a([window, 'optionalAccess', _7 => _7.solana, 'access', _8 => _8.isBitKeep])) && + !(_optionalChain$a([window, 'optionalAccess', _7 => _7.solana]) && _optionalChain$a([window, 'optionalAccess', _8 => _8.solana, 'access', _9 => _9.isBitKeep])) && // not Glow !window.solana.isGlow && // not trust !window.trustwallet && // Brave Wallet - !window.solana.isBraveWallet + !window.solana.isBraveWallet && + // OKX Wallet + !_optionalChain$a([window, 'optionalAccess', _10 => _10.okxwallet]) ) };} @@ -335,7 +337,7 @@ let internalCallback; switch (event) { case 'account': - internalCallback = (publicKey) => callback(_optionalChain$a([publicKey, 'optionalAccess', _9 => _9.toString, 'call', _10 => _10()])); + internalCallback = (publicKey) => callback(_optionalChain$a([publicKey, 'optionalAccess', _11 => _11.toString, 'call', _12 => _12()])); this.getProvider().on('accountChanged', internalCallback); break } diff --git a/package.evm.json b/package.evm.json index 949d974..d280d15 100644 --- a/package.evm.json +++ b/package.evm.json @@ -1,7 +1,7 @@ { "name": "@depay/web3-wallets-evm", "moduleName": "Web3Wallets", - "version": "16.5.0", + "version": "16.5.1", "description": "One-Stop-Shop JavaScript library to integrate various web3 crypto wallets and multiple blockchains at once with a single interface.", "main": "dist/umd/index.evm.js", "module": "dist/esm/index.evm.js", diff --git a/package.json b/package.json index d15ebce..585ae97 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@depay/web3-wallets", "moduleName": "Web3Wallets", - "version": "16.5.0", + "version": "16.5.1", "description": "One-Stop-Shop JavaScript library to integrate various web3 crypto wallets and multiple blockchains at once with a single interface.", "main": "dist/umd/index.js", "module": "dist/esm/index.js", diff --git a/package.solana.json b/package.solana.json index 23425f7..0023d4e 100644 --- a/package.solana.json +++ b/package.solana.json @@ -1,7 +1,7 @@ { "name": "@depay/web3-wallets-solana", "moduleName": "Web3Wallets", - "version": "16.5.0", + "version": "16.5.1", "description": "One-Stop-Shop JavaScript library to integrate various web3 crypto wallets and multiple blockchains at once with a single interface.", "main": "dist/umd/index.solana.js", "module": "dist/esm/index.solana.js", diff --git a/src/wallets/WindowEthereum.js b/src/wallets/WindowEthereum.js index 0ca3535..0cb4853 100644 --- a/src/wallets/WindowEthereum.js +++ b/src/wallets/WindowEthereum.js @@ -53,7 +53,9 @@ export default class WindowEthereum { // MetaMask through ProviderMap !window?.ethereum?.providerMap?.has('MetaMask') && // Brave Wallet - !window?.ethereum?.isBraveWallet + !window?.ethereum?.isBraveWallet && + // OKX Wallet + !window?.okxwallet ) } diff --git a/src/wallets/WindowSolana.js b/src/wallets/WindowSolana.js index a9adf63..4ec3cdf 100644 --- a/src/wallets/WindowSolana.js +++ b/src/wallets/WindowSolana.js @@ -23,7 +23,9 @@ export default class WindowSolana { // not trust !window.trustwallet && // Brave Wallet - !window.solana.isBraveWallet + !window.solana.isBraveWallet && + // OKX Wallet + !window?.okxwallet ) }