Chia-Network/chia-blockchain
1
0
Fork 0
mirror of https://github.com/Chia-Network/chia-blockchain.git synced 2024-09-20 08:05:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix OfferSummary render failure when an offer isn't requesting anything (#661)

Browse Source 
* Fix OfferSummary render failure when an offer isn't requesting anything

* `npm audit fix`

* Remove wrapping mojoToChia/CAT calls in a Number() instance.

* Minor tweak to to scale xch/txch mojos in the same way.

Co-authored-by: ChiaMineJP <admin@chiamine.jp>
This commit is contained in:
Jeff 2022-03-24 12:31:58 -07:00 committed by GitHub
parent 6d240f68d7
commit 054d7b342e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
package-lock.json generated
View File

@ -4996,9 +4996,9 @@
}
},
"node_modules/minimist": {
"version": "1.2.5",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
"version": "1.2.6",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
"integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
},
"node_modules/minimist-options": {
"version": "4.1.0",
@ -11639,9 +11639,9 @@
}
},
"minimist": {
"version": "1.2.5",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
"version": "1.2.6",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
"integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
},
"minimist-options": {
"version": "4.1.0",

11
packages/wallets/src/components/offers/OfferSummary.tsx
View File

@ -44,10 +44,13 @@ export default function OfferSummary(props: Props) {
const makerFee: number = summary.fees;
const makerAssetInfo = makerEntries.length === 1 ? lookupByAssetId(makerEntries[0][0]) : undefined;
const takerAssetInfo = takerEntries.length === 1 ? lookupByAssetId(takerEntries[0][0]) : undefined;
const makerAmount = makerEntries[0][0].toLowerCase() === 'xch' ? Number(mojoToChia(makerEntries[0][1])) : Number(mojoToCAT(makerEntries[0][1]));
const takerAmount = takerEntries[0][0].toLowerCase() === 'xch' ? Number(mojoToChia(takerEntries[0][1])) : Number(mojoToCAT(takerEntries[0][1]));
const makerExchangeRate = makerAssetInfo && takerAssetInfo ? takerAmount / makerAmount : undefined;
const takerExchangeRate = makerAssetInfo && takerAssetInfo ? makerAmount / takerAmount : undefined;
const makerAmount = makerEntries.length > 0 ? (['xch', 'txch'].includes(makerEntries[0][0].toLowerCase()) ? mojoToChia(makerEntries[0][1]) : mojoToCAT(makerEntries[0][1])) : undefined;
const takerAmount = takerEntries.length > 0 ? (['xch', 'txch'].includes(takerEntries[0][0].toLowerCase()) ? mojoToChia(takerEntries[0][1]) : mojoToCAT(takerEntries[0][1])) : undefined;
const canSetExchangeRate = makerAssetInfo && takerAssetInfo && makerAmount && takerAmount;
const makerExchangeRate = canSetExchangeRate ? takerAmount / makerAmount : undefined;
const takerExchangeRate = canSetExchangeRate ? makerAmount / takerAmount : undefined;
const [takerUnknownCATs, makerUnknownCATs] = useMemo(() => {
if (isMyOffer) {