Skip to content

Commit 1cfcd6f

Browse files
authored
1.38.2 Release - Master (#845)
* 1.38.1-0.0.1 : [update] - walletlink version to 2.5.0 (#835) * 1.38.1-0.0.2 : [chore] - change xdefi redirect link to chrome store (#833) * 1.38.1-0.0.3: [fix] Detected wallet logic * 1.38.1-0.0.4 : [fix] - 1inch wallet (#843)
1 parent 0806dde commit 1cfcd6f

File tree

7 files changed

+13
-15
lines changed

7 files changed

+13
-15
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ dist/
44
package-lock.json
55
.rpt2_cache
66
.vscode
7-
*.patch
7+
*.patch
8+
.history/

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "bnc-onboard",
3-
"version": "1.38.1",
3+
"version": "1.38.2",
44
"description": "Onboard users to web3 by allowing them to select a wallet, get that wallet ready to transact and have access to synced wallet state.",
55
"keywords": [
66
"ethereum",
@@ -82,7 +82,7 @@
8282
"hdkey": "^2.0.1",
8383
"regenerator-runtime": "^0.13.7",
8484
"trezor-connect": "^8.1.9",
85-
"walletlink": "^2.4.7",
85+
"walletlink": "^2.5.0",
8686
"web3-provider-engine": "^15.0.4"
8787
},
8888
"resolutions": {

src/modules/select/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ function select(
8383
// This wallet is built into onboard so add the walletName and
8484
// the code below will load it as a wallet module
8585
wallets.unshift({ walletName: detectedWalletName })
86-
} else if (!detectedWalletName && detectedProviderName) {
86+
} else if (window?.ethereum && !detectedWalletName) {
8787
// A provider has been detected but there is not a walletName therefore
8888
// this wallet is not built into onboard so add it as a generic injected wallet
8989
wallets.unshift({ walletName: 'detectedwallet' })
@@ -132,7 +132,7 @@ function select(
132132
if (detectedWalletName && !defaultWalletNames.includes(detectedWalletName)) {
133133
defaultWalletNames.unshift(detectedWalletName)
134134
// If we detected a provider but it is not builtin add the generic injected provider
135-
} else if (!detectedWalletName && detectedProviderName) {
135+
} else if (window?.ethereum && !detectedWalletName) {
136136
defaultWalletNames.unshift('detectedwallet')
137137
}
138138
return Promise.all(

src/modules/select/wallets/1inch.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ function oneInchWallet(options: CommonWalletOptions): WalletModule {
1616
const { createModernProviderInterface, getProviderName } = helpers
1717
const windowAsAny = window as any
1818
const provider =
19-
windowAsAny || (windowAsAny.web3 && windowAsAny.web3.currentProvider)
19+
windowAsAny.ethereum ||
20+
(windowAsAny.web3 && windowAsAny.web3.currentProvider)
2021

2122
return {
2223
provider,

src/modules/select/wallets/xdefi.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ function xdefi(options: CommonWalletOptions): WalletModule {
2828
}
2929
},
3030
type: 'injected',
31-
link: 'https://www.xdefi.io/',
31+
link: 'https://chrome.google.com/webstore/detail/xdefi-wallet/hmeobnfnfcmdkdcmlblgagmfpfboieaf',
3232
installMessage: extensionInstallMessage,
3333
desktop: true,
3434
mobile: true,

src/utilities.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -369,10 +369,6 @@ export function getProviderName(provider: any): string | undefined {
369369
return '1inch'
370370
}
371371

372-
if (provider.isOneInchIOSWallet) {
373-
return '1inch'
374-
}
375-
376372
// =====================================
377373
// When adding new wallet place above this metamask check as some providers
378374
// have an isMetaMask property in addition to the wallet's own `is[WalletName]`

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9488,10 +9488,10 @@ vm-browserify@^1.0.1:
94889488
resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
94899489
integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
94909490

9491-
walletlink@^2.4.7:
9492-
version "2.4.7"
9493-
resolved "https://registry.yarnpkg.com/walletlink/-/walletlink-2.4.7.tgz#3dd034f7cd6e9d9f4cc1d677bb951869dc743e20"
9494-
integrity sha512-jhLVOMly9oWiSE8mZ4/+uMyVsAKHw71kGbgC1xYp50SQpuLT2pfa6Hiw2VQ0omP/WHsDAPFuBo8hJGxggr768w==
9491+
walletlink@^2.5.0:
9492+
version "2.5.0"
9493+
resolved "https://registry.yarnpkg.com/walletlink/-/walletlink-2.5.0.tgz#b8db10f4d9f124084feb16d1e2b2d08ba8c20d21"
9494+
integrity sha512-PBJmK5tZmonwKPABBI2/optaZ11O4kKmkmnU5eLKhk4XRlal5qJ1igZ4U5j3w6w8wxxdhCWpLMHzGWt3n/p7mw==
94959495
dependencies:
94969496
"@metamask/safe-event-emitter" "2.0.0"
94979497
bind-decorator "^1.0.11"

0 commit comments

Comments
 (0)