Support for MPT-DEX in Explorer #1302
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,10 +8,39 @@ import { | |
| import { localizeNumber } from '../../../shared/utils' | ||
| import { Account } from '../../../shared/components/Account' | ||
| import Currency from '../../../shared/components/Currency' | ||
| import type { Amount } from '../../../shared/types' | ||
| import type { MetaRenderFunctionWithTx, MetaNode } from './types' | ||
|
|
||
| const isMPTOrIOUAmount = ( | ||
| takerAmount: Amount | undefined, | ||
| ): takerAmount is Exclude<Amount, string> => | ||
| typeof takerAmount === 'object' && takerAmount !== null | ||
|
|
||
| const getCurrency = (takerAmount: Amount | undefined): string => { | ||
| if (!isMPTOrIOUAmount(takerAmount)) return 'XRP' | ||
| if ('mpt_issuance_id' in takerAmount) return takerAmount.mpt_issuance_id | ||
| return takerAmount.currency || 'XRP' | ||
| } | ||
|
|
||
| const getIsMPT = (takerAmount: Amount | undefined): boolean => | ||
| isMPTOrIOUAmount(takerAmount) && 'mpt_issuance_id' in takerAmount | ||
|
|
||
| const getIssuer = (takerAmount: Amount | undefined): string | undefined => { | ||
| if (!isMPTOrIOUAmount(takerAmount)) return undefined | ||
| if ('mpt_issuance_id' in takerAmount) return undefined | ||
| return takerAmount.issuer | ||
| } | ||
|
|
||
| const normalize = ( | ||
| value: number | string, | ||
| currency: string, | ||
| isMPT: boolean = false, | ||
| ): string => { | ||
| if (isMPT) return String(value) | ||
| return currency === 'XRP' | ||
| ? (Number(value) / XRP_BASE).toString() | ||
| : String(value) | ||
| } | ||
|
|
||
| const renderChanges = ( | ||
| _t: any, | ||
|
|
@@ -22,14 +51,16 @@ const renderChanges = ( | |
| const meta: JSX.Element[] = [] | ||
| const final = node.FinalFields | ||
| const prev = node?.PreviousFields | ||
| const paysCurrency = getCurrency(final.TakerPays) | ||
| const getsCurrency = getCurrency(final.TakerGets) | ||
| const paysIsMPT = getIsMPT(final.TakerPays) | ||
| const getsIsMPT = getIsMPT(final.TakerGets) | ||
| const finalPays = final.TakerPays.value || final.TakerPays | ||
| const finalGets = final.TakerGets.value || final.TakerGets | ||
| const prevPays = prev?.TakerPays?.value || prev?.TakerPays | ||
| const prevGets = prev?.TakerGets?.value || prev?.TakerGets | ||
| const changePays = normalize(prevPays - finalPays, paysCurrency, paysIsMPT) | ||
| const changeGets = normalize(prevGets - finalGets, getsCurrency, getsIsMPT) | ||
|
|
||
| if (prevPays && finalPays) { | ||
| const options = { ...CURRENCY_OPTIONS, currency: paysCurrency } | ||
|
|
@@ -39,7 +70,8 @@ const renderChanges = ( | |
| <b> | ||
| <Currency | ||
| currency={paysCurrency} | ||
| issuer={getIssuer(final.TakerPays)} | ||
| isMPT={paysIsMPT} | ||
| displaySymbol={false} | ||
| /> | ||
| </b>{' '} | ||
|
|
@@ -57,7 +89,7 @@ const renderChanges = ( | |
| { | ||
| { | ||
| previous: localizeNumber( | ||
| normalize(prevPays, paysCurrency, paysIsMPT), | ||
|
Collaborator
There was a problem hiding this comment. localizeNumber has a argument isMPT, should we set it in all of the localizeNumber calls here (e.g payIsMPT) so that BigInt will be execute?
Contributor
Author
There was a problem hiding this comment. follow-up in b02b7c6: added regression tests in Meta.test.tsx covering all 6 localizeNumber calls, plus mixed MPT/XRP offers and the MPToken/MPTokenIssuance renderers. they surfaced a small bug where Intl.NumberFormat rejected the mpt_issuance_id as a currency code (it validates |
||
| language, | ||
| options, | ||
| ), | ||
|
|
@@ -69,7 +101,7 @@ const renderChanges = ( | |
| { | ||
| { | ||
| final: localizeNumber( | ||
| normalize(finalPays, paysCurrency, paysIsMPT), | ||
| language, | ||
| options, | ||
| ), | ||
|
|
@@ -88,7 +120,8 @@ const renderChanges = ( | |
| <b> | ||
| <Currency | ||
| currency={getsCurrency} | ||
| issuer={getIssuer(final.TakerGets)} | ||
| isMPT={getsIsMPT} | ||
| displaySymbol={false} | ||
| /> | ||
| </b>{' '} | ||
|
|
@@ -106,7 +139,7 @@ const renderChanges = ( | |
| { | ||
| { | ||
| previous: localizeNumber( | ||
| normalize(prevGets, getsCurrency, getsIsMPT), | ||
| language, | ||
| options, | ||
| ), | ||
|
|
@@ -118,7 +151,7 @@ const renderChanges = ( | |
| { | ||
| { | ||
| final: localizeNumber( | ||
| normalize(finalGets, getsCurrency, getsIsMPT), | ||
| language, | ||
| options, | ||
| ), | ||
|
|
@@ -143,11 +176,14 @@ const render: MetaRenderFunctionWithTx = ( | |
| ) => { | ||
| const lines: JSX.Element[] = [] | ||
| const fields = node.FinalFields || node.NewFields | ||
| const paysCurrency = getCurrency(fields.TakerPays) | ||
| const getsCurrency = getCurrency(fields.TakerGets) | ||
| const paysIsMPT = getIsMPT(fields.TakerPays) | ||
| const getsIsMPT = getIsMPT(fields.TakerGets) | ||
| const takerPaysValue = normalize( | ||
| fields.TakerPays.value || fields.TakerPays, | ||
| paysCurrency, | ||
| paysIsMPT, | ||
| ) | ||
| const invert = | ||
| CURRENCY_ORDER.indexOf(getsCurrency) > CURRENCY_ORDER.indexOf(paysCurrency) | ||
|
|
@@ -214,16 +250,22 @@ const render: MetaRenderFunctionWithTx = ( | |
| components={{ | ||
| Currency: ( | ||
| <Currency | ||
| currency={invert ? getsCurrency : paysCurrency} | ||
| issuer={ | ||
| invert ? getIssuer(tx.TakerGets) : getIssuer(tx.TakerPays) | ||
| } | ||
| isMPT={invert ? getsIsMPT : paysIsMPT} | ||
| displaySymbol={false} | ||
| shortenIssuer | ||
| /> | ||
| ), | ||
| Currency2: ( | ||
| <Currency | ||
| currency={invert ? paysCurrency : getsCurrency} | ||
| issuer={ | ||
| invert ? getIssuer(tx.TakerPays) : getIssuer(tx.TakerGets) | ||
| } | ||
| isMPT={invert ? paysIsMPT : getsIsMPT} | ||
| displaySymbol={false} | ||
| shortenIssuer | ||
| /> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we need to use
BigInthere like we do insrc/containers/shared/metaParser.tsx?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
thanks 67ba204