- {supportedLanguages
- .filter((language) => language !== currentLanguage)
- .map((language) => (
+ {Object.entries(supportedLanguages)
+ .filter(([language]) => language !== currentLanguage)
+ .map(([language, languageName]) => (
- {t(`language`, {
- context: language,
- defaultValue: '',
- })}
+ {languageName}
))}
diff --git a/src/containers/Header/NetworkPicker/NetworkPicker.scss b/src/containers/Header/NetworkPicker/NetworkPicker.scss
index cbcb3525f..dc6883df6 100644
--- a/src/containers/Header/NetworkPicker/NetworkPicker.scss
+++ b/src/containers/Header/NetworkPicker/NetworkPicker.scss
@@ -55,8 +55,13 @@
}
/* stylelint-disable-next-line selector-class-pattern -- needed here for variables */
- &.network-hooks_testnet {
- @include dropdown-network-item($hooks-testnet, $magenta-40);
+ &.network-xahau_mainnet {
+ @include dropdown-network-item($xahau-mainnet, $green-50);
+ }
+
+ /* stylelint-disable-next-line selector-class-pattern -- needed here for variables */
+ &.network-xahau_testnet {
+ @include dropdown-network-item($xahau-testnet, $magenta-40);
}
&.network-custom {
diff --git a/src/containers/Header/NetworkPicker/NetworkPicker.tsx b/src/containers/Header/NetworkPicker/NetworkPicker.tsx
index c9d12cb4e..aa8086f3c 100644
--- a/src/containers/Header/NetworkPicker/NetworkPicker.tsx
+++ b/src/containers/Header/NetworkPicker/NetworkPicker.tsx
@@ -18,7 +18,8 @@ const STATIC_ENV_LINKS: Record
= {
testnet: process.env.VITE_TESTNET_LINK,
devnet: process.env.VITE_DEVNET_LINK,
amm: process.env.VITE_AMM_LINK,
- hooks_testnet: process.env.VITE_HOOKS_TESTNET_LINK,
+ xahau_mainnet: process.env.VITE_XAHAU_MAINNET_LINK,
+ xahau_testnet: process.env.VITE_XAHAU_TESTNET_LINK,
}
const currentMode: string = process.env.VITE_ENVIRONMENT || 'mainnet'
diff --git a/src/containers/Ledgers/Ledgers.jsx b/src/containers/Ledgers/Ledgers.jsx
index e7c228a3a..c92db7336 100644
--- a/src/containers/Ledgers/Ledgers.jsx
+++ b/src/containers/Ledgers/Ledgers.jsx
@@ -13,7 +13,7 @@ import { getAction, getCategory } from '../shared/components/Transaction'
import { TransactionActionIcon } from '../shared/components/TransactionActionIcon/TransactionActionIcon'
import { Legend } from './Legend'
import { RouteLink } from '../shared/routing'
-import { LEDGER_ROUTE, TRANSACTION_ROUTE } from '../App/routes'
+import { LEDGER_ROUTE, TRANSACTION_ROUTE, VALIDATOR_ROUTE } from '../App/routes'
class Ledgers extends Component {
constructor(props) {
@@ -71,13 +71,16 @@ class Ledgers extends Component {
renderSelected = () => {
const { validators, selected } = this.state
const v = validators[selected] || {}
- const url = `/validators/${selected}`
return (
)
}
diff --git a/src/containers/Ledgers/test/LedgersPage.test.js b/src/containers/Ledgers/test/LedgersPage.test.js
index b35c3bdb7..2b5f474f4 100644
--- a/src/containers/Ledgers/test/LedgersPage.test.js
+++ b/src/containers/Ledgers/test/LedgersPage.test.js
@@ -81,14 +81,14 @@ describe('Ledgers Page container', () => {
let client
const middlewares = [thunk]
const mockStore = configureMockStore(middlewares)
- const createWrapper = (props = { network: 'main' }) => {
+ const createWrapper = (props = { network: 'main', path: '/' }) => {
const store = mockStore({ ...initialState })
return mount(
-
+
@@ -200,11 +200,11 @@ describe('Ledgers Page container', () => {
validations.first().simulate('mouseLeave')
expect(wrapper.find('.tooltip').length).toBe(0)
validations.first().simulate('focus')
- expect(wrapper.find('.selected-validator .pubkey').length).toBe(0)
+ expect(wrapper.find('.selected-validator a.pubkey').length).toBe(0)
validations.first().simulate('click') // set selected
- expect(wrapper.find('.selected-validator .pubkey').length).toBe(1)
+ expect(wrapper.find('.selected-validator a.pubkey').length).toBe(1)
validations.first().simulate('click') // unset selected
- expect(wrapper.find('.selected-validator .pubkey').length).toBe(0)
+ expect(wrapper.find('.selected-validator a.pubkey').length).toBe(0)
wrapper.unmount()
@@ -235,7 +235,10 @@ describe('Ledgers Page container', () => {
},
)
- const wrapper = createWrapper({ network: customNetwork })
+ const wrapper = createWrapper({
+ network: customNetwork,
+ path: '/my.custom.com',
+ })
expect(wrapper.find('.ledger').length).toBe(0)
expect(wrapper.find('.validation').length).toBe(0)
@@ -289,7 +292,11 @@ describe('Ledgers Page container', () => {
validations.first().simulate('focus')
expect(wrapper.find('.selected-validator .pubkey').length).toBe(0)
validations.first().simulate('click') // set selected
- expect(wrapper.find('.selected-validator .pubkey').length).toBe(1)
+ expect(wrapper.find('.selected-validator a.pubkey').length).toBe(1)
+ expect(wrapper.find('.selected-validator a.pubkey')).toHaveProp(
+ 'href',
+ '/validators/n9KaxgJv69FucW5kkiaMhCqS6sAR1wUVxpZaZmLGVXxAcAse9YhR',
+ )
validations.first().simulate('click') // unset selected
expect(wrapper.find('.selected-validator .pubkey').length).toBe(0)
diff --git a/src/containers/NFT/test/NFT.test.js b/src/containers/NFT/test/NFT.test.js
index 755720145..1a295b350 100644
--- a/src/containers/NFT/test/NFT.test.js
+++ b/src/containers/NFT/test/NFT.test.js
@@ -37,10 +37,13 @@ describe('NFT container', () => {
})
it('renders error', () => {
- const setState = jest.fn()
+ jest.mock('../NFTHeader/NFTHeader', () => ({
+ NFTHeader: ({ setError }) => {
+ setError(404)
+ },
+ }))
+
const wrapper = createWrapper('something')
- const useStateSpy = jest.spyOn(React, 'useState')
- useStateSpy.mockImplementation(() => [404, setState])
expect(wrapper.find('NoMatch').length).toBe(1)
})
})
diff --git a/src/containers/shared/NetworkContext.tsx b/src/containers/shared/NetworkContext.tsx
index 9fe576148..1617a74d8 100644
--- a/src/containers/shared/NetworkContext.tsx
+++ b/src/containers/shared/NetworkContext.tsx
@@ -7,7 +7,8 @@ const ENV_NETWORK_MAP: Record = {
testnet: 'test',
devnet: 'dev',
amm: 'amm-dev',
- hooks_testnet: 'hooks-test',
+ xahau_mainnet: 'xahau-main',
+ xahau_testnet: 'xahau-test',
}
function getNetworkName() {
diff --git a/src/containers/shared/components/Currency.tsx b/src/containers/shared/components/Currency.tsx
index e6473d5ee..64727ca0a 100644
--- a/src/containers/shared/components/Currency.tsx
+++ b/src/containers/shared/components/Currency.tsx
@@ -4,6 +4,7 @@ import { TOKEN_ROUTE } from '../../App/routes'
// https://xrpl.org/currency-formats.html#nonstandard-currency-codes
const NON_STANDARD_CODE_LENGTH = 40
const XRP = 'XRP'
+const LP_TOKEN_IDENTIFIER = '03'
export interface Props {
issuer?: string
@@ -26,10 +27,9 @@ const Currency = (props: Props) => {
displaySymbol = true,
} = props
- const LPTokenIdentifier = '03'
const currencyCode =
currency?.length === NON_STANDARD_CODE_LENGTH &&
- currency?.substring(0, 2) !== LPTokenIdentifier
+ currency?.substring(0, 2) !== LP_TOKEN_IDENTIFIER
? hexToString(currency)
: currency
diff --git a/src/containers/shared/components/DomainLink.tsx b/src/containers/shared/components/DomainLink.tsx
index 6e0c71feb..9fef0df07 100644
--- a/src/containers/shared/components/DomainLink.tsx
+++ b/src/containers/shared/components/DomainLink.tsx
@@ -7,14 +7,27 @@ export interface Props {
domain: string
}
+// Matches a protocol (e.g. 'http://' or 'https://') at the start of a string.
+const PROTOCOL_REGEX = /^([a-z][a-z0-9+\-.]*):\/\//
+
const DomainLink = (props: Props) => {
const { className, decode = false, domain } = props
+
+ // If decode is true, decode the domain
+ const decodedDomain = decode ? decodeHex(domain) : domain
+
+ // Use the test method to check for the protocol
+ const domainHasProtocol = PROTOCOL_REGEX.test(decodedDomain)
+
+ // If decoded domain does not have a protocol, add one ; otherwise, don't
+ const href = domainHasProtocol ? decodedDomain : `https://${decodedDomain}`
+
return (
{decode ? decodeHex(domain) : domain}
diff --git a/src/containers/shared/components/Transaction/NFTokenMint/parser.ts b/src/containers/shared/components/Transaction/NFTokenMint/parser.ts
index 998ab089f..81dbc527c 100644
--- a/src/containers/shared/components/Transaction/NFTokenMint/parser.ts
+++ b/src/containers/shared/components/Transaction/NFTokenMint/parser.ts
@@ -27,19 +27,21 @@ export const parser: TransactionParser = (
const previousTokenIDSet = new Set(
affectedNodes
- .flatMap((node: any) =>
- node.ModifiedNode?.PreviousFields?.NFTokens?.map(
- (token: any) => token.NFToken.NFTokenID,
- ),
+ .flatMap(
+ (node: any) =>
+ node.ModifiedNode?.PreviousFields?.NFTokens?.map(
+ (token: any) => token.NFToken.NFTokenID,
+ ),
)
.filter((id: any) => id),
)
const finalTokenIDs = affectedNodes
- .flatMap((node: any) =>
- (
- node.ModifiedNode?.FinalFields ?? node.CreatedNode?.NewFields
- )?.NFTokens?.map((token: any) => token.NFToken.NFTokenID),
+ .flatMap(
+ (node: any) =>
+ (
+ node.ModifiedNode?.FinalFields ?? node.CreatedNode?.NewFields
+ )?.NFTokens?.map((token: any) => token.NFToken.NFTokenID),
)
.filter((id: any) => id)
diff --git a/src/containers/shared/components/Transaction/SetHook/parser.ts b/src/containers/shared/components/Transaction/SetHook/parser.ts
index 9761f7c78..8e0e10ca0 100644
--- a/src/containers/shared/components/Transaction/SetHook/parser.ts
+++ b/src/containers/shared/components/Transaction/SetHook/parser.ts
@@ -8,10 +8,11 @@ export const parser = (tx: SetHook, meta: any): SetHookInstructions => {
(node.ModifiedNode?.LedgerEntryType === 'Hook' &&
!!node.ModifiedNode?.PreviousFields?.Hooks),
)
- const hashes = affectedNodes.flatMap((node: any) =>
- (node.ModifiedNode?.FinalFields ?? node.CreatedNode?.NewFields)?.Hooks?.map(
- (hook: any) => hook.Hook.HookHash,
- ),
+ const hashes = affectedNodes.flatMap(
+ (node: any) =>
+ (
+ node.ModifiedNode?.FinalFields ?? node.CreatedNode?.NewFields
+ )?.Hooks?.map((hook: any) => hook.Hook.HookHash),
)
// TODO: there may be bugs here when a `HookHash` is already specified in a hook
// It's difficult to understand what situation that would be in, so this is left here for now
diff --git a/src/containers/shared/components/TxToken.tsx b/src/containers/shared/components/TxToken.tsx
index 515b1dcbb..d7127d774 100644
--- a/src/containers/shared/components/TxToken.tsx
+++ b/src/containers/shared/components/TxToken.tsx
@@ -1,3 +1,6 @@
+import { Trans } from 'react-i18next'
+import Currency from './Currency'
+
import '../css/txlabel.scss'
interface Props {
@@ -18,12 +21,28 @@ function getTokenPair(
type === 'Payment'
) {
const first =
- amount?.amount && amount.amount !== fee ? amount.currency : undefined
+ amount?.amount && amount.amount !== fee ? (
+
+ ) : undefined
const second =
- amount2?.amount && amount2.amount !== fee ? amount2.currency : undefined
+ amount2?.amount && amount2.amount !== fee ? (
+
+ ) : undefined
if (first && second) {
- return first + (type === 'Payment' ? ' for ' : ' and ') + second
+ return (
+
+ )
}
return first || second
@@ -39,8 +58,8 @@ const TxToken = (props: Props) => {
{getTokenPair(
tx.type,
tx.fee,
- tx.details.instructions.amount,
- tx.details.instructions.amount2,
+ tx.details?.instructions?.amount,
+ tx.details?.instructions?.amount2,
)}
)
diff --git a/src/containers/shared/components/test/DomainLink.test.tsx b/src/containers/shared/components/test/DomainLink.test.tsx
index 6942bddb9..dcfbb015d 100644
--- a/src/containers/shared/components/test/DomainLink.test.tsx
+++ b/src/containers/shared/components/test/DomainLink.test.tsx
@@ -38,4 +38,13 @@ describe('DomainLink', () => {
expect(wrapper.find('a').props().href).toEqual('https://sologenic.com')
wrapper.unmount()
})
+ it('handles domain link with domain provided in HEX-encoded format', () => {
+ const url = 'https://example.com'
+ const urlInHex = '68747470733A2F2F6578616D706C652E636F6D'
+ const wrapper = mount(