Skip to content

Commit 11ba0dd

Browse files
lnbc1QWFyb24lnbc1QWFyb24
authored
1.35.1-0.0.2: [fix] - Temporarily Remove MEW wallet (#722)
* Dynamically import MEW Deps * Add module definition * Test remove babel for esm * Test one level up * Temporarily remove MEW wallet * Increment version
1 parent 6d568b8 commit 11ba0dd

File tree

6 files changed

+134
-1729
lines changed

6 files changed

+134
-1729
lines changed

‎package.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "bnc-onboard",
3-
"version": "1.35.1-0.0.1",
3+
"version": "1.35.1-0.0.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",
@@ -85,9 +85,6 @@
8585
"walletlink": "^2.1.11",
8686
"web3-provider-engine": "^15.0.4"
8787
},
88-
"optionalDependencies": {
89-
"@myetherwallet/mewconnect-web-client": "^2.2.0-beta.11"
90-
},
9188
"resolutions": {
9289
"authereum/web3-utils/underscore": "^1.12.1",
9390
"authereum/ethereum-private-key-to-address/meow/trim-newlines": "^3.0.1",

‎rollup.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ export default {
5555
})
5656
],
5757
external: [
58-
'@myetherwallet/mewconnect-web-client',
58+
// '@myetherwallet/mewconnect-web-client',
5959
'bowser',
6060
'bnc-sdk',
6161
'bignumber.js',

‎src/@types/index.d.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,7 @@ declare module '@keystonehq/eth-keyring'
2323
declare module '@shapeshiftoss/hdwallet-core'
2424
declare module '@shapeshiftoss/hdwallet-keepkey-webusb'
2525

26+
// declare module '@myetherwallet/mewconnect-web-client'
27+
2628
declare module '*.png'
2729
declare module '*.svg'

‎src/modules/select/index.ts

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,13 @@ function select(
9191
setOfWallets.add(walletName)
9292
return module
9393
} catch (error) {
94-
if (error.name === 'DeprecatedWalletError') {
95-
console.warn(error.message)
94+
const { type, message } = error as {
95+
type: string
96+
message: string
97+
}
98+
99+
if (type === 'DeprecatedWalletError') {
100+
console.warn(message)
96101
} else {
97102
throw error
98103
}
@@ -132,7 +137,7 @@ function getModule(name: string): Promise<{
132137
case 'squarelink':
133138
case 'unilogin':
134139
throw {
135-
name: 'DeprecatedWalletError',
140+
type: 'DeprecatedWalletError',
136141
message: `${name} wallet has been deprecated`
137142
}
138143
case 'meetone':
@@ -209,8 +214,8 @@ function getModule(name: string): Promise<{
209214
return import('./wallets/detectedwallet')
210215
case 'tp':
211216
return import('./wallets/tp')
212-
case 'mewwallet':
213-
return import('./wallets/mewwallet')
217+
// case 'mewwallet':
218+
// return import('./wallets/mewwallet')
214219
default:
215220
throw new Error(`${name} is not a valid walletName.`)
216221
}

‎src/modules/select/wallets/mewwallet.ts

Lines changed: 70 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,73 @@
1-
import { MewConnectOptions, WalletModule, Helpers } from '../../../interfaces'
2-
// eslint-disable-next-line @typescript-eslint/ban-ts-ignore
3-
// @ts-ignore
4-
import MEWWallet from '@myetherwallet/mewconnect-web-client'
5-
import mewWalletIcon from '../wallet-icons/icon-mew-wallet'
1+
// import { MewConnectOptions, WalletModule, Helpers } from '../../../interfaces'
2+
// import mewWalletIcon from '../wallet-icons/icon-mew-wallet'
63

7-
function mewConnect(options: MewConnectOptions): WalletModule {
8-
const { rpcUrl, iconSrc, networkId, preferred } = options
4+
// async function mewConnect(options: MewConnectOptions): Promise<WalletModule> {
5+
// const { rpcUrl, iconSrc, networkId, preferred } = options
96

10-
return {
11-
name: 'MEW Wallet',
12-
svg: mewWalletIcon,
13-
iconSrc: iconSrc || mewWalletIcon,
14-
wallet: async (helpers: Helpers) => {
15-
const { resetWalletState, getBalance, getAddress, getNetwork } = helpers
16-
const mewConnect = new MEWWallet.Provider({
17-
windowClosedError: true,
18-
chainId: networkId,
19-
rpcUrl
20-
})
21-
const provider = mewConnect.makeWeb3Provider()
22-
if (mewConnect.isConnected) {
23-
mewConnect.disconnect()
24-
resetWalletState({ disconnected: true, walletName: 'MEW Wallet' })
25-
}
26-
mewConnect.on('popupWindowClosed', () => {
27-
resetWalletState({ disconnected: true, walletName: 'MEW Wallet' })
28-
})
29-
return {
30-
provider,
31-
interface: {
32-
name: 'MEW Wallet',
33-
connect: () =>
34-
new Promise((resolve, reject) => {
35-
provider
36-
.enable()
37-
.then(resolve)
38-
.catch(() => {
39-
reject({
40-
message:
41-
'This dapp needs access to your account information.'
42-
})
43-
})
44-
}),
45-
address: {
46-
get: () => getAddress(provider)
47-
},
48-
network: {
49-
get: () => getNetwork(provider)
50-
},
51-
balance: {
52-
get: () => getBalance(provider)
53-
},
54-
disconnect: () => {
55-
mewConnect.disconnect()
56-
resetWalletState({ disconnected: true, walletName: 'MEW Wallet' })
57-
}
58-
}
59-
}
60-
},
61-
type: 'injected',
62-
desktop: true,
63-
preferred
64-
}
65-
}
7+
// return {
8+
// name: 'MEW Wallet',
9+
// svg: mewWalletIcon,
10+
// iconSrc: iconSrc || mewWalletIcon,
11+
// wallet: async (helpers: Helpers) => {
12+
// const { resetWalletState, getBalance, getAddress, getNetwork } = helpers
6613

67-
export default mewConnect
14+
// const { default: MEWWallet } = await import(
15+
// '@myetherwallet/mewconnect-web-client'
16+
// )
17+
18+
// const mewConnect = new MEWWallet.Provider({
19+
// windowClosedError: true,
20+
// chainId: networkId,
21+
// rpcUrl
22+
// })
23+
24+
// const provider = mewConnect.makeWeb3Provider()
25+
26+
// if (mewConnect.isConnected) {
27+
// mewConnect.disconnect()
28+
// resetWalletState({ disconnected: true, walletName: 'MEW Wallet' })
29+
// }
30+
31+
// mewConnect.on('popupWindowClosed', () => {
32+
// resetWalletState({ disconnected: true, walletName: 'MEW Wallet' })
33+
// })
34+
35+
// return {
36+
// provider,
37+
// interface: {
38+
// name: 'MEW Wallet',
39+
// connect: () =>
40+
// new Promise((resolve, reject) => {
41+
// provider
42+
// .enable()
43+
// .then(resolve)
44+
// .catch(() => {
45+
// reject({
46+
// message:
47+
// 'This dapp needs access to your account information.'
48+
// })
49+
// })
50+
// }),
51+
// address: {
52+
// get: () => getAddress(provider)
53+
// },
54+
// network: {
55+
// get: () => getNetwork(provider)
56+
// },
57+
// balance: {
58+
// get: () => getBalance(provider)
59+
// },
60+
// disconnect: () => {
61+
// mewConnect.disconnect()
62+
// resetWalletState({ disconnected: true, walletName: 'MEW Wallet' })
63+
// }
64+
// }
65+
// }
66+
// },
67+
// type: 'injected',
68+
// desktop: true,
69+
// preferred
70+
// }
71+
// }
72+
73+
// export default mewConnect

0 commit comments

Comments
 (0)