Skip to content

Commit 5906049

Browse files
committed
Fix autoselect wallet bug
1 parent 54f88ab commit 5906049

File tree

1 file changed

+22
-13
lines changed

1 file changed

+22
-13
lines changed

src/views/WalletSelect.svelte

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -66,32 +66,41 @@
6666
return !osExclusions.includes(os)
6767
})
6868
69+
if (deviceWallets.find(wallet => wallet.preferred)) {
70+
// if preferred wallets, then split in to preferred and not preferred
71+
primaryWallets = deviceWallets.filter(wallet => wallet.preferred)
72+
secondaryWallets = deviceWallets.filter(wallet => !wallet.preferred)
73+
} else {
74+
// otherwise make the first 4 wallets preferred
75+
primaryWallets = deviceWallets.slice(0, 4)
76+
secondaryWallets =
77+
deviceWallets.length > 4 ? deviceWallets.slice(4) : undefined
78+
}
79+
80+
modalData = {
81+
heading,
82+
description,
83+
primaryWallets,
84+
secondaryWallets
85+
}
86+
6987
if (appState.autoSelectWallet) {
7088
const module = deviceWallets.find(
7189
(m: WalletModule) => m.name === appState.autoSelectWallet
7290
)
7391
7492
app.update(store => ({ ...store, autoSelectWallet: '' }))
7593
76-
module ? handleWalletSelect(module) : finish({ completed: false })
77-
} else {
78-
if (deviceWallets.find(wallet => wallet.preferred)) {
79-
// if preferred wallets, then split in to preferred and not preferred
80-
primaryWallets = deviceWallets.filter(wallet => wallet.preferred)
81-
secondaryWallets = deviceWallets.filter(wallet => !wallet.preferred)
82-
} else {
83-
// otherwise make the first 4 wallets preferred
84-
primaryWallets = deviceWallets.slice(0, 4)
85-
secondaryWallets =
86-
deviceWallets.length > 4 ? deviceWallets.slice(4) : undefined
87-
}
88-
8994
modalData = {
9095
heading,
9196
description,
9297
primaryWallets,
9398
secondaryWallets
9499
}
100+
101+
if (module) {
102+
handleWalletSelect(module)
103+
}
95104
}
96105
}
97106

0 commit comments

Comments
 (0)