Skip to content

Commit 1f50104

Browse files
authored
Merge pull request #16 from blocknative/develop
Release 0.1.1
2 parents 7f71695 + 7d18a15 commit 1f50104

File tree

8 files changed

+28
-30
lines changed

8 files changed

+28
-30
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "bnc-onboard",
3-
"version": "0.1.0",
3+
"version": "0.1.1",
44
"main": "dist/cjs/index.js",
55
"module": "dist/esm/index.js",
66
"files": [

src/components/ModalHeader.svelte

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
font-weight: bold;
2929
font-size: 1.33rem;
3030
margin: 0 0 0 0.5rem;
31-
color: #4a4a4a;
3231
}
3332
</style>
3433

src/modules/ready/balance.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
function balance(minimum) {
22
return ({ balance, BigNumber }) => {
3-
// if balance is less than minimum (compare < 1)
4-
if (BigNumber(balance).lte(BigNumber(minimum || 0))) {
3+
// if balance is less than minimum
4+
if (BigNumber(balance).lt(BigNumber(minimum || 0))) {
55
return {
66
heading: "Get Some ETH",
77
description: `Your current account has less than the necessary minimum balance of ${BigNumber(
88
minimum
99
)
1010
.div(BigNumber("1000000000000000000"))
11-
.toString()} ETH.`,
11+
.toString(10)} ETH.`,
1212
eventCode: "nsfFail",
1313
icon: `
1414
<svg height="18" viewBox="0 0 429 695" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="currentColor" fill-rule="evenodd"><path d="m0 394 213 126.228516 214-126.228516-214 301z"/><path d="m0 353.962264 213.5-353.962264 213.5 353.962264-213.5 126.037736z"/></g></svg>

src/modules/select/wallets/dapper.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ function dapper() {
4343
id: 1
4444
},
4545
(e, res) => {
46-
resolve(BigNumber(res.result).toString())
46+
resolve(BigNumber(res.result).toString(10))
4747
}
4848
)
4949
})

src/modules/select/wallets/fortmatic.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ function fortmatic(options) {
4848
res[0]
4949
? BigNumber(res[0].crypto_amount)
5050
.times(BigNumber("1000000000000000000"))
51-
.toString()
51+
.toString(10)
5252
: null
5353
)
5454
}

src/modules/select/wallets/portis.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ function portis(options) {
6161
id: 1
6262
},
6363
(e, res) => {
64-
resolve(BigNumber(res.result).toString())
64+
resolve(BigNumber(res.result).toString(10))
6565
}
6666
)
6767
}, 1)

src/utilities.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export function createModernProviderInterface(provider) {
4848
id: 1
4949
},
5050
(e, res) => {
51-
resolve(BigNumber(res.result).toString())
51+
resolve(BigNumber(res.result).toString(10))
5252
}
5353
)
5454
})
@@ -85,7 +85,7 @@ export function createLegacyProviderInterface(provider) {
8585
params: [provider._address, "latest"]
8686
},
8787
(e, res) => {
88-
resolve(BigNumber(res.result).toString())
88+
resolve(BigNumber(res.result).toString(10))
8989
}
9090
)
9191
})

src/views/WalletSelect.svelte

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -32,31 +32,30 @@
3232
const { wallets, heading, description } = module;
3333
const deviceWallets = wallets[mobileDevice ? "mobile" : "desktop"];
3434
35-
$: if ($app.autoSelectWallet) {
36-
const module = deviceWallets.find(m => m.name === $app.autoSelectWallet);
37-
handleWalletSelect(module);
38-
}
39-
4035
let primaryWallets;
4136
let secondaryWallets;
4237
43-
if (deviceWallets.find(wallet => wallet.preferred)) {
44-
// if preferred wallets, then split in to preferred and not preferred
45-
primaryWallets = deviceWallets.filter(wallet => wallet.preferred);
46-
secondaryWallets = deviceWallets.filter(wallet => !wallet.preferred);
38+
$: if ($app.autoSelectWallet) {
39+
const module = deviceWallets.find(m => m.name === $app.autoSelectWallet);
40+
handleWalletSelect(module);
4741
} else {
48-
// otherwise make the first 4 wallets preferred
49-
primaryWallets = deviceWallets.slice(0, 4);
50-
secondaryWallets = deviceWallets.length > 4 && deviceWallets.slice(4);
51-
}
42+
if (deviceWallets.find(wallet => wallet.preferred)) {
43+
// if preferred wallets, then split in to preferred and not preferred
44+
primaryWallets = deviceWallets.filter(wallet => wallet.preferred);
45+
secondaryWallets = deviceWallets.filter(wallet => !wallet.preferred);
46+
} else {
47+
// otherwise make the first 4 wallets preferred
48+
primaryWallets = deviceWallets.slice(0, 4);
49+
secondaryWallets = deviceWallets.length > 4 && deviceWallets.slice(4);
50+
}
5251
53-
// set the data to show in the modal if wallet hasn't been auto selected
54-
modalData = !$app.autoSelectWallet && {
55-
heading,
56-
description,
57-
primaryWallets,
58-
secondaryWallets
59-
};
52+
modalData = {
53+
heading,
54+
description,
55+
primaryWallets,
56+
secondaryWallets
57+
};
58+
}
6059
6160
function handleWalletSelect(module) {
6261
const { provider, interface: selectedWalletInterface } = module.wallet({

0 commit comments

Comments
 (0)