Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.25.0-0.1.2: [feature] KeepKey Wallet #552

Merged
merged 19 commits into from
Jun 11, 2021
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bnc-onboard",
"version": "1.25.0-0.1.0",
"version": "1.25.0-0.2.0",
"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.",
"keywords": [
"ethereum",
Expand Down Expand Up @@ -46,7 +46,7 @@
"prettier": "^2.0.5",
"rimraf": "^3.0.0",
"rollup": "^1.27.5",
"rollup-plugin-svelte": "^5.0.3",
"rollup-plugin-svelte": "^6.1.1",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bumped the plugin as it resolves an issue I was having when compiling. See git issue for more details.

"rollup-plugin-typescript2": "0.21.0",
"svelte": "^3.12.1",
"svelte-i18n": "^1.1.2-beta",
Expand All @@ -59,6 +59,8 @@
"@ledgerhq/hw-app-eth": "^5.21.0",
"@ledgerhq/hw-transport-u2f": "^5.21.0",
"@portis/web3": "^4.0.0",
"@shapeshiftoss/hdwallet-core": "^1.14.0",
"@shapeshiftoss/hdwallet-keepkey-webusb": "^1.14.0",
"@toruslabs/torus-embed": "^1.9.2",
"@walletconnect/web3-provider": "^1.4.1",
"authereum": "^0.1.12",
Expand Down
2 changes: 2 additions & 0 deletions rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ export default {
'web3-provider-engine/subproviders/subscriptions',
'web3-provider-engine/subproviders/filters',
'eth-provider',
'@shapeshiftoss/hdwallet-keepkey-webusb',
'@shapeshiftoss/hdwallet-core',
'@gnosis.pm/safe-apps-sdk',
'@gnosis.pm/safe-apps-provider'
]
Expand Down
3 changes: 3 additions & 0 deletions src/@types/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,8 @@ declare module '@ledgerhq/hw-app-eth'
declare module '@ledgerhq/hw-transport-u2f'
declare module 'eth-provider'

declare module '@shapeshiftoss/hdwallet-core'
declare module '@shapeshiftoss/hdwallet-keepkey-webusb'

declare module '*.png'
declare module '*.svg'
2 changes: 1 addition & 1 deletion src/modules/check/connect.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ function connect(options: WalletCheckCustomOptions = {}): WalletCheckModule {
setTimeout(() => {
if (address === null) {
// if prom isn't resolving after 500ms, then stop waiting
resolve()
resolve(undefined)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixes TS error (red squiggles were bothering me)

}
}, 500)
})
Expand Down
3 changes: 2 additions & 1 deletion src/modules/check/derivation-path.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ const derivationPaths: DerivationPaths = {
{ path: `m/44'/60'`, label: 'Ethereum Ledger Live' }
],
Trezor: [{ path: `m/44'/60'/0'/0`, label: 'Ethereum' }],
Lattice: [{ path: `m/44'/60'/0'/0`, label: 'Ethereum' }]
Lattice: [{ path: `m/44'/60'/0'/0`, label: 'Ethereum' }],
KeepKey: [{ path: `m/44'/60'/0'/0`, label: 'Ethereum' }]
}

const styles = `
Expand Down
2 changes: 2 additions & 0 deletions src/modules/select/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,8 @@ function getModule(
return import('./wallets/alphawallet')
case 'ownbit':
return import('./wallets/ownbit')
case 'keepkey':
return import('./wallets/keepkey/')
case 'gnosis':
return import('./wallets/gnosis')
default:
Expand Down
Binary file added src/modules/select/wallet-icons/icon-keepkey.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading