Skip to content

Commit

Permalink
Pass a currencyCode fallback to getMaxSpendable
Browse files Browse the repository at this point in the history
  • Loading branch information
peachbits authored and swansontec committed Jan 18, 2024
1 parent cd5572b commit 490b9f9
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 7 deletions.
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

0 comments on commit 490b9f9

Please sign in to comment.