Skip to content

Commit

Permalink
Merge branch 'staging' into remove-redux
Browse files Browse the repository at this point in the history
  • Loading branch information
mvadari committed Oct 15, 2024
2 parents b38467b + 3df3fb4 commit e614245
Show file tree
Hide file tree
Showing 117 changed files with 5,817 additions and 2,200 deletions.
3,767 changes: 2,114 additions & 1,653 deletions package-lock.json

Large diffs are not rendered by default.

26 changes: 13 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "XRPL Data Visualization",
"version": "1.5.0",
"dependencies": {
"@google-cloud/bigquery": "^7.6.1",
"@google-cloud/bigquery": "^7.9.1",
"@paystring/utils": "^2.0.0",
"@rollup/plugin-inject": "^5.0.5",
"@vitejs/plugin-react": "^4.2.1",
Expand All @@ -16,11 +16,11 @@
"bunyan": "^1.8.15",
"classnames": "^2.5.1",
"compression": "^1.7.4",
"d3": "^7.8.5",
"d3": "^7.9.0",
"d3-geo": "^3.1.0",
"d3-hexbin": "^0.2.2",
"d3-scale": "^4.0.2",
"debug": "^4.3.1",
"debug": "^4.3.7",
"dotenv": "^16.4.5",
"enzyme": "3.11.0",
"enzyme-adapter-react-17-updated": "^1.0.2",
Expand All @@ -38,13 +38,13 @@
"react-i18next": "^12.3.1",
"react-query": "^3.39.3",
"react-router": "^6.12.1",
"react-router-dom": "^6.24.0",
"react18-json-view": "^0.2.7",
"recharts": "^2.12.6",
"react-router-dom": "^6.26.1",
"react18-json-view": "^0.2.8",
"recharts": "^2.12.7",
"ripple-address-codec": "^5.0.0",
"topojson-client": "^3.0.0",
"usehooks-ts": "^3.1.0",
"vite": "^4.2.3",
"vite": "^5.4.8",
"vite-plugin-environment": "^1.1.3",
"vite-plugin-html": "^3.2.0",
"vite-plugin-svgr": "^4.2.0",
Expand All @@ -53,9 +53,9 @@
},
"devDependencies": {
"@babel/eslint-parser": "^7.22.6",
"@babel/preset-env": "^7.24.5",
"@babel/preset-env": "^7.25.7",
"@babel/preset-react": "^7.24.7",
"@types/create-hash": "^1.2.2",
"@types/create-hash": "^1.2.6",
"@types/enzyme": "^3.10.12",
"@types/jest": "^26.0.24",
"@types/lodash": "^4.17.6",
Expand All @@ -74,16 +74,16 @@
"eslint-config-react-app": "^7.0.1",
"eslint-plugin-flowtype": "^8.0.3",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jsx-a11y": "^6.7.1",
"eslint-plugin-jsx-a11y": "^6.9.0",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-react": "^7.34.2",
"eslint-plugin-react-hooks": "^4.6.0",
"jest-enzyme": "^7.1.0",
"jest-websocket-mock": "^2.5.0",
"lint-staged": "^15.2.5",
"lint-staged": "^15.2.10",
"mock-socket": "^9.1.5",
"moxios": "^0.4.0",
"nodemon": "^3.0.1",
"nodemon": "^3.1.4",
"npm-run-all": "^4.1.5",
"prettier": "^3.3.2",
"react-error-overlay": "6.0.11",
Expand All @@ -98,7 +98,7 @@
"stylelint-scss": "^5.3.2",
"ts-jest": "^26.5.6",
"ts-node": "^10.9.2",
"typescript": "^4.9.4",
"typescript": "^4.9.5",
"xrpl": "^3.1.0"
},
"resolutions": {
Expand Down
29 changes: 26 additions & 3 deletions public/locales/ca-CA/translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -445,8 +445,8 @@
"other_chain_destination": "Destinació a una altra xarxa",
"%_of_total_nodes_validators": "% total de nodes i validadors",
"version_display": "Versió: {{version}}",
"validators_count": "# de Validadors: {{vals_count}}",
"nodes_count": "# de Nodes: {{nodes_count}}",
"validator_count": "# de Validadors: {{val_count}}",
"node_count": "# de Nodes: {{node_count}}",
"current_stable_version": "Versió estable actual",
"stable_version": "{{stableVersion}}",
"nftoken_minter": "Encunyador NFT",
Expand Down Expand Up @@ -530,5 +530,28 @@
"last_update_time": null,
"asset_class": null,
"trading_pairs": null,
"deleted": null
"deleted": null,
"assets.mpt_tab_title": null,
"assets.no_mpts_message": null,
"transaction_type_name_MPTokenIssuanceCreate": null,
"transaction_type_name_MPTokenIssuanceDestroy": null,
"transaction_type_name_MPTokenIssuanceSet": null,
"transaction_type_name_MPTokenAuthorize": null,
"transaction_outstanding_balance_line_two": null,
"transaction_mptoken_line_one": null,
"transaction_mpt_issuance_line_one":null,
"mpt_issuance_id": null,
"asset_scale": null,
"metadata": null,
"max_amount": null,
"mpt_holder": null,
"check_mpt_id": null,
"outstanding_amount": null,
"locked": null,
"can_lock": null,
"require_auth": null,
"can_escrow": null,
"can_trade": null,
"can_transfer": null,
"can_clawback": null
}
29 changes: 26 additions & 3 deletions public/locales/en-US/translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@
"action": "action",
"assets": "Assets",
"assets.nft_tab_title": "Non-Fungible Tokens",
"assets.mpt_tab_title": "Multi-Purpose Tokens",
"assets.issued_tab_title": "Issued Tokens",
"assets.no_issued_message": "No tokens found.",
"assets.no_nfts_message": "No NFTs found.",
"assets.no_mpts_message": "No MPTs found.",
"network": "Network",
"amendments": "Amendments",
"network_name": "Unknown Network",
Expand Down Expand Up @@ -166,6 +168,10 @@
"transaction_type_name_EscrowCreate": "Escrow Create",
"transaction_type_name_EscrowFinish": "Escrow Finish",
"transaction_type_name_Invoke": "Invoke",
"transaction_type_name_MPTokenIssuanceCreate": "MPT Issuance Create",
"transaction_type_name_MPTokenIssuanceDestroy": "MPT Issuance Destroy",
"transaction_type_name_MPTokenIssuanceSet": "MPT Issuance Set",
"transaction_type_name_MPTokenAuthorize": "MPT Authorize",
"transaction_type_name_NFTokenAcceptOffer": "NFT Accept Offer",
"transaction_type_name_NFTokenBurn": "NFT Burn",
"transaction_type_name_NFTokenCancelOffer": "NFT Cancel Offer",
Expand Down Expand Up @@ -248,8 +254,11 @@
"node_meta_type": "It {{action}} a node with type",
"transaction_balance_line_one": "It <1><0>{{action}}</0></1> a <3><0>{{currency}}</0></3> RippleState node between <5><0>{{account}}</0></5> and <7><0>{{counterAccount}}</0></7>",
"transaction_balance_line_two": "Balance changed by <1><0>{{change}}</0></1> from <3><0>{{previousBalance}}</0></3> to <5><0>{{finalBalance}}</0></5>",
"transaction_outstanding_balance_line_two": "Outstanding balance changed by <1><0>{{change}}</0></1> from <3><0>{{previousBalance}}</0></3> to <5><0>{{finalBalance}}</0></5>",
"transaction_owned_directory": "It {{action}} a DirectoryNode node owned by",
"transaction_unowned_directory": "It {{action}} a DirectoryNode node",
"transaction_mptoken_line_one": "It <1><0>{{action}}</0></1> an MPToken node of <3><0>{{account}}</0></3>",
"transaction_mpt_issuance_line_one": "It <1><0>{{action}}</0></1> an MPTokenIssuance node of <3><0>{{account}}</0></3>",
"owned_account_root": "It {{action}} the AccountRoot node of",
"unowned_account_root": "It {{action}} the AccountRoot node",
"account_balance_increased": "Balance increased by <1><0>{{difference}}</0><1><0>{{currency}}</0></1></1> from <3><0>{{previous}}</0><1><0>{{currency}}</0></1></3> to <5><0>{{final}}</0><1><0>{{currency}}</0></1></5>",
Expand Down Expand Up @@ -445,8 +454,8 @@
"other_chain_destination": "Other Chain Destination",
"%_of_total_nodes_validators": "% of Total Nodes & Validators",
"version_display": "Version: {{version}}",
"validators_count": "# of Validators: {{vals_count}}",
"nodes_count": "# of Nodes: {{nodes_count}}",
"validator_count": "# of Validators: {{val_count}}",
"node_count": "# of Nodes: {{node_count}}",
"current_stable_version": "Current Stable Version",
"stable_version": "{{stableVersion}}",
"nftoken_minter": "NFT Minter",
Expand Down Expand Up @@ -530,5 +539,19 @@
"last_update_time": "Last Update Time",
"asset_class": "Asset Class",
"trading_pairs": "Trading Pairs",
"deleted": "Deleted"
"deleted": "Deleted",
"mpt_issuance_id": "MPT Issuance ID",
"asset_scale": "Asset Scale",
"metadata": "Metadata",
"max_amount": "Max Amount",
"mpt_holder": "MPT Holder",
"check_mpt_id": "Please check your MPT Issuance ID",
"outstanding_amount": "Issued Amount",
"locked": "Locked",
"can_lock": "Can Lock",
"require_auth": "Require Auth",
"can_escrow": "Can Escrow",
"can_trade": "Can Trade",
"can_transfer": "Can Transfer",
"can_clawback": "Can Clawback"
}
29 changes: 26 additions & 3 deletions public/locales/es-ES/translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -441,8 +441,8 @@
"other_chain_destination": "Otro Destino de Cadena",
"%_of_total_nodes_validators": "% Total de Nodos y Validadores",
"version_display": "Versión: {{version}}",
"validators_count": "# de Validadores: {{vals_count}}",
"nodes_count": "# de Nodos: {{nodes_count}}",
"validator_count": "# de Validadores: {{val_count}}",
"node_count": "# de Nodos: {{node_count}}",
"current_stable_version": "Versión Estable Actual",
"stable_version": "{{stableVersion}}",
"nftoken_minter": "Acuñador NFT",
Expand Down Expand Up @@ -526,5 +526,28 @@
"last_update_time": null,
"asset_class": null,
"trading_pairs": null,
"deleted": null
"deleted": null,
"assets.mpt_tab_title": null,
"assets.no_mpts_message": null,
"transaction_type_name_MPTokenIssuanceCreate": null,
"transaction_type_name_MPTokenIssuanceDestroy": null,
"transaction_type_name_MPTokenIssuanceSet": null,
"transaction_type_name_MPTokenAuthorize": null,
"transaction_outstanding_balance_line_two": null,
"transaction_mptoken_line_one": null,
"transaction_mpt_issuance_line_one":null,
"mpt_issuance_id": null,
"asset_scale": null,
"metadata": null,
"max_amount": null,
"mpt_holder": null,
"check_mpt_id": null,
"outstanding_amount": null,
"locked": null,
"can_lock": null,
"require_auth": null,
"can_escrow": null,
"can_trade": null,
"can_transfer": null,
"can_clawback": null
}
29 changes: 26 additions & 3 deletions public/locales/fr-FR/translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -443,8 +443,8 @@
"other_chain_destination": "Autre destination de chaîne",
"%_of_total_nodes_validators": "% des nœuds et des validateurs",
"version_display": "Version: {{version}}",
"validators_count": "nb de Validateurs: {{vals_count}}",
"nodes_count": "nb de Nœuds: {{nodes_count}}",
"validator_count": "nb de Validateurs: {{val_count}}",
"node_count": "nb de Nœuds: {{node_count}}",
"current_stable_version": "Version Stable Actuelle",
"stable_version": "{{stableVersion}}",
"nftoken_minter": "Créateur du NFT",
Expand Down Expand Up @@ -527,5 +527,28 @@
"last_update_time": null,
"asset_class": null,
"trading_pairs": null,
"deleted": null
"deleted": null,
"assets.mpt_tab_title": null,
"assets.no_mpts_message": null,
"transaction_type_name_MPTokenIssuanceCreate": null,
"transaction_type_name_MPTokenIssuanceDestroy": null,
"transaction_type_name_MPTokenIssuanceSet": null,
"transaction_type_name_MPTokenAuthorize": null,
"transaction_outstanding_balance_line_two": null,
"transaction_mptoken_line_one": null,
"transaction_mpt_issuance_line_one":null,
"mpt_issuance_id": null,
"asset_scale": null,
"metadata": null,
"max_amount": null,
"mpt_holder": null,
"check_mpt_id": null,
"outstanding_amount": null,
"locked": null,
"can_lock": null,
"require_auth": null,
"can_escrow": null,
"can_trade": null,
"can_transfer": null,
"can_clawback": null
}
29 changes: 26 additions & 3 deletions public/locales/ja-JP/translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -443,8 +443,8 @@
"other_chain_destination": null,
"%_of_total_nodes_validators": null,
"version_display": "バージョン: {{version}}",
"validators_count": "バリデータの数: {{vals_count}}",
"nodes_count": "ノードの数: {{nodes_count}}",
"validator_count": "バリデータの数: {{val_count}}",
"node_count": "ノードの数: {{node_count}}",
"current_stable_version": "現在の安定バージョン",
"stable_version": null,
"nftoken_minter": "NFT発行者",
Expand Down Expand Up @@ -526,5 +526,28 @@
"last_update_time": null,
"asset_class": null,
"trading_pairs": null,
"deleted": null
"deleted": null,
"assets.mpt_tab_title": null,
"assets.no_mpts_message": null,
"transaction_type_name_MPTokenIssuanceCreate": null,
"transaction_type_name_MPTokenIssuanceDestroy": null,
"transaction_type_name_MPTokenIssuanceSet": null,
"transaction_type_name_MPTokenAuthorize": null,
"transaction_outstanding_balance_line_two": null,
"transaction_mptoken_line_one": null,
"transaction_mpt_issuance_line_one":null,
"mpt_issuance_id": null,
"asset_scale": null,
"metadata": null,
"max_amount": null,
"mpt_holder": null,
"check_mpt_id": null,
"outstanding_amount": null,
"locked": null,
"can_lock": null,
"require_auth": null,
"can_escrow": null,
"can_trade": null,
"can_transfer": null,
"can_clawback": null
}
29 changes: 26 additions & 3 deletions public/locales/ko-KR/translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -441,8 +441,8 @@
"other_chain_destination": "다른 체인의 목적지",
"%_of_total_nodes_validators": "노드와 검증자의 총 비율",
"version_display": "버전: {{version}}",
"validators_count": "검증자 수: {{vals_count}}",
"nodes_count": "노드 수: {{nodes_count}}",
"validator_count": "검증자 수: {{val_count}}",
"node_count": "노드 수: {{node_count}}",
"current_stable_version": "현재 안정적인 버전",
"stable_version": "{{stableVersion}}",
"nftoken_minter": "NFT 발행자",
Expand Down Expand Up @@ -524,5 +524,28 @@
"last_update_time": null,
"asset_class": null,
"trading_pairs": null,
"deleted": null
"deleted": null,
"assets.mpt_tab_title": null,
"assets.no_mpts_message": null,
"transaction_type_name_MPTokenIssuanceCreate": null,
"transaction_type_name_MPTokenIssuanceDestroy": null,
"transaction_type_name_MPTokenIssuanceSet": null,
"transaction_type_name_MPTokenAuthorize": null,
"transaction_outstanding_balance_line_two": null,
"transaction_mptoken_line_one": null,
"transaction_mpt_issuance_line_one":null,
"mpt_issuance_id": null,
"asset_scale": null,
"metadata": null,
"max_amount": null,
"mpt_holder": null,
"check_mpt_id": null,
"outstanding_amount": null,
"locked": null,
"can_lock": null,
"require_auth": null,
"can_escrow": null,
"can_trade": null,
"can_transfer": null,
"can_clawback": null
}
Original file line number Diff line number Diff line change
@@ -1,20 +1,24 @@
import { mount } from 'enzyme'
import { I18nextProvider } from 'react-i18next'
import { MemoryRouter } from 'react-router'
import { QueryClientProvider } from 'react-query'
import i18n from '../../../../../../i18n/testConfig'
import { AMMAccountHeader, AmmDataType } from '../AMMAccountHeader'
import { flushPromises } from '../../../../../test/utils'
import { queryClient } from '../../../../../shared/QueryClient'

describe('AMM Account Header', () => {
const TEST_ACCOUNT_ID = 'rTEST_ACCOUNT'

const createWrapper = (state: AmmDataType) =>
mount(
<I18nextProvider i18n={i18n}>
<MemoryRouter initialEntries={[`accounts/${TEST_ACCOUNT_ID}`]}>
<AMMAccountHeader data={state} />
</MemoryRouter>
</I18nextProvider>,
<QueryClientProvider client={queryClient}>
<I18nextProvider i18n={i18n}>
<MemoryRouter initialEntries={[`accounts/${TEST_ACCOUNT_ID}`]}>
<AMMAccountHeader data={state} />
</MemoryRouter>
</I18nextProvider>
</QueryClientProvider>,
)

it('renders AMM account page', async () => {
Expand Down
Loading

0 comments on commit e614245

Please sign in to comment.