ekzyis/stacker.news
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix filter for wallets that can send

Browse Source 
Testing for canSend is not enough since it can also return true if the wallet is not enabled.

This is the case because we want to allow disabling wallets but canSend must still return true in this case if send is configured.

This should probably be changed such that canSend only returns true when the wallet is enabled without preventing disabling of wallets.
This commit is contained in:
ekzyis 2024-11-27 17:55:27 +01:00
parent b1cdd953a0
commit 14a92ee5ce
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
wallets/payment.js
View File

@ -34,7 +34,7 @@ export function useWalletPayment () {
const walletsWithPayments = useMemo(() => { const walletsWithPayments = useMemo(() => {
return wallets return wallets
.filter(wallet => canSend(wallet)) .filter(wallet => canSend(wallet) && wallet.config.enabled)
.map(wallet => { .map(wallet => {
const logger = loggers[wallet.def.name] const logger = loggers[wallet.def.name]
return { return {
@ -48,6 +48,12 @@ export function useWalletPayment () {
let walletError = new WalletAggregateError([]) let walletError = new WalletAggregateError([])
let walletInvoice = invoice let walletInvoice = invoice
// throw a special error that caller can handle separately if no payment was attempted
const noWalletAvailable = walletsWithPayments.length === 0
if (noWalletAvailable) {
throw new WalletsNotAvailableError()
}
for (const [i, wallet] of walletsWithPayments.entries()) { for (const [i, wallet] of walletsWithPayments.entries()) {
const controller = invoiceController(walletInvoice, invoiceHelper.isInvoice) const controller = invoiceController(walletInvoice, invoiceHelper.isInvoice)
try { try {
@ -94,13 +100,6 @@ export function useWalletPayment () {
} }
// if we reach this line, no wallet payment succeeded // if we reach this line, no wallet payment succeeded
// throw a special error that caller can handle separately if no payment was attempted
const noWalletAvailable = walletError.errors.every(e => e instanceof WalletConfigurationError)
if (noWalletAvailable) {
throw new WalletsNotAvailableError()
}
// only return payment errors // only return payment errors
const paymentErrors = walletError.errors.filter(e => e instanceof WalletPaymentError) const paymentErrors = walletError.errors.filter(e => e instanceof WalletPaymentError)
throw new WalletAggregateError(paymentErrors, walletInvoice) throw new WalletAggregateError(paymentErrors, walletInvoice)