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

Pass include currencyCode in spendInfo to getMaxSpendable #583

Merged
merged 1 commit into from
Jan 18, 2024
Merged
Show file tree
Hide file tree
Changes from all 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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## Unreleased

- added: Make swap timeouts adjustable.
- fixed: Provide a `currencyCode` fallback to `EdgeCurrencyEngine.getMaxSpendable`.

## 2.0.1 (2024-01-08)

Expand Down
18 changes: 11 additions & 7 deletions src/core/currency/wallet/currency-wallet-api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -388,20 +388,24 @@ export function makeCurrencyWalletApi(
},
async getMaxSpendable(spendInfo: EdgeSpendInfo): Promise<string> {
spendInfo = upgradeMemos(spendInfo, plugin.currencyInfo)
// Figure out which asset this is:
const upgradedCurrency = upgradeCurrencyCode({
allTokens: input.props.state.accounts[accountId].allTokens[pluginId],
currencyInfo: plugin.currencyInfo,
tokenId: spendInfo.tokenId
})

if (typeof engine.getMaxSpendable === 'function') {
// Only provide wallet info if currency requires it:
const privateKeys = unsafeMakeSpend ? walletInfo.keys : undefined

return await engine.getMaxSpendable(spendInfo, { privateKeys })
return await engine.getMaxSpendable(
{ ...spendInfo, ...upgradedCurrency },
{ privateKeys }
)
}

// Figure out which asset this is:
const { networkFeeOption, customNetworkFee } = spendInfo
const upgradedCurrency = upgradeCurrencyCode({
allTokens: input.props.state.accounts[accountId].allTokens[pluginId],
currencyInfo: plugin.currencyInfo,
tokenId: spendInfo.tokenId
})
const balance = engine.getBalance(upgradedCurrency)

// Copy all the spend targets, setting the amounts to 0
Expand Down
Loading