decreased by
{{ change: localizeNumber(changeGets, language, options) }}
@@ -128,9 +131,6 @@ const render: MetaRenderFunctionWithTx = (
)
const invert =
CURRENCY_ORDER.indexOf(getsCurrency) > CURRENCY_ORDER.indexOf(paysCurrency)
- const pair = invert
- ? `${getsCurrency}/${paysCurrency}`
- : `${paysCurrency}/${getsCurrency}`
if (
action === 'created' &&
@@ -188,12 +188,29 @@ const render: MetaRenderFunctionWithTx = (
return (
-
- It {action} a {pair}
- owned by
-
- with sequence # {{ sequence: fields.Sequence }}
-
+
+ ),
+ Currency2: (
+
+ ),
+ Account: ,
+ }}
+ />
)
diff --git a/src/containers/Transactions/DetailTab/Meta/RippleState.tsx b/src/containers/Transactions/DetailTab/Meta/RippleState.tsx
index df9baac8d..d6a1decb6 100644
--- a/src/containers/Transactions/DetailTab/Meta/RippleState.tsx
+++ b/src/containers/Transactions/DetailTab/Meta/RippleState.tsx
@@ -4,6 +4,7 @@ import {
localizeNumber,
computeRippleStateBalanceChange,
} from '../../../shared/utils'
+import Currency from '../../../shared/components/Currency'
import type { MetaRenderFunction } from './types'
const render: MetaRenderFunction = (_t, language, action, node, index) => {
@@ -19,8 +20,11 @@ const render: MetaRenderFunction = (_t, language, action, node, index) => {
const line1 = (
- It {action} a {currency}
- ripplestate node between
+ It {action} a{' '}
+
+
+
+ RippleState node between
and
diff --git a/src/containers/Transactions/DetailTab/Meta/index.tsx b/src/containers/Transactions/DetailTab/Meta/index.tsx
index a7a6cc226..39ebf7ed3 100644
--- a/src/containers/Transactions/DetailTab/Meta/index.tsx
+++ b/src/containers/Transactions/DetailTab/Meta/index.tsx
@@ -1,5 +1,6 @@
import { FC } from 'react'
import { useTranslation } from 'react-i18next'
+import { TFunction } from 'i18next'
import renderAccountRoot from './AccountRoot'
import renderDirectoryNode from './DirectoryNode'
import renderOffer from './Offer'
@@ -10,7 +11,12 @@ import renderMPTokenIssuance from './MPTokenIssuance'
import { groupAffectedNodes } from '../../../shared/transactionUtils'
import { useLanguage } from '../../../shared/hooks'
-const renderDefault = (t, action, node, index) => (
+const renderDefault = (
+ t: TFunction<'translations', undefined>,
+ action: string,
+ node: any,
+ index: number,
+) => (
{t('node_meta_type', { action })} {node.LedgerEntryType}
@@ -20,7 +26,7 @@ export const TransactionMeta: FC<{ data: any }> = ({ data }) => {
const language = useLanguage()
const { t } = useTranslation()
- const renderNodesMeta = (action, list, tx) => {
+ const renderNodesMeta = (action: string, list: any[], tx: any) => {
const meta = list.map((node, index) => {
switch (node.LedgerEntryType) {
case 'AccountRoot':
diff --git a/src/containers/Transactions/test/Meta.test.tsx b/src/containers/Transactions/test/Meta.test.tsx
index 65077b327..73aab48d7 100644
--- a/src/containers/Transactions/test/Meta.test.tsx
+++ b/src/containers/Transactions/test/Meta.test.tsx
@@ -36,7 +36,7 @@ describe('TransactionMeta container', () => {
const listItems = container.querySelectorAll('li')
- // Check first list item contains expected content
+ // Check first list item contains expected content (AccountRoot)
expect(listItems[0]).toHaveTextContent('owned_account_root')
expect(listItems[0]).toHaveTextContent('rUmustd4TbkjaEuS7S1damozpBEREgRz9z')
expect(listItems[0]).toHaveTextContent('Balance decreased by')
@@ -62,10 +62,8 @@ describe('TransactionMeta container', () => {
expect(listItems[6]).toHaveTextContent('transaction_owned_directory')
expect(listItems[6]).toHaveTextContent('rETx8GBiH6fxhTcfHM9fGeyShqxozyD3xe')
- // Check offer modification
- expect(listItems[7]).toHaveTextContent('XRP/CNY')
- expect(listItems[7]).toHaveTextContent('rEGoBvzusE2MkDn3yrgZc817XiwRofqoJq')
- expect(listItems[7]).toHaveTextContent('1181517')
+ // Check first offer modification
+ expect(listItems[7]).toHaveTextContent('offer_node_meta')
expect(listItems[8]).toHaveTextContent('offer_partially_filled')
@@ -79,11 +77,7 @@ describe('TransactionMeta container', () => {
)
// Check second offer modification
- expect(listItems[11]).toHaveTextContent('XRP/CNY')
- expect(listItems[11]).toHaveTextContent(
- 'rUmustd4TbkjaEuS7S1damozpBEREgRz9z',
- )
- expect(listItems[11]).toHaveTextContent('5804')
+ expect(listItems[11]).toHaveTextContent('offer_node_meta')
expect(listItems[12]).toHaveTextContent('offer_partially_filled')
@@ -95,7 +89,7 @@ describe('TransactionMeta container', () => {
// Check ripplestate nodes
expect(listItems[15]).toHaveTextContent('CNY')
- expect(listItems[15]).toHaveTextContent('ripplestate')
+ expect(listItems[15]).toHaveTextContent('RippleState')
expect(listItems[15]).toHaveTextContent(
'rUmustd4TbkjaEuS7S1damozpBEREgRz9z',
)
@@ -103,17 +97,17 @@ describe('TransactionMeta container', () => {
expect(listItems[16]).toHaveTextContent('Balance changed by')
expect(listItems[17]).toHaveTextContent('CNY')
- expect(listItems[17]).toHaveTextContent('ripplestate')
+ expect(listItems[17]).toHaveTextContent('RippleState')
expect(listItems[18]).toHaveTextContent('Balance changed by')
expect(listItems[19]).toHaveTextContent('CNY')
- expect(listItems[19]).toHaveTextContent('ripplestate')
+ expect(listItems[19]).toHaveTextContent('RippleState')
expect(listItems[20]).toHaveTextContent('Balance changed by')
expect(listItems[21]).toHaveTextContent('CNY')
- expect(listItems[21]).toHaveTextContent('ripplestate')
+ expect(listItems[21]).toHaveTextContent('RippleState')
expect(listItems[22]).toHaveTextContent('Balance changed by')
})
diff --git a/src/containers/shared/components/Transaction/OfferCancel/test/OfferCreateDescription.test.tsx b/src/containers/shared/components/Transaction/OfferCancel/test/OfferCancelDescription.test.tsx
similarity index 100%
rename from src/containers/shared/components/Transaction/OfferCancel/test/OfferCreateDescription.test.tsx
rename to src/containers/shared/components/Transaction/OfferCancel/test/OfferCancelDescription.test.tsx
diff --git a/src/containers/shared/components/Transaction/OfferCancel/test/OfferCreateSimple.test.tsx b/src/containers/shared/components/Transaction/OfferCancel/test/OfferCancelSimple.test.tsx
similarity index 100%
rename from src/containers/shared/components/Transaction/OfferCancel/test/OfferCreateSimple.test.tsx
rename to src/containers/shared/components/Transaction/OfferCancel/test/OfferCancelSimple.test.tsx
diff --git a/src/containers/shared/components/Transaction/OfferCancel/test/OfferCreateTableDetail.test.tsx b/src/containers/shared/components/Transaction/OfferCancel/test/OfferCancelTableDetail.test.tsx
similarity index 100%
rename from src/containers/shared/components/Transaction/OfferCancel/test/OfferCreateTableDetail.test.tsx
rename to src/containers/shared/components/Transaction/OfferCancel/test/OfferCancelTableDetail.test.tsx
diff --git a/src/containers/shared/components/Transaction/OfferCreate/Description.tsx b/src/containers/shared/components/Transaction/OfferCreate/Description.tsx
index 10764b7c8..eb3b463ee 100644
--- a/src/containers/shared/components/Transaction/OfferCreate/Description.tsx
+++ b/src/containers/shared/components/Transaction/OfferCreate/Description.tsx
@@ -4,7 +4,6 @@ import {
DATE_OPTIONS,
CURRENCY_ORDER,
XRP_BASE,
- normalizeAmount,
} from '../../../transactionUtils'
import { Account } from '../../Account'
import {
@@ -12,6 +11,9 @@ import {
TransactionDescriptionProps,
} from '../types'
import { convertRippleDate } from '../../../../../rippled/lib/utils'
+import Currency from '../../Currency'
+import { Amount } from '../../Amount'
+import { formatAmount } from '../../../../../rippled/lib/txSummary/formatAmount'
const normalize = (amount: any) => amount.value || amount / XRP_BASE
@@ -33,9 +35,37 @@ const Description: TransactionDescriptionComponent = (
if (invert) {
rate = 1 / rate
- pair = `${getsCurrency}/${paysCurrency}`
+ pair = (
+
+
+ /
+
+
+ )
} else {
- pair = `${paysCurrency}/${getsCurrency}`
+ pair = (
+
+
+ /
+
+
+ )
}
const renderLine4 = () => {
@@ -66,13 +96,11 @@ const Description: TransactionDescriptionComponent = (
offered to pay
- {normalizeAmount(data.tx.TakerGets, language)}
- {data.tx.TakerGets.currency || 'XRP'}
+
in order to receive
- {normalizeAmount(data.tx.TakerPays, language)}
- {data.tx.TakerPays.currency || 'XRP'}
+
@@ -80,7 +108,7 @@ const Description: TransactionDescriptionComponent = (
{t('offer_create_desc_line_2')}
{rate.toPrecision(5)}
- {pair}
+ {pair}
{data.tx.OfferSequence && (
diff --git a/src/containers/shared/components/Transaction/OfferCreate/test/OfferCreateDescription.test.tsx b/src/containers/shared/components/Transaction/OfferCreate/test/OfferCreateDescription.test.tsx
index 4e5ea5ee3..0b9921e84 100644
--- a/src/containers/shared/components/Transaction/OfferCreate/test/OfferCreateDescription.test.tsx
+++ b/src/containers/shared/components/Transaction/OfferCreate/test/OfferCreateDescription.test.tsx
@@ -11,7 +11,7 @@ describe('OfferCreate: Description', () => {
const { container, unmount } = renderComponent(OfferCreate)
expect(container.innerHTML).toBe(
- 'offer_create_desc_line_2 612.52XRP/CSC
offer_create_desc_line_3 44866443
The offer expiresMay 18, 2022 at 5:28:16 PM UTCunless cancelled before',
+ 'offer_create_desc_line_3 44866443
The offer expiresMay 18, 2022 at 5:28:16 PM UTCunless cancelled before',
)
unmount()
})
@@ -22,7 +22,7 @@ describe('OfferCreate: Description', () => {
)
expect(container.innerHTML).toBe(
- 'offer_create_desc_line_2 0.34690XRP/USD
offer_create_desc_line_3 80543309
',
+ 'offer_create_desc_line_3 80543309
',
)
unmount()
})
@@ -33,7 +33,7 @@ describe('OfferCreate: Description', () => {
)
expect(container.innerHTML).toBe(
- 'offer_create_desc_line_2 0.00056856XRP/USD
offer_create_desc_line_5: 4A4879496CFF23CA32242D50DA04DDB41F4561167276A62AF21899F83DF28812
',
+ 'offer_create_desc_line_5: 4A4879496CFF23CA32242D50DA04DDB41F4561167276A62AF21899F83DF28812
',
)
unmount()
})