diff --git a/.gitignore b/.gitignore index aebcb5558..ee40aa280 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,4 @@ package-lock.json .rpt2_cache .vscode yarn-error.log -.env \ No newline at end of file +.env diff --git a/docs/src/routes/docs/[...4]wallets/[...13]injected/+page.md b/docs/src/routes/docs/[...4]wallets/[...13]injected/+page.md index eacba2942..78f965d37 100644 --- a/docs/src/routes/docs/[...4]wallets/[...13]injected/+page.md +++ b/docs/src/routes/docs/[...4]wallets/[...13]injected/+page.md @@ -339,6 +339,7 @@ const injected = injectedModule({ - MathWallet - _Desktop & Mobile_ - Gamestop - _Desktop_ - Bitkeep - _Desktop & Mobile_ +- BitGet Wallet - _Desktop & Mobile_ - Sequence - _Desktop & Mobile_ - Core - _Desktop_ - Bitski - _Desktop & Mobile_ diff --git a/examples/with-vanilla-js/src/onboard.js b/examples/with-vanilla-js/src/onboard.js index 9c7c4e030..7f799e3be 100644 --- a/examples/with-vanilla-js/src/onboard.js +++ b/examples/with-vanilla-js/src/onboard.js @@ -2,12 +2,14 @@ import Onboard from '@web3-onboard/core' import injectedWalletsModule from '@web3-onboard/injected-wallets' import walletConnectModule from '@web3-onboard/walletconnect' import coinbaseModule from '@web3-onboard/coinbase' +import bitgetModule from '@web3-onboard/bitget' const injected = injectedWalletsModule() const walletConnect = walletConnectModule({}) const coinbaseWallet = coinbaseModule() +const bitgetWallet = bitgetModule() -const wallets = [injected, walletConnect, coinbaseWallet] +const wallets = [injected, walletConnect, bitgetWallet, coinbaseWallet] const chains = [ { diff --git a/packages/bitkeep/src/index.ts b/packages/bitkeep/src/index.ts index 3209532e1..321a188ae 100644 --- a/packages/bitkeep/src/index.ts +++ b/packages/bitkeep/src/index.ts @@ -17,6 +17,9 @@ const loadBitKeepDependencies = async (getAdapter?: boolean) => { return bitKeepDependencies } +/** + * @deprecated Please use `@web3-onboard/bitget` instead. + */ function bitKeep(): WalletInit { if (typeof window === 'undefined') return () => null @@ -24,8 +27,8 @@ function bitKeep(): WalletInit { return { label: 'BitKeep', getIcon: async () => { - const { WalletInfo } = await loadBitKeepDependencies(); - return WalletInfo.logolist.svg[256]; + const { WalletInfo } = await loadBitKeepDependencies() + return WalletInfo.logolist.svg[256] }, getInterface: async () => { const { diff --git a/packages/demo/package.json b/packages/demo/package.json index 9f7f9bcd9..73fcb5532 100644 --- a/packages/demo/package.json +++ b/packages/demo/package.json @@ -41,7 +41,7 @@ "@web3-onboard/gas": "^2.1.7", "@web3-onboard/gnosis": "^2.1.10", "@web3-onboard/infinity-wallet": "^2.0.3", - "@web3-onboard/injected-wallets": "^2.10.8", + "@web3-onboard/injected-wallets": "^2.10.9-alpha.1", "@web3-onboard/keepkey": "^2.3.7", "@web3-onboard/keystone": "^2.3.7", "@web3-onboard/ledger": "^2.5.2", diff --git a/packages/injected/README.md b/packages/injected/README.md index 6fbb1c775..df8d3bdce 100644 --- a/packages/injected/README.md +++ b/packages/injected/README.md @@ -76,7 +76,7 @@ console.log(connectedWallets) - Rabby - _Desktop_ - MathWallet - _Desktop & Mobile_ - Gamestop - _Desktop_ -- Bitkeep - _Desktop & Mobile_ +- Bitget - _Desktop & Mobile_ - Sequence - _Desktop & Mobile_ - Core - _Desktop_ - Bitski - _Desktop & Mobile_ diff --git a/packages/injected/package.json b/packages/injected/package.json index eedaaad42..af6786896 100644 --- a/packages/injected/package.json +++ b/packages/injected/package.json @@ -1,6 +1,6 @@ { "name": "@web3-onboard/injected-wallets", - "version": "2.10.8", + "version": "2.10.9-alpha.1", "description": "Injected wallet module for connecting browser extension and mobile wallets to Web3-Onboard. Web3-Onboard makes it simple to connect Ethereum hardware and software wallets to your dapp. Features standardised spec compliant web3 providers for all supported wallets, framework agnostic modern javascript UI with code splitting, CSS customization, multi-chain and multi-account support, reactive wallet state subscriptions and real-time transaction state change notifications.", "keywords": [ "Ethereum", diff --git a/packages/injected/src/constants.ts b/packages/injected/src/constants.ts index d7d9de7de..fdcfac8b2 100644 --- a/packages/injected/src/constants.ts +++ b/packages/injected/src/constants.ts @@ -16,7 +16,7 @@ export const WALLET_NAMES: { [key: string]: string } = { detected: 'Detected Wallet', meetone: 'MeetOne', frame: 'Frame', - bitkeep: 'BitKeep', + bitget: 'Bitget Wallet', sequence: 'Sequence', core: 'Core', enkrypt: 'Enkrypt', diff --git a/packages/injected/src/icons/bitget.ts b/packages/injected/src/icons/bitget.ts new file mode 100644 index 000000000..ca3e7fe4f --- /dev/null +++ b/packages/injected/src/icons/bitget.ts @@ -0,0 +1 @@ +export default `` diff --git a/packages/injected/src/icons/bitkeep.ts b/packages/injected/src/icons/bitkeep.ts deleted file mode 100644 index d124f81da..000000000 --- a/packages/injected/src/icons/bitkeep.ts +++ /dev/null @@ -1,5 +0,0 @@ -export default ` - - - -` diff --git a/packages/injected/src/index.ts b/packages/injected/src/index.ts index 6cc33baf7..9d49dec22 100644 --- a/packages/injected/src/index.ts +++ b/packages/injected/src/index.ts @@ -132,9 +132,7 @@ function injected(options?: InjectedWalletOptions): WalletInit { getInterface })) // default sort by alphabetical - .sort((a, b) => - a.label < b.label ? -1 : a.label > b.label ? 1 : 0 - ) + .sort((a, b) => (a.label < b.label ? -1 : a.label > b.label ? 1 : 0)) return sort ? sort(formattedWallets) : formattedWallets } diff --git a/packages/injected/src/types.ts b/packages/injected/src/types.ts index 8a35aa6ae..0d4c377e0 100644 --- a/packages/injected/src/types.ts +++ b/packages/injected/src/types.ts @@ -48,7 +48,7 @@ export enum ProviderIdentityFlag { Rabby = 'isRabby', MathWallet = 'isMathWallet', GameStop = 'isGamestop', - BitKeep = 'isBitKeep', + Bitget = 'isBitKeep', Sequence = 'isSequence', Core = 'isAvalanche', Opera = 'isOpera', @@ -80,7 +80,7 @@ export enum ProviderIdentityFlag { */ export enum ProviderExternalUrl { Binance = 'https://www.bnbchain.org/ru/blog/binance-extension-wallet/', - BitKeep = 'https://web3.bitget.com/en/wallet-download', + Bitget = 'https://web3.bitget.com/en/wallet-download', Coinbase = 'https://www.coinbase.com/wallet/downloads', MetaMask = 'https://metamask.io/download/', OKXWallet = 'https://okx.com/download', @@ -133,7 +133,7 @@ export enum ProviderLabel { Rabby = 'Rabby Wallet', MathWallet = 'MathWallet', GameStop = 'GameStop Wallet', - BitKeep = 'BitKeep', + Bitget = 'Bitget Wallet', Sequence = 'Sequence', Core = 'Core', Enkrypt = 'Enkrypt', @@ -172,7 +172,7 @@ export enum InjectedNameSpace { Arbitrum = 'arbitrum', XFI = 'xfi', GameStop = 'gamestop', - BitKeep = 'bitkeep', + Bitget = 'bitkeep', Avalanche = 'avalanche', Bitski = 'Bitski', Enkrypt = 'enkrypt', diff --git a/packages/injected/src/wallets.ts b/packages/injected/src/wallets.ts index f2216dd21..6fe4c7189 100644 --- a/packages/injected/src/wallets.ts +++ b/packages/injected/src/wallets.ts @@ -598,17 +598,17 @@ const gamestop: InjectedWalletModule = { platforms: ['desktop'] } -const bitkeep: InjectedWalletModule = { - label: ProviderLabel.BitKeep, - injectedNamespace: InjectedNameSpace.BitKeep, +const bitget: InjectedWalletModule = { + label: ProviderLabel.Bitget, + injectedNamespace: InjectedNameSpace.Bitget, checkProviderIdentity: ({ provider }) => - !!provider && !!provider['ethereum'][ProviderIdentityFlag.BitKeep], - getIcon: async () => (await import('./icons/bitkeep.js')).default, + !!provider && !!provider['ethereum'][ProviderIdentityFlag.Bitget], + getIcon: async () => (await import('./icons/bitget.js')).default, getInterface: async () => ({ provider: window.bitkeep && window.bitkeep.ethereum }), platforms: ['all'], - externalUrl: ProviderExternalUrl.BitKeep + externalUrl: ProviderExternalUrl.Bitget } const sequence: InjectedWalletModule = { @@ -817,8 +817,7 @@ const fordefi: InjectedWalletModule = { label: ProviderLabel.Fordefi, injectedNamespace: InjectedNameSpace.Ethereum, checkProviderIdentity: ({ provider }) => - !!provider && - !!provider[ProviderIdentityFlag.Fordefi], + !!provider && !!provider[ProviderIdentityFlag.Fordefi], getIcon: async () => (await import('./icons/fordefi.js')).default, getInterface: getInjectedInterface(ProviderIdentityFlag.Fordefi, true), platforms: ['desktop'] @@ -896,6 +895,7 @@ const wallets = [ alphawallet, apexwallet, atoken, + bitget, bitpie, blockwallet, brave, @@ -916,7 +916,6 @@ const wallets = [ rabby, mathwallet, gamestop, - bitkeep, sequence, core, bitski,