diff --git a/apps/explorer/src/app/components/assets/assets-table.tsx b/apps/explorer/src/app/components/assets/assets-table.tsx index 697daae77..6f9afc60b 100644 --- a/apps/explorer/src/app/components/assets/assets-table.tsx +++ b/apps/explorer/src/app/components/assets/assets-table.tsx @@ -1,6 +1,6 @@ import type { AssetFieldsFragment } from '@vegaprotocol/assets'; import { AssetTypeMapping, AssetStatusMapping } from '@vegaprotocol/assets'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { ButtonLink } from '@vegaprotocol/ui-toolkit'; import type { AgGridReact } from 'ag-grid-react'; import { AgGridColumn } from 'ag-grid-react'; diff --git a/apps/explorer/src/app/components/blocks/block-data.tsx b/apps/explorer/src/app/components/blocks/block-data.tsx index 04d85743f..8fc6c572d 100644 --- a/apps/explorer/src/app/components/blocks/block-data.tsx +++ b/apps/explorer/src/app/components/blocks/block-data.tsx @@ -6,7 +6,7 @@ import { getDateTimeFormat } from '@vegaprotocol/utils'; import { Tooltip } from '@vegaprotocol/ui-toolkit'; import { TimeAgo } from '../time-ago'; import { TableWithTbody, TableRow, TableCell } from '../table'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; interface BlockProps { block: BlockMeta; diff --git a/apps/explorer/src/app/components/blocks/blocks-data.tsx b/apps/explorer/src/app/components/blocks/blocks-data.tsx index a352f879e..95752e7e2 100644 --- a/apps/explorer/src/app/components/blocks/blocks-data.tsx +++ b/apps/explorer/src/app/components/blocks/blocks-data.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import React from 'react'; import type { TendermintBlockchainResponse } from '../../routes/blocks/tendermint-blockchain-response'; import { BlockData } from './block-data'; diff --git a/apps/explorer/src/app/components/blocks/blocks-infinite-list.tsx b/apps/explorer/src/app/components/blocks/blocks-infinite-list.tsx index 70ffbc67e..254071e1e 100644 --- a/apps/explorer/src/app/components/blocks/blocks-infinite-list.tsx +++ b/apps/explorer/src/app/components/blocks/blocks-infinite-list.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { FixedSizeList as List } from 'react-window'; import InfiniteLoader from 'react-window-infinite-loader'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { BlockMeta } from '../../routes/blocks/tendermint-blockchain-response'; import { BlockData } from './block-data'; import EmptyList from '../empty-list/empty-list'; diff --git a/apps/explorer/src/app/components/blocks/blocks-refetch.tsx b/apps/explorer/src/app/components/blocks/blocks-refetch.tsx index 0b2bbe14e..4a8ebe9ac 100644 --- a/apps/explorer/src/app/components/blocks/blocks-refetch.tsx +++ b/apps/explorer/src/app/components/blocks/blocks-refetch.tsx @@ -1,6 +1,6 @@ import { useState, useEffect } from 'react'; import { useTendermintWebsocket } from '../../hooks/use-tendermint-websocket'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { ButtonLink } from '@vegaprotocol/ui-toolkit'; interface BlocksRefetchProps { diff --git a/apps/explorer/src/app/components/dialogs/json-viewer-dialog.tsx b/apps/explorer/src/app/components/dialogs/json-viewer-dialog.tsx index 80a4d9c52..4e80854a3 100644 --- a/apps/explorer/src/app/components/dialogs/json-viewer-dialog.tsx +++ b/apps/explorer/src/app/components/dialogs/json-viewer-dialog.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { Button, Dialog, diff --git a/apps/explorer/src/app/components/epoch-overview/epoch-missing.tsx b/apps/explorer/src/app/components/epoch-overview/epoch-missing.tsx index 88351db2a..a3e53efa1 100644 --- a/apps/explorer/src/app/components/epoch-overview/epoch-missing.tsx +++ b/apps/explorer/src/app/components/epoch-overview/epoch-missing.tsx @@ -4,8 +4,7 @@ import addSeconds from 'date-fns/addSeconds'; import formatDistance from 'date-fns/formatDistance'; import { Icon, Tooltip } from '@vegaprotocol/ui-toolkit'; import isFuture from 'date-fns/isFuture'; -import { isValidDate } from '@vegaprotocol/utils'; -import { getSecondsFromInterval } from '@vegaprotocol/utils'; +import { getSecondsFromInterval, isValidDate } from '@vegaprotocol/utils'; export type EpochMissingOverviewProps = { missingEpochId?: string; diff --git a/apps/explorer/src/app/components/epoch-overview/epoch.tsx b/apps/explorer/src/app/components/epoch-overview/epoch.tsx index 18d74768c..6f25abaa8 100644 --- a/apps/explorer/src/app/components/epoch-overview/epoch.tsx +++ b/apps/explorer/src/app/components/epoch-overview/epoch.tsx @@ -1,6 +1,6 @@ import { useExplorerEpochQuery } from './__generated__/Epoch'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { BlockLink } from '../links'; import { Time } from '../time'; import { TimeAgo } from '../time-ago'; diff --git a/apps/explorer/src/app/components/footer/footer.tsx b/apps/explorer/src/app/components/footer/footer.tsx index 9f0769531..ce817c809 100644 --- a/apps/explorer/src/app/components/footer/footer.tsx +++ b/apps/explorer/src/app/components/footer/footer.tsx @@ -1,5 +1,5 @@ import { NodeSwitcherDialog, useEnvironment } from '@vegaprotocol/environment'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { useScreenDimensions } from '@vegaprotocol/react-helpers'; import { ExternalLink, Link } from '@vegaprotocol/ui-toolkit'; import { useMemo, useState } from 'react'; diff --git a/apps/explorer/src/app/components/header/header.tsx b/apps/explorer/src/app/components/header/header.tsx index af9b040ca..74d91e3c9 100644 --- a/apps/explorer/src/app/components/header/header.tsx +++ b/apps/explorer/src/app/components/header/header.tsx @@ -1,7 +1,7 @@ import classnames from 'classnames'; import { Link } from 'react-router-dom'; import { ThemeSwitcher, Icon } from '@vegaprotocol/ui-toolkit'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { Search } from '../search'; import { Routes } from '../../routes/route-names'; import { NetworkSwitcher } from '@vegaprotocol/environment'; diff --git a/apps/explorer/src/app/components/jump-to-block/index.tsx b/apps/explorer/src/app/components/jump-to-block/index.tsx index 6bc87fe5a..b8385d7f9 100644 --- a/apps/explorer/src/app/components/jump-to-block/index.tsx +++ b/apps/explorer/src/app/components/jump-to-block/index.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import React from 'react'; import { useNavigate } from 'react-router-dom'; import { Routes } from '../../routes/route-names'; diff --git a/apps/explorer/src/app/components/jump-to/index.tsx b/apps/explorer/src/app/components/jump-to/index.tsx index f88e43197..0aad73f3d 100644 --- a/apps/explorer/src/app/components/jump-to/index.tsx +++ b/apps/explorer/src/app/components/jump-to/index.tsx @@ -1,6 +1,6 @@ import type { HTMLInputTypeAttribute, SyntheticEvent } from 'react'; import { Input, Button } from '@vegaprotocol/ui-toolkit'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; interface JumpToProps { label: string; diff --git a/apps/explorer/src/app/components/links/market-link/market-link.tsx b/apps/explorer/src/app/components/links/market-link/market-link.tsx index 90070aa09..dbc45ea01 100644 --- a/apps/explorer/src/app/components/links/market-link/market-link.tsx +++ b/apps/explorer/src/app/components/links/market-link/market-link.tsx @@ -3,7 +3,7 @@ import { useExplorerMarketQuery } from './__generated__/Market'; import { Link } from 'react-router-dom'; import type { ComponentProps } from 'react'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import Hash from '../hash'; export type MarketLinkProps = Partial> & { diff --git a/apps/explorer/src/app/components/links/party-link/party-link.tsx b/apps/explorer/src/app/components/links/party-link/party-link.tsx index 7d79ac871..3524cdadf 100644 --- a/apps/explorer/src/app/components/links/party-link/party-link.tsx +++ b/apps/explorer/src/app/components/links/party-link/party-link.tsx @@ -3,7 +3,7 @@ import { Link } from 'react-router-dom'; import type { ComponentProps } from 'react'; import Hash from '../hash'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { isValidPartyId } from '../../../routes/parties/id/components/party-id-error'; import { truncateMiddle } from '@vegaprotocol/ui-toolkit'; diff --git a/apps/explorer/src/app/components/markets/market-details.tsx b/apps/explorer/src/app/components/markets/market-details.tsx index 386f7e49f..ab6e17549 100644 --- a/apps/explorer/src/app/components/markets/market-details.tsx +++ b/apps/explorer/src/app/components/markets/market-details.tsx @@ -2,8 +2,8 @@ import { addDecimalsFormatNumber, formatNumberPercentage, getMarketExpiryDateFormatted, - t, } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { MarketInfoNoCandlesQuery } from '@vegaprotocol/market-info'; import { MarketInfoTable } from '@vegaprotocol/market-info'; import pick from 'lodash/pick'; diff --git a/apps/explorer/src/app/components/markets/markets-table.tsx b/apps/explorer/src/app/components/markets/markets-table.tsx index 520d1376e..dd3c52127 100644 --- a/apps/explorer/src/app/components/markets/markets-table.tsx +++ b/apps/explorer/src/app/components/markets/markets-table.tsx @@ -1,5 +1,5 @@ import type { MarketFieldsFragment } from '@vegaprotocol/market-list'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { ButtonLink } from '@vegaprotocol/ui-toolkit'; import type { AgGridReact } from 'ag-grid-react'; import { AgGridColumn } from 'ag-grid-react'; diff --git a/apps/explorer/src/app/components/order-details/amend-order-details.tsx b/apps/explorer/src/app/components/order-details/amend-order-details.tsx index b9d23ba12..28d831c21 100644 --- a/apps/explorer/src/app/components/order-details/amend-order-details.tsx +++ b/apps/explorer/src/app/components/order-details/amend-order-details.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { useExplorerDeterministicOrderQuery } from './__generated__/Order'; import { MarketLink } from '../links'; import PriceInMarket from '../price-in-market/price-in-market'; diff --git a/apps/explorer/src/app/components/order-details/deterministic-order-details.tsx b/apps/explorer/src/app/components/order-details/deterministic-order-details.tsx index 26c54a916..b4b96cdd1 100644 --- a/apps/explorer/src/app/components/order-details/deterministic-order-details.tsx +++ b/apps/explorer/src/app/components/order-details/deterministic-order-details.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { useExplorerDeterministicOrderQuery } from './__generated__/Order'; import { MarketLink } from '../links'; import PriceInMarket from '../price-in-market/price-in-market'; diff --git a/apps/explorer/src/app/components/order-details/lib/order-labels.tsx b/apps/explorer/src/app/components/order-details/lib/order-labels.tsx index f8db901d6..e0545cf1d 100644 --- a/apps/explorer/src/app/components/order-details/lib/order-labels.tsx +++ b/apps/explorer/src/app/components/order-details/lib/order-labels.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type * as Schema from '@vegaprotocol/types'; import type { components } from '../../../../types/explorer'; diff --git a/apps/explorer/src/app/components/price-in-market/price-in-market.tsx b/apps/explorer/src/app/components/price-in-market/price-in-market.tsx index 4fee9c438..bfa9d932d 100644 --- a/apps/explorer/src/app/components/price-in-market/price-in-market.tsx +++ b/apps/explorer/src/app/components/price-in-market/price-in-market.tsx @@ -1,4 +1,5 @@ -import { addDecimalsFormatNumber, t } from '@vegaprotocol/utils'; +import { addDecimalsFormatNumber } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import isUndefined from 'lodash/isUndefined'; import { useExplorerMarketQuery } from '../links/market-link/__generated__/Market'; import get from 'lodash/get'; diff --git a/apps/explorer/src/app/components/proposals/proposals-table.tsx b/apps/explorer/src/app/components/proposals/proposals-table.tsx index d743a2cc8..37d852126 100644 --- a/apps/explorer/src/app/components/proposals/proposals-table.tsx +++ b/apps/explorer/src/app/components/proposals/proposals-table.tsx @@ -10,7 +10,8 @@ import type { } from '@vegaprotocol/datagrid'; import { useLayoutEffect, useMemo, useRef, useState } from 'react'; import type { RowClickedEvent } from 'ag-grid-community'; -import { getDateTimeFormat, t } from '@vegaprotocol/utils'; +import { getDateTimeFormat } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { NetworkParams, useNetworkParams } from '@vegaprotocol/react-helpers'; import { ProposalStateMapping } from '@vegaprotocol/types'; import BigNumber from 'bignumber.js'; diff --git a/apps/explorer/src/app/components/render-fetched/index.tsx b/apps/explorer/src/app/components/render-fetched/index.tsx index 9a36cd26e..931511382 100644 --- a/apps/explorer/src/app/components/render-fetched/index.tsx +++ b/apps/explorer/src/app/components/render-fetched/index.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { StatusMessage } from '../status-message'; interface RenderFetchedProps { diff --git a/apps/explorer/src/app/components/router-error-boundary/index.tsx b/apps/explorer/src/app/components/router-error-boundary/index.tsx index f13df5106..2dec60db8 100644 --- a/apps/explorer/src/app/components/router-error-boundary/index.tsx +++ b/apps/explorer/src/app/components/router-error-boundary/index.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import React from 'react'; interface RouteErrorBoundaryProps { diff --git a/apps/explorer/src/app/components/search/search.tsx b/apps/explorer/src/app/components/search/search.tsx index 7fd160160..34e20569c 100644 --- a/apps/explorer/src/app/components/search/search.tsx +++ b/apps/explorer/src/app/components/search/search.tsx @@ -1,5 +1,5 @@ import { useCallback, useState } from 'react'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { Button, Input, InputError } from '@vegaprotocol/ui-toolkit'; import { useForm } from 'react-hook-form'; import { useNavigate } from 'react-router-dom'; diff --git a/apps/explorer/src/app/components/time-ago/index.tsx b/apps/explorer/src/app/components/time-ago/index.tsx index ceaa96bdd..d47a7d9d8 100644 --- a/apps/explorer/src/app/components/time-ago/index.tsx +++ b/apps/explorer/src/app/components/time-ago/index.tsx @@ -1,5 +1,5 @@ import { formatDistanceToNowStrict } from 'date-fns'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { useEffect, useState } from 'react'; interface TimeAgoProps { diff --git a/apps/explorer/src/app/components/time/index.tsx b/apps/explorer/src/app/components/time/index.tsx index 4a8b066b9..8d168d9cb 100644 --- a/apps/explorer/src/app/components/time/index.tsx +++ b/apps/explorer/src/app/components/time/index.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; interface TimeProps { date: string | null | undefined; diff --git a/apps/explorer/src/app/components/txs/details/chain-events/tx-builtin-deposit.spec.tsx b/apps/explorer/src/app/components/txs/details/chain-events/tx-builtin-deposit.spec.tsx index 31cee36b8..d4be0b459 100644 --- a/apps/explorer/src/app/components/txs/details/chain-events/tx-builtin-deposit.spec.tsx +++ b/apps/explorer/src/app/components/txs/details/chain-events/tx-builtin-deposit.spec.tsx @@ -1,6 +1,6 @@ import { render } from '@testing-library/react'; import { TxDetailsChainEventBuiltinDeposit } from './tx-builtin-deposit'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { components } from '../../../../../types/explorer'; import omit from 'lodash/omit'; diff --git a/apps/explorer/src/app/components/txs/details/chain-events/tx-builtin-deposit.tsx b/apps/explorer/src/app/components/txs/details/chain-events/tx-builtin-deposit.tsx index d479c2c88..f9a446d15 100644 --- a/apps/explorer/src/app/components/txs/details/chain-events/tx-builtin-deposit.tsx +++ b/apps/explorer/src/app/components/txs/details/chain-events/tx-builtin-deposit.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { TableRow, TableCell } from '../../../table'; import type { components } from '../../../../../types/explorer'; import { AssetLink, PartyLink } from '../../../links'; diff --git a/apps/explorer/src/app/components/txs/details/chain-events/tx-builtin-withdrawal.spec.tsx b/apps/explorer/src/app/components/txs/details/chain-events/tx-builtin-withdrawal.spec.tsx index 8333a91f1..7b443b9f4 100644 --- a/apps/explorer/src/app/components/txs/details/chain-events/tx-builtin-withdrawal.spec.tsx +++ b/apps/explorer/src/app/components/txs/details/chain-events/tx-builtin-withdrawal.spec.tsx @@ -1,6 +1,6 @@ import { render } from '@testing-library/react'; import { TxDetailsChainEventBuiltinWithdrawal } from './tx-builtin-withdrawal'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { components } from '../../../../../types/explorer'; import omit from 'lodash/omit'; diff --git a/apps/explorer/src/app/components/txs/details/chain-events/tx-builtin-withdrawal.tsx b/apps/explorer/src/app/components/txs/details/chain-events/tx-builtin-withdrawal.tsx index 17c40d1f9..44b3140c0 100644 --- a/apps/explorer/src/app/components/txs/details/chain-events/tx-builtin-withdrawal.tsx +++ b/apps/explorer/src/app/components/txs/details/chain-events/tx-builtin-withdrawal.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { TableRow, TableCell } from '../../../table'; import type { components } from '../../../../../types/explorer'; import { AssetLink, PartyLink } from '../../../links'; diff --git a/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-asset-delist.spec.tsx b/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-asset-delist.spec.tsx index 39c44ff05..7456aff8c 100644 --- a/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-asset-delist.spec.tsx +++ b/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-asset-delist.spec.tsx @@ -1,5 +1,5 @@ import { render } from '@testing-library/react'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { components } from '../../../../../types/explorer'; import omit from 'lodash/omit'; diff --git a/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-asset-delist.tsx b/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-asset-delist.tsx index 2ac247945..36ce586af 100644 --- a/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-asset-delist.tsx +++ b/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-asset-delist.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { TableRow, TableCell } from '../../../table'; import type { components } from '../../../../../types/explorer'; import { AssetLink } from '../../../links'; diff --git a/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-asset-limits-updated.spec.tsx b/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-asset-limits-updated.spec.tsx index 0d349bbbe..69af0f55d 100644 --- a/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-asset-limits-updated.spec.tsx +++ b/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-asset-limits-updated.spec.tsx @@ -1,5 +1,5 @@ import { render } from '@testing-library/react'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { components } from '../../../../../types/explorer'; import omit from 'lodash/omit'; diff --git a/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-asset-limits-updated.tsx b/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-asset-limits-updated.tsx index 30fb1b01e..394a16158 100644 --- a/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-asset-limits-updated.tsx +++ b/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-asset-limits-updated.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { TableRow, TableCell } from '../../../table'; import type { components } from '../../../../../types/explorer'; import { AssetLink } from '../../../links'; diff --git a/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-asset-list.spec.tsx b/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-asset-list.spec.tsx index d83020582..8cd93217c 100644 --- a/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-asset-list.spec.tsx +++ b/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-asset-list.spec.tsx @@ -1,5 +1,5 @@ import { render } from '@testing-library/react'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { components } from '../../../../../types/explorer'; import omit from 'lodash/omit'; diff --git a/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-asset-list.tsx b/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-asset-list.tsx index 376aac80b..597e317db 100644 --- a/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-asset-list.tsx +++ b/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-asset-list.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { TableRow, TableCell } from '../../../table'; import type { components } from '../../../../../types/explorer'; import { AssetLink } from '../../../links'; diff --git a/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-bridge-pause.spec.tsx b/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-bridge-pause.spec.tsx index b5b10a89d..7f6e1029a 100644 --- a/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-bridge-pause.spec.tsx +++ b/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-bridge-pause.spec.tsx @@ -1,5 +1,5 @@ import { render } from '@testing-library/react'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { TxDetailsChainEventErc20BridgePause } from './tx-erc20-bridge-pause'; describe('Chain Event: ERC20 bridge pause', () => { diff --git a/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-bridge-pause.tsx b/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-bridge-pause.tsx index 5c4cb4b2f..e2ccbbf00 100644 --- a/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-bridge-pause.tsx +++ b/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-bridge-pause.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { TableRow, TableCell } from '../../../table'; export interface TxDetailsChainEventErc20BridgePauseProps { diff --git a/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-deposit.spec.tsx b/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-deposit.spec.tsx index cf0908bf9..cb6720b1f 100644 --- a/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-deposit.spec.tsx +++ b/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-deposit.spec.tsx @@ -1,5 +1,5 @@ import { render } from '@testing-library/react'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { components } from '../../../../../types/explorer'; import omit from 'lodash/omit'; diff --git a/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-deposit.tsx b/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-deposit.tsx index c7204a8d6..9615a2537 100644 --- a/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-deposit.tsx +++ b/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-deposit.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { TableRow, TableCell } from '../../../table'; import type { components } from '../../../../../types/explorer'; import { AssetLink, PartyLink } from '../../../links'; diff --git a/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-withdrawal.spec.tsx b/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-withdrawal.spec.tsx index 9a13947f0..97eeae76e 100644 --- a/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-withdrawal.spec.tsx +++ b/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-withdrawal.spec.tsx @@ -1,5 +1,5 @@ import { render } from '@testing-library/react'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { components } from '../../../../../types/explorer'; import omit from 'lodash/omit'; diff --git a/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-withdrawal.tsx b/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-withdrawal.tsx index c05d62cdb..e34ab1a73 100644 --- a/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-withdrawal.tsx +++ b/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-withdrawal.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { TableRow, TableCell } from '../../../table'; import type { components } from '../../../../../types/explorer'; import { AssetLink } from '../../../links'; diff --git a/apps/explorer/src/app/components/txs/details/chain-events/tx-multisig-signer.spec.tsx b/apps/explorer/src/app/components/txs/details/chain-events/tx-multisig-signer.spec.tsx index ef0ad80d6..23dca02c0 100644 --- a/apps/explorer/src/app/components/txs/details/chain-events/tx-multisig-signer.spec.tsx +++ b/apps/explorer/src/app/components/txs/details/chain-events/tx-multisig-signer.spec.tsx @@ -1,5 +1,5 @@ import { render } from '@testing-library/react'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { components } from '../../../../../types/explorer'; import { MockedProvider } from '@apollo/client/testing'; diff --git a/apps/explorer/src/app/components/txs/details/chain-events/tx-multisig-signer.tsx b/apps/explorer/src/app/components/txs/details/chain-events/tx-multisig-signer.tsx index 3a676d95a..9ad8dae22 100644 --- a/apps/explorer/src/app/components/txs/details/chain-events/tx-multisig-signer.tsx +++ b/apps/explorer/src/app/components/txs/details/chain-events/tx-multisig-signer.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { TableRow, TableCell } from '../../../table'; import type { components } from '../../../../../types/explorer'; import { getBlockTime } from './lib/get-block-time'; diff --git a/apps/explorer/src/app/components/txs/details/chain-events/tx-multisig-threshold.spec.tsx b/apps/explorer/src/app/components/txs/details/chain-events/tx-multisig-threshold.spec.tsx index f1d9aaa2e..df51ffee5 100644 --- a/apps/explorer/src/app/components/txs/details/chain-events/tx-multisig-threshold.spec.tsx +++ b/apps/explorer/src/app/components/txs/details/chain-events/tx-multisig-threshold.spec.tsx @@ -1,5 +1,5 @@ import { render } from '@testing-library/react'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { components } from '../../../../../types/explorer'; import { MockedProvider } from '@apollo/client/testing'; diff --git a/apps/explorer/src/app/components/txs/details/chain-events/tx-multisig-threshold.tsx b/apps/explorer/src/app/components/txs/details/chain-events/tx-multisig-threshold.tsx index e69d8c213..50209e0fc 100644 --- a/apps/explorer/src/app/components/txs/details/chain-events/tx-multisig-threshold.tsx +++ b/apps/explorer/src/app/components/txs/details/chain-events/tx-multisig-threshold.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { TableRow, TableCell } from '../../../table'; import type { components } from '../../../../../types/explorer'; import isNumber from 'lodash/isNumber'; diff --git a/apps/explorer/src/app/components/txs/details/chain-events/tx-stake-deposit.spec.tsx b/apps/explorer/src/app/components/txs/details/chain-events/tx-stake-deposit.spec.tsx index 43613188b..47d7b6541 100644 --- a/apps/explorer/src/app/components/txs/details/chain-events/tx-stake-deposit.spec.tsx +++ b/apps/explorer/src/app/components/txs/details/chain-events/tx-stake-deposit.spec.tsx @@ -1,5 +1,5 @@ import { render } from '@testing-library/react'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { components } from '../../../../../types/explorer'; import omit from 'lodash/omit'; diff --git a/apps/explorer/src/app/components/txs/details/chain-events/tx-stake-deposit.tsx b/apps/explorer/src/app/components/txs/details/chain-events/tx-stake-deposit.tsx index b2a9a92c5..356f70f27 100644 --- a/apps/explorer/src/app/components/txs/details/chain-events/tx-stake-deposit.tsx +++ b/apps/explorer/src/app/components/txs/details/chain-events/tx-stake-deposit.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { TableRow, TableCell } from '../../../table'; import type { components } from '../../../../../types/explorer'; import { PartyLink } from '../../../links'; diff --git a/apps/explorer/src/app/components/txs/details/chain-events/tx-stake-remove.spec.tsx b/apps/explorer/src/app/components/txs/details/chain-events/tx-stake-remove.spec.tsx index e5f385675..9b61ea8e8 100644 --- a/apps/explorer/src/app/components/txs/details/chain-events/tx-stake-remove.spec.tsx +++ b/apps/explorer/src/app/components/txs/details/chain-events/tx-stake-remove.spec.tsx @@ -1,5 +1,5 @@ import { render } from '@testing-library/react'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { components } from '../../../../../types/explorer'; import omit from 'lodash/omit'; diff --git a/apps/explorer/src/app/components/txs/details/chain-events/tx-stake-remove.tsx b/apps/explorer/src/app/components/txs/details/chain-events/tx-stake-remove.tsx index b4a24033f..54dcb3695 100644 --- a/apps/explorer/src/app/components/txs/details/chain-events/tx-stake-remove.tsx +++ b/apps/explorer/src/app/components/txs/details/chain-events/tx-stake-remove.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { TableRow, TableCell } from '../../../table'; import type { components } from '../../../../../types/explorer'; import { PartyLink } from '../../../links'; diff --git a/apps/explorer/src/app/components/txs/details/chain-events/tx-stake-totalsupply.spec.tsx b/apps/explorer/src/app/components/txs/details/chain-events/tx-stake-totalsupply.spec.tsx index f7800dc7b..2294ebf11 100644 --- a/apps/explorer/src/app/components/txs/details/chain-events/tx-stake-totalsupply.spec.tsx +++ b/apps/explorer/src/app/components/txs/details/chain-events/tx-stake-totalsupply.spec.tsx @@ -1,5 +1,5 @@ import { render } from '@testing-library/react'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { components } from '../../../../../types/explorer'; import omit from 'lodash/omit'; diff --git a/apps/explorer/src/app/components/txs/details/chain-events/tx-stake-totalsupply.tsx b/apps/explorer/src/app/components/txs/details/chain-events/tx-stake-totalsupply.tsx index 5859f9bd6..81ab43d86 100644 --- a/apps/explorer/src/app/components/txs/details/chain-events/tx-stake-totalsupply.tsx +++ b/apps/explorer/src/app/components/txs/details/chain-events/tx-stake-totalsupply.tsx @@ -1,4 +1,5 @@ -import { formatNumber, t, toBigNum } from '@vegaprotocol/utils'; +import { formatNumber, toBigNum } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { TableRow, TableCell } from '../../../table'; import type { components } from '../../../../../types/explorer'; import { diff --git a/apps/explorer/src/app/components/txs/details/liquidity-provision/components/liquidity-provision-details-row.tsx b/apps/explorer/src/app/components/txs/details/liquidity-provision/components/liquidity-provision-details-row.tsx index bc4f5306a..520ff5968 100644 --- a/apps/explorer/src/app/components/txs/details/liquidity-provision/components/liquidity-provision-details-row.tsx +++ b/apps/explorer/src/app/components/txs/details/liquidity-provision/components/liquidity-provision-details-row.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { components } from '../../../../../../types/explorer'; import { TableRow } from '../../../../table'; diff --git a/apps/explorer/src/app/components/txs/details/liquidity-provision/liquidity-provision-details.tsx b/apps/explorer/src/app/components/txs/details/liquidity-provision/liquidity-provision-details.tsx index e4c80ed33..ae8de5113 100644 --- a/apps/explorer/src/app/components/txs/details/liquidity-provision/liquidity-provision-details.tsx +++ b/apps/explorer/src/app/components/txs/details/liquidity-provision/liquidity-provision-details.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { components } from '../../../../../types/explorer'; import type { LiquiditySubmission } from '../tx-liquidity-submission'; diff --git a/apps/explorer/src/app/components/txs/details/oracle-data/data-submission-json-oracle.tsx b/apps/explorer/src/app/components/txs/details/oracle-data/data-submission-json-oracle.tsx index 11e7a05ca..b9afa226d 100644 --- a/apps/explorer/src/app/components/txs/details/oracle-data/data-submission-json-oracle.tsx +++ b/apps/explorer/src/app/components/txs/details/oracle-data/data-submission-json-oracle.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; interface JSONOracleDataProps { payload: string; diff --git a/apps/explorer/src/app/components/txs/details/oracle-data/data-submission-open-oracle.tsx b/apps/explorer/src/app/components/txs/details/oracle-data/data-submission-open-oracle.tsx index e2b2d0488..c9c78f10c 100644 --- a/apps/explorer/src/app/components/txs/details/oracle-data/data-submission-open-oracle.tsx +++ b/apps/explorer/src/app/components/txs/details/oracle-data/data-submission-open-oracle.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { NestedDataList } from '../../../nested-data-list'; import { OpenOraclePrices } from './open-oracle/open-oracle-prices'; diff --git a/apps/explorer/src/app/components/txs/details/oracle-data/open-oracle/open-oracle-prices.tsx b/apps/explorer/src/app/components/txs/details/oracle-data/open-oracle/open-oracle-prices.tsx index 57de57364..4a44e9086 100644 --- a/apps/explorer/src/app/components/txs/details/oracle-data/open-oracle/open-oracle-prices.tsx +++ b/apps/explorer/src/app/components/txs/details/oracle-data/open-oracle/open-oracle-prices.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { CopyWithTooltip } from '@vegaprotocol/ui-toolkit'; import { TableRow } from '../../../../table'; import { TruncateInline } from '../../../../truncate/truncate'; diff --git a/apps/explorer/src/app/components/txs/details/shared/tx-details-shared.tsx b/apps/explorer/src/app/components/txs/details/shared/tx-details-shared.tsx index c6e697370..39e6930e5 100644 --- a/apps/explorer/src/app/components/txs/details/shared/tx-details-shared.tsx +++ b/apps/explorer/src/app/components/txs/details/shared/tx-details-shared.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { TableRow, TableCell } from '../../../table'; import { BlockLink, PartyLink } from '../../../links/'; import { TimeAgo } from '../../../time-ago'; diff --git a/apps/explorer/src/app/components/txs/details/state-variable/bound-factors.tsx b/apps/explorer/src/app/components/txs/details/state-variable/bound-factors.tsx index 1b01dc180..28ea7880a 100644 --- a/apps/explorer/src/app/components/txs/details/state-variable/bound-factors.tsx +++ b/apps/explorer/src/app/components/txs/details/state-variable/bound-factors.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { components } from '../../../../../types/explorer'; import { Table, TableRow, TableHeader, TableCell } from '../../../table'; diff --git a/apps/explorer/src/app/components/txs/details/state-variable/risk-factors.tsx b/apps/explorer/src/app/components/txs/details/state-variable/risk-factors.tsx index a295cfd35..fb7db6b18 100644 --- a/apps/explorer/src/app/components/txs/details/state-variable/risk-factors.tsx +++ b/apps/explorer/src/app/components/txs/details/state-variable/risk-factors.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import zip from 'lodash/zip'; import type { components } from '../../../../../types/explorer'; import { Table, TableRow, TableHeader, TableCell } from '../../../table'; diff --git a/apps/explorer/src/app/components/txs/details/state-variable/trading-probability.tsx b/apps/explorer/src/app/components/txs/details/state-variable/trading-probability.tsx index e71668418..b30fa3fb2 100644 --- a/apps/explorer/src/app/components/txs/details/state-variable/trading-probability.tsx +++ b/apps/explorer/src/app/components/txs/details/state-variable/trading-probability.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { components } from '../../../../../types/explorer'; import { Table, TableRow, TableHeader, TableCell } from '../../../table'; import { getValues } from './bound-factors'; diff --git a/apps/explorer/src/app/components/txs/details/transfer/blocks/transfer-participants.tsx b/apps/explorer/src/app/components/txs/details/transfer/blocks/transfer-participants.tsx index d639b78ce..b43d3423a 100644 --- a/apps/explorer/src/app/components/txs/details/transfer/blocks/transfer-participants.tsx +++ b/apps/explorer/src/app/components/txs/details/transfer/blocks/transfer-participants.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { Icon, Tooltip } from '@vegaprotocol/ui-toolkit'; import { PartyLink } from '../../../../links'; import { diff --git a/apps/explorer/src/app/components/txs/details/transfer/blocks/transfer-repeat.tsx b/apps/explorer/src/app/components/txs/details/transfer/blocks/transfer-repeat.tsx index 6dce214fc..014ac9c85 100644 --- a/apps/explorer/src/app/components/txs/details/transfer/blocks/transfer-repeat.tsx +++ b/apps/explorer/src/app/components/txs/details/transfer/blocks/transfer-repeat.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { Icon } from '@vegaprotocol/ui-toolkit'; import EpochOverview from '../../../../epoch-overview/epoch'; import { useExplorerFutureEpochQuery } from '../../../../epoch-overview/__generated__/Epoch'; diff --git a/apps/explorer/src/app/components/txs/details/transfer/blocks/transfer-rewards.tsx b/apps/explorer/src/app/components/txs/details/transfer/blocks/transfer-rewards.tsx index fb39f1119..f3510f273 100644 --- a/apps/explorer/src/app/components/txs/details/transfer/blocks/transfer-rewards.tsx +++ b/apps/explorer/src/app/components/txs/details/transfer/blocks/transfer-rewards.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { AssetLink, MarketLink } from '../../../../links'; import { headerClasses, wrapperClasses } from '../transfer-details'; import type { components } from '../../../../../../types/explorer'; diff --git a/apps/explorer/src/app/components/txs/details/tx-batch.tsx b/apps/explorer/src/app/components/txs/details/tx-batch.tsx index 7b93124c6..95fc4ba2b 100644 --- a/apps/explorer/src/app/components/txs/details/tx-batch.tsx +++ b/apps/explorer/src/app/components/txs/details/tx-batch.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { BatchCancellationInstruction, BatchInstruction, diff --git a/apps/explorer/src/app/components/txs/details/tx-chain-event.tsx b/apps/explorer/src/app/components/txs/details/tx-chain-event.tsx index b02f35271..9cb410964 100644 --- a/apps/explorer/src/app/components/txs/details/tx-chain-event.tsx +++ b/apps/explorer/src/app/components/txs/details/tx-chain-event.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { TxDetailsShared } from './shared/tx-details-shared'; import { TableWithTbody } from '../../table'; diff --git a/apps/explorer/src/app/components/txs/details/tx-data-submission.tsx b/apps/explorer/src/app/components/txs/details/tx-data-submission.tsx index 8cc6ca2cf..c92ecdc01 100644 --- a/apps/explorer/src/app/components/txs/details/tx-data-submission.tsx +++ b/apps/explorer/src/app/components/txs/details/tx-data-submission.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { BlockExplorerTransactionResult } from '../../../routes/types/block-explorer-response'; import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint-blocks-response'; import { TxDetailsShared } from './shared/tx-details-shared'; diff --git a/apps/explorer/src/app/components/txs/details/tx-delegation.tsx b/apps/explorer/src/app/components/txs/details/tx-delegation.tsx index 81456e3fa..32ba16c3e 100644 --- a/apps/explorer/src/app/components/txs/details/tx-delegation.tsx +++ b/apps/explorer/src/app/components/txs/details/tx-delegation.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { BlockExplorerTransactionResult } from '../../../routes/types/block-explorer-response'; import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint-blocks-response'; import { TxDetailsShared } from './shared/tx-details-shared'; diff --git a/apps/explorer/src/app/components/txs/details/tx-details-protocol-upgrade.tsx b/apps/explorer/src/app/components/txs/details/tx-details-protocol-upgrade.tsx index d687c38ae..91bd7782d 100644 --- a/apps/explorer/src/app/components/txs/details/tx-details-protocol-upgrade.tsx +++ b/apps/explorer/src/app/components/txs/details/tx-details-protocol-upgrade.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { TxDetailsShared } from './shared/tx-details-shared'; import { TableCell, TableRow, TableWithTbody } from '../../table'; import { BlockLink } from '../../links'; diff --git a/apps/explorer/src/app/components/txs/details/tx-details-wrapper.tsx b/apps/explorer/src/app/components/txs/details/tx-details-wrapper.tsx index 20290242c..117000aaa 100644 --- a/apps/explorer/src/app/components/txs/details/tx-details-wrapper.tsx +++ b/apps/explorer/src/app/components/txs/details/tx-details-wrapper.tsx @@ -1,6 +1,6 @@ import { useMemo } from 'react'; import { DATA_SOURCES } from '../../../config'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { useFetch } from '@vegaprotocol/react-helpers'; import { TxDetailsOrder } from './tx-order'; import type { BlockExplorerTransactionResult } from '../../../routes/types/block-explorer-response'; diff --git a/apps/explorer/src/app/components/txs/details/tx-eth-key-rotate.tsx b/apps/explorer/src/app/components/txs/details/tx-eth-key-rotate.tsx index f7b0592c7..ecd49e6c6 100644 --- a/apps/explorer/src/app/components/txs/details/tx-eth-key-rotate.tsx +++ b/apps/explorer/src/app/components/txs/details/tx-eth-key-rotate.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { BlockExplorerTransactionResult } from '../../../routes/types/block-explorer-response'; import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint-blocks-response'; import { TxDetailsShared } from './shared/tx-details-shared'; diff --git a/apps/explorer/src/app/components/txs/details/tx-generic.tsx b/apps/explorer/src/app/components/txs/details/tx-generic.tsx index 674262b4c..1620a2de8 100644 --- a/apps/explorer/src/app/components/txs/details/tx-generic.tsx +++ b/apps/explorer/src/app/components/txs/details/tx-generic.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { BlockExplorerTransactionResult } from '../../../routes/types/block-explorer-response'; import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint-blocks-response'; import { TxDetailsShared } from './shared/tx-details-shared'; diff --git a/apps/explorer/src/app/components/txs/details/tx-hearbeat.tsx b/apps/explorer/src/app/components/txs/details/tx-hearbeat.tsx index eb2ffb797..7e51f93de 100644 --- a/apps/explorer/src/app/components/txs/details/tx-hearbeat.tsx +++ b/apps/explorer/src/app/components/txs/details/tx-hearbeat.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { BlockExplorerTransactionResult } from '../../../routes/types/block-explorer-response'; import { BlockLink, NodeLink } from '../../links/'; import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint-blocks-response'; diff --git a/apps/explorer/src/app/components/txs/details/tx-issue-signatures.tsx b/apps/explorer/src/app/components/txs/details/tx-issue-signatures.tsx index 99d78e98f..4cc4967ea 100644 --- a/apps/explorer/src/app/components/txs/details/tx-issue-signatures.tsx +++ b/apps/explorer/src/app/components/txs/details/tx-issue-signatures.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { BlockExplorerTransactionResult } from '../../../routes/types/block-explorer-response'; import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint-blocks-response'; import { TxDetailsShared } from './shared/tx-details-shared'; diff --git a/apps/explorer/src/app/components/txs/details/tx-key-rotate.tsx b/apps/explorer/src/app/components/txs/details/tx-key-rotate.tsx index d526cca82..dde68583b 100644 --- a/apps/explorer/src/app/components/txs/details/tx-key-rotate.tsx +++ b/apps/explorer/src/app/components/txs/details/tx-key-rotate.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { BlockExplorerTransactionResult } from '../../../routes/types/block-explorer-response'; import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint-blocks-response'; import { TxDetailsShared } from './shared/tx-details-shared'; diff --git a/apps/explorer/src/app/components/txs/details/tx-liquidity-amend.tsx b/apps/explorer/src/app/components/txs/details/tx-liquidity-amend.tsx index ebc0166fd..bc9fc350f 100644 --- a/apps/explorer/src/app/components/txs/details/tx-liquidity-amend.tsx +++ b/apps/explorer/src/app/components/txs/details/tx-liquidity-amend.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { BlockExplorerTransactionResult } from '../../../routes/types/block-explorer-response'; import { MarketLink } from '../../links'; import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint-blocks-response'; diff --git a/apps/explorer/src/app/components/txs/details/tx-liquidity-cancel.tsx b/apps/explorer/src/app/components/txs/details/tx-liquidity-cancel.tsx index a9991f235..759d1114a 100644 --- a/apps/explorer/src/app/components/txs/details/tx-liquidity-cancel.tsx +++ b/apps/explorer/src/app/components/txs/details/tx-liquidity-cancel.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { MarketLink } from '../../links'; import { TxDetailsShared } from './shared/tx-details-shared'; import { TableCell, TableRow, TableWithTbody } from '../../table'; diff --git a/apps/explorer/src/app/components/txs/details/tx-liquidity-submission.tsx b/apps/explorer/src/app/components/txs/details/tx-liquidity-submission.tsx index a47ffa7d7..cba6d8f32 100644 --- a/apps/explorer/src/app/components/txs/details/tx-liquidity-submission.tsx +++ b/apps/explorer/src/app/components/txs/details/tx-liquidity-submission.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { BlockExplorerTransactionResult } from '../../../routes/types/block-explorer-response'; import { MarketLink } from '../../links/'; import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint-blocks-response'; diff --git a/apps/explorer/src/app/components/txs/details/tx-node-announce.tsx b/apps/explorer/src/app/components/txs/details/tx-node-announce.tsx index 2caf52ff4..46a9806d8 100644 --- a/apps/explorer/src/app/components/txs/details/tx-node-announce.tsx +++ b/apps/explorer/src/app/components/txs/details/tx-node-announce.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { BlockExplorerTransactionResult } from '../../../routes/types/block-explorer-response'; import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint-blocks-response'; import { TxDetailsShared } from './shared/tx-details-shared'; diff --git a/apps/explorer/src/app/components/txs/details/tx-node-vote.tsx b/apps/explorer/src/app/components/txs/details/tx-node-vote.tsx index 3628cd6ac..f5159cae2 100644 --- a/apps/explorer/src/app/components/txs/details/tx-node-vote.tsx +++ b/apps/explorer/src/app/components/txs/details/tx-node-vote.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { BlockExplorerTransactionResult } from '../../../routes/types/block-explorer-response'; import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint-blocks-response'; import { TxDetailsShared } from './shared/tx-details-shared'; diff --git a/apps/explorer/src/app/components/txs/details/tx-order-amend.tsx b/apps/explorer/src/app/components/txs/details/tx-order-amend.tsx index f4e53d793..380a5d949 100644 --- a/apps/explorer/src/app/components/txs/details/tx-order-amend.tsx +++ b/apps/explorer/src/app/components/txs/details/tx-order-amend.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { BlockExplorerTransactionResult } from '../../../routes/types/block-explorer-response'; import { MarketLink } from '../../links'; import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint-blocks-response'; diff --git a/apps/explorer/src/app/components/txs/details/tx-order-cancel.tsx b/apps/explorer/src/app/components/txs/details/tx-order-cancel.tsx index 00a1b2e8c..d0074b8e4 100644 --- a/apps/explorer/src/app/components/txs/details/tx-order-cancel.tsx +++ b/apps/explorer/src/app/components/txs/details/tx-order-cancel.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { BlockExplorerTransactionResult } from '../../../routes/types/block-explorer-response'; import { MarketLink } from '../../links/'; import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint-blocks-response'; diff --git a/apps/explorer/src/app/components/txs/details/tx-order.tsx b/apps/explorer/src/app/components/txs/details/tx-order.tsx index 214adc557..57faafa85 100644 --- a/apps/explorer/src/app/components/txs/details/tx-order.tsx +++ b/apps/explorer/src/app/components/txs/details/tx-order.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { BlockExplorerTransactionResult } from '../../../routes/types/block-explorer-response'; import { MarketLink } from '../../links/'; import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint-blocks-response'; diff --git a/apps/explorer/src/app/components/txs/details/tx-proposal-vote.tsx b/apps/explorer/src/app/components/txs/details/tx-proposal-vote.tsx index 5f2cc3bca..b0b62a4ff 100644 --- a/apps/explorer/src/app/components/txs/details/tx-proposal-vote.tsx +++ b/apps/explorer/src/app/components/txs/details/tx-proposal-vote.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { BlockExplorerTransactionResult } from '../../../routes/types/block-explorer-response'; import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint-blocks-response'; import { TxDetailsShared } from './shared/tx-details-shared'; diff --git a/apps/explorer/src/app/components/txs/details/tx-state-variable-proposal.tsx b/apps/explorer/src/app/components/txs/details/tx-state-variable-proposal.tsx index 779d7e01e..33e2d1db7 100644 --- a/apps/explorer/src/app/components/txs/details/tx-state-variable-proposal.tsx +++ b/apps/explorer/src/app/components/txs/details/tx-state-variable-proposal.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { TxDetailsShared } from './shared/tx-details-shared'; import { TableCell, TableRow, TableWithTbody } from '../../table'; import { MarketLink } from '../../links'; diff --git a/apps/explorer/src/app/components/txs/details/tx-transfer.tsx b/apps/explorer/src/app/components/txs/details/tx-transfer.tsx index cd89db27c..85790687d 100644 --- a/apps/explorer/src/app/components/txs/details/tx-transfer.tsx +++ b/apps/explorer/src/app/components/txs/details/tx-transfer.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { BlockExplorerTransactionResult } from '../../../routes/types/block-explorer-response'; import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint-blocks-response'; import { sharedHeaderProps, TxDetailsShared } from './shared/tx-details-shared'; diff --git a/apps/explorer/src/app/components/txs/details/tx-undelegation.tsx b/apps/explorer/src/app/components/txs/details/tx-undelegation.tsx index f242a9100..bd35129da 100644 --- a/apps/explorer/src/app/components/txs/details/tx-undelegation.tsx +++ b/apps/explorer/src/app/components/txs/details/tx-undelegation.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { BlockExplorerTransactionResult } from '../../../routes/types/block-explorer-response'; import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint-blocks-response'; import { TxDetailsShared } from './shared/tx-details-shared'; diff --git a/apps/explorer/src/app/components/txs/details/tx-withdraw-submission.tsx b/apps/explorer/src/app/components/txs/details/tx-withdraw-submission.tsx index e8bd91f99..2377e29e8 100644 --- a/apps/explorer/src/app/components/txs/details/tx-withdraw-submission.tsx +++ b/apps/explorer/src/app/components/txs/details/tx-withdraw-submission.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { BlockExplorerTransactionResult } from '../../../routes/types/block-explorer-response'; import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint-blocks-response'; import { TxDetailsShared } from './shared/tx-details-shared'; diff --git a/apps/explorer/src/app/components/txs/tx-data-view.tsx b/apps/explorer/src/app/components/txs/tx-data-view.tsx index 39eefbdfe..ea2b8f038 100644 --- a/apps/explorer/src/app/components/txs/tx-data-view.tsx +++ b/apps/explorer/src/app/components/txs/tx-data-view.tsx @@ -1,5 +1,5 @@ import { useState } from 'react'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import get from 'lodash/get'; import { Select } from '@vegaprotocol/ui-toolkit'; diff --git a/apps/explorer/src/app/components/txs/tx-list.tsx b/apps/explorer/src/app/components/txs/tx-list.tsx index 0e92dc3f4..d87828651 100644 --- a/apps/explorer/src/app/components/txs/tx-list.tsx +++ b/apps/explorer/src/app/components/txs/tx-list.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { TendermintUnconfirmedTransactionsResponse } from '../../routes/txs/tendermint-unconfirmed-transactions-response.d'; interface TxsProps { diff --git a/apps/explorer/src/app/components/txs/tx-order-type.tsx b/apps/explorer/src/app/components/txs/tx-order-type.tsx index ccaa97bc8..cb11be8d8 100644 --- a/apps/explorer/src/app/components/txs/tx-order-type.tsx +++ b/apps/explorer/src/app/components/txs/tx-order-type.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { components } from '../../../types/explorer'; interface TxOrderTypeProps { diff --git a/apps/explorer/src/app/components/txs/txs-infinite-list.tsx b/apps/explorer/src/app/components/txs/txs-infinite-list.tsx index 1d2aecfcd..6ce52bfd0 100644 --- a/apps/explorer/src/app/components/txs/txs-infinite-list.tsx +++ b/apps/explorer/src/app/components/txs/txs-infinite-list.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { FixedSizeList as List } from 'react-window'; import InfiniteLoader from 'react-window-infinite-loader'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { useScreenDimensions } from '@vegaprotocol/react-helpers'; import { TxsInfiniteListItem } from './txs-infinite-list-item'; import type { BlockExplorerTransactionResult } from '../../routes/types/block-explorer-response'; diff --git a/apps/explorer/src/app/components/txs/txs-per-block.tsx b/apps/explorer/src/app/components/txs/txs-per-block.tsx index 7193c7e08..6acf31d26 100644 --- a/apps/explorer/src/app/components/txs/txs-per-block.tsx +++ b/apps/explorer/src/app/components/txs/txs-per-block.tsx @@ -3,7 +3,7 @@ import { RenderFetched } from '../render-fetched'; import { TruncatedLink } from '../truncate/truncated-link'; import { TxOrderType } from './tx-order-type'; import { Table, TableRow, TableCell } from '../table'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { useFetch } from '@vegaprotocol/react-helpers'; import type { BlockExplorerTransactions } from '../../routes/types/block-explorer-response'; import isNumber from 'lodash/isNumber'; diff --git a/apps/explorer/src/app/components/withdrawal/withdrawal-progress.tsx b/apps/explorer/src/app/components/withdrawal/withdrawal-progress.tsx index b3895061f..02daa7e40 100644 --- a/apps/explorer/src/app/components/withdrawal/withdrawal-progress.tsx +++ b/apps/explorer/src/app/components/withdrawal/withdrawal-progress.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { ReactNode } from 'react'; import { Time } from '../time'; import { useExplorerWithdrawalQuery } from './__generated__/Withdrawal'; diff --git a/apps/explorer/src/app/routes/assets/asset-page.tsx b/apps/explorer/src/app/routes/assets/asset-page.tsx index b867c6886..9288bafab 100644 --- a/apps/explorer/src/app/routes/assets/asset-page.tsx +++ b/apps/explorer/src/app/routes/assets/asset-page.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { AsyncRenderer, Button } from '@vegaprotocol/ui-toolkit'; import { useScrollToLocation } from '../../hooks/scroll-to-location'; import { useDocumentTitle } from '../../hooks/use-document-title'; diff --git a/apps/explorer/src/app/routes/assets/assets-page.tsx b/apps/explorer/src/app/routes/assets/assets-page.tsx index 1adfbe31b..6d573183c 100644 --- a/apps/explorer/src/app/routes/assets/assets-page.tsx +++ b/apps/explorer/src/app/routes/assets/assets-page.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { RouteTitle } from '../../components/route-title'; import { AsyncRenderer } from '@vegaprotocol/ui-toolkit'; import { useScrollToLocation } from '../../hooks/scroll-to-location'; diff --git a/apps/explorer/src/app/routes/blocks/home/index.tsx b/apps/explorer/src/app/routes/blocks/home/index.tsx index d44a5f433..a92050a7d 100644 --- a/apps/explorer/src/app/routes/blocks/home/index.tsx +++ b/apps/explorer/src/app/routes/blocks/home/index.tsx @@ -8,7 +8,7 @@ import { RouteTitle } from '../../../components/route-title'; import { BlocksRefetch } from '../../../components/blocks'; import { BlocksInfiniteList } from '../../../components/blocks/blocks-infinite-list'; import { JumpToBlock } from '../../../components/jump-to-block'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { useFetch } from '@vegaprotocol/react-helpers'; import { useDocumentTitle } from '../../../hooks/use-document-title'; diff --git a/apps/explorer/src/app/routes/blocks/id/block.spec.tsx b/apps/explorer/src/app/routes/blocks/id/block.spec.tsx index 762ca7e3c..89e91c9c1 100644 --- a/apps/explorer/src/app/routes/blocks/id/block.spec.tsx +++ b/apps/explorer/src/app/routes/blocks/id/block.spec.tsx @@ -2,7 +2,7 @@ import { Block } from './block'; import { render, screen, waitFor } from '@testing-library/react'; import { MemoryRouter, Route, Routes } from 'react-router-dom'; import { Routes as RouteNames } from '../../route-names'; -import { useFetch } from '@vegaprotocol/utils'; +import { useFetch } from '@vegaprotocol/react-helpers'; import { MockedProvider } from '@apollo/client/testing'; jest.mock('@vegaprotocol/react-helpers', () => { diff --git a/apps/explorer/src/app/routes/blocks/id/block.tsx b/apps/explorer/src/app/routes/blocks/id/block.tsx index c3888bd0f..20643dab9 100644 --- a/apps/explorer/src/app/routes/blocks/id/block.tsx +++ b/apps/explorer/src/app/routes/blocks/id/block.tsx @@ -15,7 +15,7 @@ import { TxsPerBlock } from '../../../components/txs/txs-per-block'; import { Button } from '@vegaprotocol/ui-toolkit'; import { Routes } from '../../route-names'; import { RenderFetched } from '../../../components/render-fetched'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { useFetch } from '@vegaprotocol/react-helpers'; import { NodeLink } from '../../../components/links'; import { useDocumentTitle } from '../../../hooks/use-document-title'; diff --git a/apps/explorer/src/app/routes/genesis/index.tsx b/apps/explorer/src/app/routes/genesis/index.tsx index 7d2cb1999..225ea2ed6 100644 --- a/apps/explorer/src/app/routes/genesis/index.tsx +++ b/apps/explorer/src/app/routes/genesis/index.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { useFetch } from '@vegaprotocol/react-helpers'; import { RouteTitle } from '../../components/route-title'; import { Loader, SyntaxHighlighter } from '@vegaprotocol/ui-toolkit'; diff --git a/apps/explorer/src/app/routes/governance/proposals-page.tsx b/apps/explorer/src/app/routes/governance/proposals-page.tsx index 0e9fa8029..0a7da7aa3 100644 --- a/apps/explorer/src/app/routes/governance/proposals-page.tsx +++ b/apps/explorer/src/app/routes/governance/proposals-page.tsx @@ -1,5 +1,5 @@ import { proposalsDataProvider } from '@vegaprotocol/governance'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { useDataProvider } from '@vegaprotocol/react-helpers'; import { AsyncRenderer } from '@vegaprotocol/ui-toolkit'; import { ProposalsTable } from '../../components/proposals/proposals-table'; diff --git a/apps/explorer/src/app/routes/markets/market-page.tsx b/apps/explorer/src/app/routes/markets/market-page.tsx index 4b328e5ce..63362ee10 100644 --- a/apps/explorer/src/app/routes/markets/market-page.tsx +++ b/apps/explorer/src/app/routes/markets/market-page.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { useDataProvider } from '@vegaprotocol/react-helpers'; import { AsyncRenderer, Button } from '@vegaprotocol/ui-toolkit'; import { useMemo, useState } from 'react'; diff --git a/apps/explorer/src/app/routes/markets/markets-page.tsx b/apps/explorer/src/app/routes/markets/markets-page.tsx index e68976fb5..d422e6aa8 100644 --- a/apps/explorer/src/app/routes/markets/markets-page.tsx +++ b/apps/explorer/src/app/routes/markets/markets-page.tsx @@ -3,7 +3,7 @@ import { useDocumentTitle } from '../../hooks/use-document-title'; import { marketsProvider } from '@vegaprotocol/market-list'; import { RouteTitle } from '../../components/route-title'; import { AsyncRenderer } from '@vegaprotocol/ui-toolkit'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { useDataProvider } from '@vegaprotocol/react-helpers'; import { MarketsTable } from '../../components/markets/markets-table'; diff --git a/apps/explorer/src/app/routes/network-parameters/network-parameters.spec.tsx b/apps/explorer/src/app/routes/network-parameters/network-parameters.spec.tsx index aeaf04563..67176d0a4 100644 --- a/apps/explorer/src/app/routes/network-parameters/network-parameters.spec.tsx +++ b/apps/explorer/src/app/routes/network-parameters/network-parameters.spec.tsx @@ -1,5 +1,5 @@ import { render, screen } from '@testing-library/react'; -import type { NetworkParamsQuery } from '@vegaprotocol/utils'; +import type { NetworkParamsQuery } from '@vegaprotocol/react-helpers'; import { NetworkParametersTable } from './network-parameters'; describe('NetworkParametersTable', () => { diff --git a/apps/explorer/src/app/routes/network-parameters/network-parameters.tsx b/apps/explorer/src/app/routes/network-parameters/network-parameters.tsx index 28551b385..c9ffa72a6 100644 --- a/apps/explorer/src/app/routes/network-parameters/network-parameters.tsx +++ b/apps/explorer/src/app/routes/network-parameters/network-parameters.tsx @@ -9,8 +9,8 @@ import { formatNumber, removePaginationWrapper, suitableForSyntaxHighlighter, - t, } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { RouteTitle } from '../../components/route-title'; import orderBy from 'lodash/orderBy'; import { useNetworkParamsQuery } from '@vegaprotocol/react-helpers'; diff --git a/apps/explorer/src/app/routes/oracles/components/oracle-data.tsx b/apps/explorer/src/app/routes/oracles/components/oracle-data.tsx index 9033bc2e0..feb73368a 100644 --- a/apps/explorer/src/app/routes/oracles/components/oracle-data.tsx +++ b/apps/explorer/src/app/routes/oracles/components/oracle-data.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { SyntaxHighlighter } from '@vegaprotocol/ui-toolkit'; import filter from 'recursive-key-filter'; import type { ExplorerOracleDataConnectionFragment } from '../__generated__/Oracles'; diff --git a/apps/explorer/src/app/routes/oracles/components/oracle-filter.tsx b/apps/explorer/src/app/routes/oracles/components/oracle-filter.tsx index 807596f90..4fce780cf 100644 --- a/apps/explorer/src/app/routes/oracles/components/oracle-filter.tsx +++ b/apps/explorer/src/app/routes/oracles/components/oracle-filter.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { SyntaxHighlighter } from '@vegaprotocol/ui-toolkit'; import filter from 'recursive-key-filter'; import type { ExplorerOracleDataSourceFragment } from '../__generated__/Oracles'; diff --git a/apps/explorer/src/app/routes/oracles/components/oracle-markets.tsx b/apps/explorer/src/app/routes/oracles/components/oracle-markets.tsx index f12b6b269..a77486b47 100644 --- a/apps/explorer/src/app/routes/oracles/components/oracle-markets.tsx +++ b/apps/explorer/src/app/routes/oracles/components/oracle-markets.tsx @@ -1,4 +1,5 @@ -import { getNodes, t } from '@vegaprotocol/utils'; +import { getNodes } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { MarketLink } from '../../../components/links'; import { TableRow, TableCell, TableHeader } from '../../../components/table'; import type { ExplorerOracleForMarketsMarketFragment } from '../__generated__/OraclesForMarkets'; diff --git a/apps/explorer/src/app/routes/oracles/components/oracle.tsx b/apps/explorer/src/app/routes/oracles/components/oracle.tsx index d337ab64a..ec1c625d8 100644 --- a/apps/explorer/src/app/routes/oracles/components/oracle.tsx +++ b/apps/explorer/src/app/routes/oracles/components/oracle.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { TableRow, TableCell, diff --git a/apps/explorer/src/app/routes/oracles/home/index.tsx b/apps/explorer/src/app/routes/oracles/home/index.tsx index d38cd75a0..192fb6891 100644 --- a/apps/explorer/src/app/routes/oracles/home/index.tsx +++ b/apps/explorer/src/app/routes/oracles/home/index.tsx @@ -1,6 +1,6 @@ import { Loader, SyntaxHighlighter } from '@vegaprotocol/ui-toolkit'; import { RouteTitle } from '../../../components/route-title'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { useExplorerOracleSpecsQuery } from '../__generated__/Oracles'; import { useDocumentTitle } from '../../../hooks/use-document-title'; import { OracleDetails } from '../components/oracle'; diff --git a/apps/explorer/src/app/routes/oracles/id/index.tsx b/apps/explorer/src/app/routes/oracles/id/index.tsx index 3335148f3..0362c6f66 100644 --- a/apps/explorer/src/app/routes/oracles/id/index.tsx +++ b/apps/explorer/src/app/routes/oracles/id/index.tsx @@ -1,6 +1,7 @@ import { RouteTitle } from '../../../components/route-title'; import { RenderFetched } from '../../../components/render-fetched'; -import { t, truncateByChars } from '@vegaprotocol/utils'; +import { truncateByChars } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { useDocumentTitle } from '../../../hooks/use-document-title'; import { useParams } from 'react-router-dom'; import { useExplorerOracleSpecByIdQuery } from '../__generated__/Oracles'; diff --git a/apps/explorer/src/app/routes/parties/home/index.tsx b/apps/explorer/src/app/routes/parties/home/index.tsx index bda947012..56a092b63 100644 --- a/apps/explorer/src/app/routes/parties/home/index.tsx +++ b/apps/explorer/src/app/routes/parties/home/index.tsx @@ -4,7 +4,7 @@ import { JumpTo } from '../../../components/jump-to'; import { useNavigate } from 'react-router-dom'; import { Routes } from '../../route-names'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { useDocumentTitle } from '../../../hooks/use-document-title'; export const JumpToParty = () => { diff --git a/apps/explorer/src/app/routes/parties/id/components/party-accounts.tsx b/apps/explorer/src/app/routes/parties/id/components/party-accounts.tsx index d7b85a7a0..5259a7410 100644 --- a/apps/explorer/src/app/routes/parties/id/components/party-accounts.tsx +++ b/apps/explorer/src/app/routes/parties/id/components/party-accounts.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import get from 'lodash/get'; import AssetBalance from '../../../../components/asset-balance/asset-balance'; import { AssetLink, MarketLink } from '../../../../components/links'; diff --git a/apps/explorer/src/app/routes/parties/id/components/party-id-error.tsx b/apps/explorer/src/app/routes/parties/id/components/party-id-error.tsx index d29d4787f..7bddd618c 100644 --- a/apps/explorer/src/app/routes/parties/id/components/party-id-error.tsx +++ b/apps/explorer/src/app/routes/parties/id/components/party-id-error.tsx @@ -1,4 +1,5 @@ -import { remove0x, t } from '@vegaprotocol/utils'; +import { remove0x } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { ApolloError } from '@apollo/client'; export function isValidPartyId(rawId: string) { diff --git a/apps/explorer/src/app/routes/parties/id/index.tsx b/apps/explorer/src/app/routes/parties/id/index.tsx index d44ee44e8..a2764de41 100644 --- a/apps/explorer/src/app/routes/parties/id/index.tsx +++ b/apps/explorer/src/app/routes/parties/id/index.tsx @@ -1,4 +1,5 @@ -import { getNodes, t } from '@vegaprotocol/utils'; +import { getNodes } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { useScreenDimensions } from '@vegaprotocol/react-helpers'; import { useMemo } from 'react'; import { useParams } from 'react-router-dom'; diff --git a/apps/explorer/src/app/routes/pending/index.tsx b/apps/explorer/src/app/routes/pending/index.tsx index a5ec3c048..5c0834875 100644 --- a/apps/explorer/src/app/routes/pending/index.tsx +++ b/apps/explorer/src/app/routes/pending/index.tsx @@ -3,7 +3,7 @@ import { DATA_SOURCES } from '../../config'; import type { TendermintUnconfirmedTransactionsResponse } from '../txs/tendermint-unconfirmed-transactions-response.d'; import { TxList } from '../../components/txs'; import { RouteTitle } from '../../components/route-title'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { useFetch } from '@vegaprotocol/react-helpers'; import { useDocumentTitle } from '../../hooks/use-document-title'; diff --git a/apps/explorer/src/app/routes/router-config.tsx b/apps/explorer/src/app/routes/router-config.tsx index 8a50f72f8..772b60c64 100644 --- a/apps/explorer/src/app/routes/router-config.tsx +++ b/apps/explorer/src/app/routes/router-config.tsx @@ -17,7 +17,7 @@ import { Tx } from './txs/id'; import { TxsList } from './txs/home'; import { PendingTxs } from './pending'; import flags from '../config/flags'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { Routes } from './route-names'; import { NetworkParameters } from './network-parameters'; import type { RouteObject } from 'react-router-dom'; diff --git a/apps/explorer/src/app/routes/txs/home/index.tsx b/apps/explorer/src/app/routes/txs/home/index.tsx index 7cd41d7fb..08f839739 100644 --- a/apps/explorer/src/app/routes/txs/home/index.tsx +++ b/apps/explorer/src/app/routes/txs/home/index.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { RouteTitle } from '../../../components/route-title'; import { BlocksRefetch } from '../../../components/blocks'; import { TxsInfiniteList } from '../../../components/txs'; diff --git a/apps/explorer/src/app/routes/txs/id/tx-content.tsx b/apps/explorer/src/app/routes/txs/id/tx-content.tsx index c14f85074..1e2c23d45 100644 --- a/apps/explorer/src/app/routes/txs/id/tx-content.tsx +++ b/apps/explorer/src/app/routes/txs/id/tx-content.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { StatusMessage } from '../../../components/status-message'; import { NestedDataList } from '../../../components/nested-data-list'; import type { UnknownObject } from '../../../components/nested-data-list'; diff --git a/apps/explorer/src/app/routes/txs/id/tx-details.tsx b/apps/explorer/src/app/routes/txs/id/tx-details.tsx index e52429702..2c9892110 100644 --- a/apps/explorer/src/app/routes/txs/id/tx-details.tsx +++ b/apps/explorer/src/app/routes/txs/id/tx-details.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { BlockExplorerTransactionResult } from '../../../routes/types/block-explorer-response'; import { TxDetailsWrapper } from '../../../components/txs/details/tx-details-wrapper'; diff --git a/apps/explorer/src/app/routes/validators/validators-page.tsx b/apps/explorer/src/app/routes/validators/validators-page.tsx index a8936fb17..cf70d1547 100644 --- a/apps/explorer/src/app/routes/validators/validators-page.tsx +++ b/apps/explorer/src/app/routes/validators/validators-page.tsx @@ -1,4 +1,5 @@ -import { countryCodeToFlagEmoji, t } from '@vegaprotocol/utils'; +import { countryCodeToFlagEmoji } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { AsyncRenderer, Button, diff --git a/apps/liquidity-provision-dashboard/src/app/components/dashboard/dashboard.tsx b/apps/liquidity-provision-dashboard/src/app/components/dashboard/dashboard.tsx index 44917fc7c..58a4bf70f 100644 --- a/apps/liquidity-provision-dashboard/src/app/components/dashboard/dashboard.tsx +++ b/apps/liquidity-provision-dashboard/src/app/components/dashboard/dashboard.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { Intro } from './intro'; import { MarketList } from './market-list'; diff --git a/apps/liquidity-provision-dashboard/src/app/components/dashboard/intro/intro.tsx b/apps/liquidity-provision-dashboard/src/app/components/dashboard/intro/intro.tsx index 059ce58c4..013c54191 100644 --- a/apps/liquidity-provision-dashboard/src/app/components/dashboard/intro/intro.tsx +++ b/apps/liquidity-provision-dashboard/src/app/components/dashboard/intro/intro.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { ExternalLink } from '@vegaprotocol/ui-toolkit'; // TODO: add mainnet links once docs have been updated diff --git a/apps/liquidity-provision-dashboard/src/app/components/dashboard/market-list/market-list.tsx b/apps/liquidity-provision-dashboard/src/app/components/dashboard/market-list/market-list.tsx index 4a907bdb8..06924c615 100644 --- a/apps/liquidity-provision-dashboard/src/app/components/dashboard/market-list/market-list.tsx +++ b/apps/liquidity-provision-dashboard/src/app/components/dashboard/market-list/market-list.tsx @@ -8,9 +8,10 @@ import { import { addDecimalsFormatNumber, formatNumberPercentage, - t, + getExpiryDate, toBigNum, } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { VegaValueFormatterParams } from '@vegaprotocol/datagrid'; import { PriceChangeCell } from '@vegaprotocol/datagrid'; import type * as Schema from '@vegaprotocol/types'; @@ -30,7 +31,6 @@ import { HealthBar } from '../../health-bar'; import { HealthDialog } from '../../health-dialog'; import { Status } from '../../status'; import { formatDistanceToNow } from 'date-fns'; -import { getExpiryDate } from '@vegaprotocol/utils'; export const MarketList = () => { const { data, error, loading } = useMarketsLiquidity(); diff --git a/apps/liquidity-provision-dashboard/src/app/components/detail/detail.tsx b/apps/liquidity-provision-dashboard/src/app/components/detail/detail.tsx index 724cf6aca..e2972db42 100644 --- a/apps/liquidity-provision-dashboard/src/app/components/detail/detail.tsx +++ b/apps/liquidity-provision-dashboard/src/app/components/detail/detail.tsx @@ -1,6 +1,7 @@ import { useParams } from 'react-router-dom'; import { useMemo } from 'react'; -import { t, makeDerivedDataProvider } from '@vegaprotocol/utils'; +import { makeDerivedDataProvider } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { useDataProvider } from '@vegaprotocol/react-helpers'; import { AsyncRenderer } from '@vegaprotocol/ui-toolkit'; diff --git a/apps/liquidity-provision-dashboard/src/app/components/detail/header/header.tsx b/apps/liquidity-provision-dashboard/src/app/components/detail/header/header.tsx index 717b14bbe..abf8efc7c 100644 --- a/apps/liquidity-provision-dashboard/src/app/components/detail/header/header.tsx +++ b/apps/liquidity-provision-dashboard/src/app/components/detail/header/header.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { Link } from 'react-router-dom'; import { Icon } from '@vegaprotocol/ui-toolkit'; diff --git a/apps/liquidity-provision-dashboard/src/app/components/detail/market/market.tsx b/apps/liquidity-provision-dashboard/src/app/components/detail/market/market.tsx index 751d61d00..ee465081d 100644 --- a/apps/liquidity-provision-dashboard/src/app/components/detail/market/market.tsx +++ b/apps/liquidity-provision-dashboard/src/app/components/detail/market/market.tsx @@ -1,5 +1,5 @@ import { useState } from 'react'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { Icon } from '@vegaprotocol/ui-toolkit'; import { formatWithAsset } from '@vegaprotocol/liquidity'; diff --git a/apps/liquidity-provision-dashboard/src/app/components/detail/providers/providers.tsx b/apps/liquidity-provision-dashboard/src/app/components/detail/providers/providers.tsx index 145aa517c..9a1a79b56 100644 --- a/apps/liquidity-provision-dashboard/src/app/components/detail/providers/providers.tsx +++ b/apps/liquidity-provision-dashboard/src/app/components/detail/providers/providers.tsx @@ -2,7 +2,7 @@ import { useCallback } from 'react'; import { AgGridColumn } from 'ag-grid-react'; import type { GetRowIdParams } from 'ag-grid-community'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { LiquidityProviderFeeShareFieldsFragment, diff --git a/apps/liquidity-provision-dashboard/src/app/components/health-bar/health-bar.tsx b/apps/liquidity-provision-dashboard/src/app/components/health-bar/health-bar.tsx index 9a1002312..947f5fc72 100644 --- a/apps/liquidity-provision-dashboard/src/app/components/health-bar/health-bar.tsx +++ b/apps/liquidity-provision-dashboard/src/app/components/health-bar/health-bar.tsx @@ -1,6 +1,7 @@ import classNames from 'classnames'; import type * as Schema from '@vegaprotocol/types'; -import { t, addDecimalsFormatNumber } from '@vegaprotocol/utils'; +import { addDecimalsFormatNumber } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { BigNumber } from 'bignumber.js'; import type { ReactNode } from 'react'; diff --git a/apps/liquidity-provision-dashboard/src/app/components/health-dialog/health-dialog.tsx b/apps/liquidity-provision-dashboard/src/app/components/health-dialog/health-dialog.tsx index 2135fe15c..d383e9357 100644 --- a/apps/liquidity-provision-dashboard/src/app/components/health-dialog/health-dialog.tsx +++ b/apps/liquidity-provision-dashboard/src/app/components/health-dialog/health-dialog.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { Dialog } from '@vegaprotocol/ui-toolkit'; import * as Schema from '@vegaprotocol/types'; import classNames from 'classnames'; diff --git a/apps/liquidity-provision-dashboard/src/app/components/status/status.tsx b/apps/liquidity-provision-dashboard/src/app/components/status/status.tsx index a3a4a4841..235c83917 100644 --- a/apps/liquidity-provision-dashboard/src/app/components/status/status.tsx +++ b/apps/liquidity-provision-dashboard/src/app/components/status/status.tsx @@ -2,7 +2,7 @@ import { Lozenge, Tooltip } from '@vegaprotocol/ui-toolkit'; import classNames from 'classnames'; import * as Schema from '@vegaprotocol/types'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { Indicator } from '../indicator'; diff --git a/apps/liquidity-provision-dashboard/src/app/routes/router-config.tsx b/apps/liquidity-provision-dashboard/src/app/routes/router-config.tsx index 427e94bf2..1568b43b8 100644 --- a/apps/liquidity-provision-dashboard/src/app/routes/router-config.tsx +++ b/apps/liquidity-provision-dashboard/src/app/routes/router-config.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { Dashboard } from '../components/dashboard'; import { Detail } from '../components/detail'; diff --git a/apps/multisig-signer/src/app/app.tsx b/apps/multisig-signer/src/app/app.tsx index cee811316..d5dfc7bb5 100644 --- a/apps/multisig-signer/src/app/app.tsx +++ b/apps/multisig-signer/src/app/app.tsx @@ -10,7 +10,7 @@ import { import { AsyncRenderer, Button, Lozenge } from '@vegaprotocol/ui-toolkit'; import type { EthereumConfig } from '@vegaprotocol/web3'; import { useEthereumConfig, Web3Provider } from '@vegaprotocol/web3'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { ENV } from './config/env'; import { ContractsProvider } from './config/contracts/contracts-provider'; import { diff --git a/apps/multisig-signer/src/app/components/add-signer-form/add-signer-form.tsx b/apps/multisig-signer/src/app/components/add-signer-form/add-signer-form.tsx index 72f61f99e..997c536a8 100644 --- a/apps/multisig-signer/src/app/components/add-signer-form/add-signer-form.tsx +++ b/apps/multisig-signer/src/app/components/add-signer-form/add-signer-form.tsx @@ -1,7 +1,7 @@ import { useState } from 'react'; import { gql, useLazyQuery } from '@apollo/client'; import { captureException } from '@sentry/react'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { useEthereumTransaction } from '@vegaprotocol/web3'; import { FormGroup, diff --git a/apps/multisig-signer/src/app/components/remove-signer-form/remove-signer-form.tsx b/apps/multisig-signer/src/app/components/remove-signer-form/remove-signer-form.tsx index 7c2d11fc2..a6628430a 100644 --- a/apps/multisig-signer/src/app/components/remove-signer-form/remove-signer-form.tsx +++ b/apps/multisig-signer/src/app/components/remove-signer-form/remove-signer-form.tsx @@ -1,7 +1,7 @@ import { useState } from 'react'; import { gql, useLazyQuery } from '@apollo/client'; import { captureException } from '@sentry/react'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { useEthereumTransaction } from '@vegaprotocol/web3'; import { FormGroup, diff --git a/apps/token/src/components/token-input/token-input.tsx b/apps/token/src/components/token-input/token-input.tsx index b45018a77..44228247e 100644 --- a/apps/token/src/components/token-input/token-input.tsx +++ b/apps/token/src/components/token-input/token-input.tsx @@ -7,7 +7,7 @@ import { Lozenge, ButtonLink, } from '@vegaprotocol/ui-toolkit'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import React from 'react'; import { useTranslation } from 'react-i18next'; diff --git a/apps/token/src/components/vega-wallet/hooks.ts b/apps/token/src/components/vega-wallet/hooks.ts index 2caab2e97..a98cb413a 100644 --- a/apps/token/src/components/vega-wallet/hooks.ts +++ b/apps/token/src/components/vega-wallet/hooks.ts @@ -14,12 +14,12 @@ import { useVegaWallet } from '@vegaprotocol/wallet'; import { useContracts } from '../../contexts/contracts/contracts-context'; import * as Schema from '@vegaprotocol/types'; import { + addDecimal, isAssetTypeERC20, removePaginationWrapper, toBigNum, } from '@vegaprotocol/utils'; import { useAppState } from '../../contexts/app-state/app-state-context'; -import { addDecimal } from '@vegaprotocol/utils'; import type { DelegationsQuery, DelegationsQueryVariables, diff --git a/apps/token/src/routes/contracts/index.tsx b/apps/token/src/routes/contracts/index.tsx index bfb33f545..bf730d991 100644 --- a/apps/token/src/routes/contracts/index.tsx +++ b/apps/token/src/routes/contracts/index.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { Link, Splash } from '@vegaprotocol/ui-toolkit'; import type { EthereumConfig } from '@vegaprotocol/web3'; import { useEthereumConfig } from '@vegaprotocol/web3'; diff --git a/apps/token/src/routes/proposals/components/current-proposal-status/current-proposal-status.spec.tsx b/apps/token/src/routes/proposals/components/current-proposal-status/current-proposal-status.spec.tsx index 50dc6f41a..3841d760d 100644 --- a/apps/token/src/routes/proposals/components/current-proposal-status/current-proposal-status.spec.tsx +++ b/apps/token/src/routes/proposals/components/current-proposal-status/current-proposal-status.spec.tsx @@ -2,8 +2,8 @@ import type { MockedResponse } from '@apollo/client/testing'; import { MockedProvider } from '@apollo/client/testing'; import { render, screen } from '@testing-library/react'; import { ProposalRejectionReason, ProposalState } from '@vegaprotocol/types'; -import type { NetworkParamsQuery } from '@vegaprotocol/utils'; -import { NetworkParamsDocument } from '@vegaprotocol/utils'; +import type { NetworkParamsQuery } from '@vegaprotocol/react-helpers'; +import { NetworkParamsDocument } from '@vegaprotocol/react-helpers'; import { AppStateProvider } from '../../../../contexts/app-state/app-state-provider'; import { generateProposal } from '../../test-helpers/generate-proposals'; import { CurrentProposalStatus } from './current-proposal-status'; diff --git a/apps/token/src/routes/proposals/components/vote-details/vote-transaction-dialog.tsx b/apps/token/src/routes/proposals/components/vote-details/vote-transaction-dialog.tsx index fb1872015..59f04d705 100644 --- a/apps/token/src/routes/proposals/components/vote-details/vote-transaction-dialog.tsx +++ b/apps/token/src/routes/proposals/components/vote-details/vote-transaction-dialog.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { VoteState } from './use-user-vote'; import type { DialogProps } from '@vegaprotocol/wallet'; diff --git a/apps/token/src/routes/proposals/propose/freeform/propose-freeform.spec.tsx b/apps/token/src/routes/proposals/propose/freeform/propose-freeform.spec.tsx index fd2fcd5d4..530404033 100644 --- a/apps/token/src/routes/proposals/propose/freeform/propose-freeform.spec.tsx +++ b/apps/token/src/routes/proposals/propose/freeform/propose-freeform.spec.tsx @@ -5,9 +5,9 @@ import { mockWalletContext } from '../../test-helpers/mocks'; import { AppStateProvider } from '../../../../contexts/app-state/app-state-provider'; import { VegaWalletContext } from '@vegaprotocol/wallet'; import { MemoryRouter as Router } from 'react-router-dom'; -import type { NetworkParamsQuery } from '@vegaprotocol/utils'; +import type { NetworkParamsQuery } from '@vegaprotocol/react-helpers'; import type { MockedResponse } from '@apollo/client/testing'; -import { NetworkParamsDocument } from '@vegaprotocol/utils'; +import { NetworkParamsDocument } from '@vegaprotocol/react-helpers'; jest.mock('@vegaprotocol/environment', () => ({ useEnvironment: () => ({ diff --git a/apps/token/src/routes/proposals/propose/network-parameter/propose-network-parameter.spec.tsx b/apps/token/src/routes/proposals/propose/network-parameter/propose-network-parameter.spec.tsx index db1165233..2afe71cd6 100644 --- a/apps/token/src/routes/proposals/propose/network-parameter/propose-network-parameter.spec.tsx +++ b/apps/token/src/routes/proposals/propose/network-parameter/propose-network-parameter.spec.tsx @@ -5,8 +5,8 @@ import { mockWalletContext } from '../../test-helpers/mocks'; import { AppStateProvider } from '../../../../contexts/app-state/app-state-provider'; import { VegaWalletContext } from '@vegaprotocol/wallet'; import { MemoryRouter as Router } from 'react-router-dom'; -import type { NetworkParamsQuery } from '@vegaprotocol/utils'; -import { NetworkParamsDocument } from '@vegaprotocol/utils'; +import type { NetworkParamsQuery } from '@vegaprotocol/react-helpers'; +import { NetworkParamsDocument } from '@vegaprotocol/react-helpers'; import type { MockedResponse } from '@apollo/client/testing'; jest.mock('@vegaprotocol/environment', () => ({ diff --git a/apps/token/src/routes/proposals/propose/new-asset/propose-new-asset.spec.tsx b/apps/token/src/routes/proposals/propose/new-asset/propose-new-asset.spec.tsx index a87595382..d82474862 100644 --- a/apps/token/src/routes/proposals/propose/new-asset/propose-new-asset.spec.tsx +++ b/apps/token/src/routes/proposals/propose/new-asset/propose-new-asset.spec.tsx @@ -5,9 +5,9 @@ import { VegaWalletContext } from '@vegaprotocol/wallet'; import { AppStateProvider } from '../../../../contexts/app-state/app-state-provider'; import { mockWalletContext } from '../../test-helpers/mocks'; import { ProposeNewAsset } from './propose-new-asset'; -import type { NetworkParamsQuery } from '@vegaprotocol/utils'; +import type { NetworkParamsQuery } from '@vegaprotocol/react-helpers'; import type { MockedResponse } from '@apollo/client/testing'; -import { NetworkParamsDocument } from '@vegaprotocol/utils'; +import { NetworkParamsDocument } from '@vegaprotocol/react-helpers'; jest.mock('@vegaprotocol/environment', () => ({ useEnvironment: () => ({ diff --git a/apps/token/src/routes/proposals/propose/new-market/propose-new-market.spec.tsx b/apps/token/src/routes/proposals/propose/new-market/propose-new-market.spec.tsx index 4fe3982db..1c0cd6f03 100644 --- a/apps/token/src/routes/proposals/propose/new-market/propose-new-market.spec.tsx +++ b/apps/token/src/routes/proposals/propose/new-market/propose-new-market.spec.tsx @@ -6,8 +6,8 @@ import { AppStateProvider } from '../../../../contexts/app-state/app-state-provi import { VegaWalletContext } from '@vegaprotocol/wallet'; import { BrowserRouter as Router } from 'react-router-dom'; import type { MockedResponse } from '@apollo/client/testing'; -import type { NetworkParamsQuery } from '@vegaprotocol/utils'; -import { NetworkParamsDocument } from '@vegaprotocol/utils'; +import type { NetworkParamsQuery } from '@vegaprotocol/react-helpers'; +import { NetworkParamsDocument } from '@vegaprotocol/react-helpers'; jest.mock('@vegaprotocol/environment', () => ({ useEnvironment: () => ({ diff --git a/apps/token/src/routes/proposals/propose/raw/proposal-raw.spec.tsx b/apps/token/src/routes/proposals/propose/raw/proposal-raw.spec.tsx index 357ee955f..240065317 100644 --- a/apps/token/src/routes/proposals/propose/raw/proposal-raw.spec.tsx +++ b/apps/token/src/routes/proposals/propose/raw/proposal-raw.spec.tsx @@ -10,8 +10,8 @@ import { ProposeRaw } from './propose-raw'; import { ProposalEventDocument } from '@vegaprotocol/governance'; import type { ProposalEventSubscription } from '@vegaprotocol/governance'; -import type { NetworkParamsQuery } from '@vegaprotocol/utils'; -import { NetworkParamsDocument } from '@vegaprotocol/utils'; +import type { NetworkParamsQuery } from '@vegaprotocol/react-helpers'; +import { NetworkParamsDocument } from '@vegaprotocol/react-helpers'; const paramsDelay = 20; diff --git a/apps/token/src/routes/proposals/propose/update-asset/propose-update-asset.spec.tsx b/apps/token/src/routes/proposals/propose/update-asset/propose-update-asset.spec.tsx index b15b103f5..cd86a9994 100644 --- a/apps/token/src/routes/proposals/propose/update-asset/propose-update-asset.spec.tsx +++ b/apps/token/src/routes/proposals/propose/update-asset/propose-update-asset.spec.tsx @@ -5,9 +5,9 @@ import { VegaWalletContext } from '@vegaprotocol/wallet'; import { AppStateProvider } from '../../../../contexts/app-state/app-state-provider'; import { mockWalletContext } from '../../test-helpers/mocks'; import { ProposeUpdateAsset } from './propose-update-asset'; -import type { NetworkParamsQuery } from '@vegaprotocol/utils'; +import type { NetworkParamsQuery } from '@vegaprotocol/react-helpers'; import type { MockedResponse } from '@apollo/client/testing'; -import { NetworkParamsDocument } from '@vegaprotocol/utils'; +import { NetworkParamsDocument } from '@vegaprotocol/react-helpers'; jest.mock('@vegaprotocol/environment', () => ({ useEnvironment: () => ({ diff --git a/apps/token/src/routes/proposals/propose/update-market/propose-update-market.spec.tsx b/apps/token/src/routes/proposals/propose/update-market/propose-update-market.spec.tsx index b11a17248..2b8f6776f 100644 --- a/apps/token/src/routes/proposals/propose/update-market/propose-update-market.spec.tsx +++ b/apps/token/src/routes/proposals/propose/update-market/propose-update-market.spec.tsx @@ -6,8 +6,8 @@ import { VegaWalletContext } from '@vegaprotocol/wallet'; import { AppStateProvider } from '../../../../contexts/app-state/app-state-provider'; import { mockWalletContext } from '../../test-helpers/mocks'; import { ProposeUpdateMarket } from './propose-update-market'; -import type { NetworkParamsQuery } from '@vegaprotocol/utils'; -import { NetworkParamsDocument } from '@vegaprotocol/utils'; +import type { NetworkParamsQuery } from '@vegaprotocol/react-helpers'; +import { NetworkParamsDocument } from '@vegaprotocol/react-helpers'; import type { ProposalMarketsQueryQuery } from './__generated___/UpdateMarket'; import { ProposalMarketsQueryDocument } from './__generated___/UpdateMarket'; diff --git a/apps/token/src/routes/token/index.tsx b/apps/token/src/routes/token/index.tsx index 0f332299b..c30eb53c5 100644 --- a/apps/token/src/routes/token/index.tsx +++ b/apps/token/src/routes/token/index.tsx @@ -3,14 +3,13 @@ import { Trans, useTranslation } from 'react-i18next'; import { Link } from 'react-router-dom'; import { Heading, SubHeading } from '../../components/heading'; -import { ExternalLinks } from '@vegaprotocol/utils'; +import { ExternalLinks, toBigNum } from '@vegaprotocol/utils'; import { useAppState } from '../../contexts/app-state/app-state-context'; import { useDocumentTitle } from '../../hooks/use-document-title'; import type { RouteChildProps } from '..'; import Routes from '../routes'; import { TokenDetails } from './token-details'; import { Button } from '@vegaprotocol/ui-toolkit'; -import { toBigNum } from '@vegaprotocol/utils'; import { useNodeDataQuery } from './__generated___/NodeData'; const Home = ({ name }: RouteChildProps) => { diff --git a/apps/trading/client-pages/liquidity/liquidity.tsx b/apps/trading/client-pages/liquidity/liquidity.tsx index 8bb40213c..f453db9b0 100644 --- a/apps/trading/client-pages/liquidity/liquidity.tsx +++ b/apps/trading/client-pages/liquidity/liquidity.tsx @@ -8,8 +8,8 @@ import { tooltipMapping } from '@vegaprotocol/market-info'; import { addDecimalsFormatNumber, formatNumberPercentage, - t, } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { NetworkParams, useDataProvider, diff --git a/apps/trading/client-pages/market/constants.ts b/apps/trading/client-pages/market/constants.ts index 56590c6ae..13cb2d9d6 100644 --- a/apps/trading/client-pages/market/constants.ts +++ b/apps/trading/client-pages/market/constants.ts @@ -1,3 +1,3 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; export const NO_MARKET = t('No market'); diff --git a/apps/trading/client-pages/market/market.tsx b/apps/trading/client-pages/market/market.tsx index 67e1fb01d..613a0a6c2 100644 --- a/apps/trading/client-pages/market/market.tsx +++ b/apps/trading/client-pages/market/market.tsx @@ -1,6 +1,7 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react'; import debounce from 'lodash/debounce'; -import { addDecimalsFormatNumber, t, titlefy } from '@vegaprotocol/utils'; +import { addDecimalsFormatNumber, titlefy } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { useDataProvider, useThrottledDataProvider, diff --git a/apps/trading/client-pages/market/trade-grid.tsx b/apps/trading/client-pages/market/trade-grid.tsx index f59684330..c73755154 100644 --- a/apps/trading/client-pages/market/trade-grid.tsx +++ b/apps/trading/client-pages/market/trade-grid.tsx @@ -19,7 +19,7 @@ import { ResizableGridPanel, Splash, } from '@vegaprotocol/ui-toolkit'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { AccountsContainer } from '../../components/accounts-container'; import type { Market } from '@vegaprotocol/market-list'; import { VegaWalletContainer } from '../../components/vega-wallet-container'; diff --git a/apps/trading/client-pages/market/trade-market-header.tsx b/apps/trading/client-pages/market/trade-market-header.tsx index d8a05b1a1..706f6297a 100644 --- a/apps/trading/client-pages/market/trade-market-header.tsx +++ b/apps/trading/client-pages/market/trade-market-header.tsx @@ -3,7 +3,8 @@ import { useEnvironment } from '@vegaprotocol/environment'; import { ButtonLink, Link } from '@vegaprotocol/ui-toolkit'; import { MarketProposalNotification } from '@vegaprotocol/governance'; import type { Market } from '@vegaprotocol/market-list'; -import { getExpiryDate, getMarketExpiryDate, t } from '@vegaprotocol/utils'; +import { getExpiryDate, getMarketExpiryDate } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { ColumnKind, SelectMarketPopover, diff --git a/apps/trading/client-pages/markets/markets-page.tsx b/apps/trading/client-pages/markets/markets-page.tsx index 8b507fb38..49c90ea64 100644 --- a/apps/trading/client-pages/markets/markets-page.tsx +++ b/apps/trading/client-pages/markets/markets-page.tsx @@ -1,5 +1,6 @@ import React, { useEffect } from 'react'; -import { t, titlefy } from '@vegaprotocol/utils'; +import { titlefy } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { Tabs, Tab } from '@vegaprotocol/ui-toolkit'; import { Markets } from './markets'; import { Proposed } from './proposed'; diff --git a/apps/trading/client-pages/markets/proposed.tsx b/apps/trading/client-pages/markets/proposed.tsx index 74bcb9a5f..59fc258b2 100644 --- a/apps/trading/client-pages/markets/proposed.tsx +++ b/apps/trading/client-pages/markets/proposed.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { DApp, TOKEN_NEW_MARKET_PROPOSAL, diff --git a/apps/trading/client-pages/portfolio/account-history-container.tsx b/apps/trading/client-pages/portfolio/account-history-container.tsx index a86b00e93..f83695dec 100644 --- a/apps/trading/client-pages/portfolio/account-history-container.tsx +++ b/apps/trading/client-pages/portfolio/account-history-container.tsx @@ -1,4 +1,5 @@ -import { addDecimal, fromNanoSeconds, t } from '@vegaprotocol/utils'; +import { addDecimal, fromNanoSeconds } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { useVegaWallet } from '@vegaprotocol/wallet'; import compact from 'lodash/compact'; import uniqBy from 'lodash/uniqBy'; diff --git a/apps/trading/client-pages/portfolio/deposits-container.tsx b/apps/trading/client-pages/portfolio/deposits-container.tsx index 440fa1714..917d4da13 100644 --- a/apps/trading/client-pages/portfolio/deposits-container.tsx +++ b/apps/trading/client-pages/portfolio/deposits-container.tsx @@ -1,7 +1,7 @@ import { AsyncRenderer, Button } from '@vegaprotocol/ui-toolkit'; import { useDepositDialog, DepositsTable } from '@vegaprotocol/deposits'; import { depositsProvider } from '@vegaprotocol/deposits'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { useDataProvider } from '@vegaprotocol/react-helpers'; import { useVegaWallet } from '@vegaprotocol/wallet'; diff --git a/apps/trading/client-pages/portfolio/portfolio.tsx b/apps/trading/client-pages/portfolio/portfolio.tsx index 2abb188bd..128d44605 100644 --- a/apps/trading/client-pages/portfolio/portfolio.tsx +++ b/apps/trading/client-pages/portfolio/portfolio.tsx @@ -1,4 +1,5 @@ -import { t, titlefy } from '@vegaprotocol/utils'; +import { titlefy } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { PositionsContainer } from '@vegaprotocol/positions'; import { OrderListContainer } from '@vegaprotocol/orders'; import { ResizableGridPanel, Tab, Tabs } from '@vegaprotocol/ui-toolkit'; diff --git a/apps/trading/client-pages/portfolio/withdrawals-container.tsx b/apps/trading/client-pages/portfolio/withdrawals-container.tsx index c141d67d5..13f7e48f9 100644 --- a/apps/trading/client-pages/portfolio/withdrawals-container.tsx +++ b/apps/trading/client-pages/portfolio/withdrawals-container.tsx @@ -5,7 +5,7 @@ import { WithdrawalsTable, } from '@vegaprotocol/withdraws'; import { useVegaWallet } from '@vegaprotocol/wallet'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { useDataProvider } from '@vegaprotocol/react-helpers'; import { VegaWalletContainer } from '../../components/vega-wallet-container'; diff --git a/apps/trading/components/accounts-container/accounts-container.tsx b/apps/trading/components/accounts-container/accounts-container.tsx index 2fd219c41..95f9f9ae2 100644 --- a/apps/trading/components/accounts-container/accounts-container.tsx +++ b/apps/trading/components/accounts-container/accounts-container.tsx @@ -1,6 +1,6 @@ import { useCallback } from 'react'; import { Button } from '@vegaprotocol/ui-toolkit'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { useWithdrawalDialog } from '@vegaprotocol/withdraws'; import { useAssetDetailsDialogStore } from '@vegaprotocol/assets'; import { Splash } from '@vegaprotocol/ui-toolkit'; diff --git a/apps/trading/components/app-loader/app-failure.tsx b/apps/trading/components/app-loader/app-failure.tsx index daf79caa1..842db1e2c 100644 --- a/apps/trading/components/app-loader/app-failure.tsx +++ b/apps/trading/components/app-loader/app-failure.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { Button } from '@vegaprotocol/ui-toolkit'; import { useGlobalStore } from '../../stores'; diff --git a/apps/trading/components/app-loader/app-loader.tsx b/apps/trading/components/app-loader/app-loader.tsx index 5c16a0fe1..8a63dd8cb 100644 --- a/apps/trading/components/app-loader/app-loader.tsx +++ b/apps/trading/components/app-loader/app-loader.tsx @@ -4,7 +4,7 @@ import { NodeGuard, useEnvironment, } from '@vegaprotocol/environment'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { MaintenancePage } from '@vegaprotocol/ui-toolkit'; import { VegaWalletProvider } from '@vegaprotocol/wallet'; import dynamic from 'next/dynamic'; diff --git a/apps/trading/components/app-loader/web3-provider.tsx b/apps/trading/components/app-loader/web3-provider.tsx index 040c1aeb9..f26ca6956 100644 --- a/apps/trading/components/app-loader/web3-provider.tsx +++ b/apps/trading/components/app-loader/web3-provider.tsx @@ -5,7 +5,7 @@ import { useWeb3ConnectStore, } from '@vegaprotocol/web3'; import { AsyncRenderer } from '@vegaprotocol/ui-toolkit'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { useEnvironment } from '@vegaprotocol/environment'; import type { ReactNode } from 'react'; import { useEffect } from 'react'; diff --git a/apps/trading/components/constants.ts b/apps/trading/components/constants.ts index bf7f86fa0..5a41d2910 100644 --- a/apps/trading/components/constants.ts +++ b/apps/trading/components/constants.ts @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; export const THROTTLE_UPDATE_TIME = 500; export const RISK_ACCEPTED_KEY = 'vega-risk-accepted'; export const MAINNET_WELCOME_HEADER = t( diff --git a/apps/trading/components/footer/footer.tsx b/apps/trading/components/footer/footer.tsx index fd2098365..3484f5f28 100644 --- a/apps/trading/components/footer/footer.tsx +++ b/apps/trading/components/footer/footer.tsx @@ -1,6 +1,6 @@ import { useEnvironment, useNodeHealth } from '@vegaprotocol/environment'; import { useNavigatorOnline } from '@vegaprotocol/react-helpers'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { Indicator, Intent } from '@vegaprotocol/ui-toolkit'; import classNames from 'classnames'; import type { ButtonHTMLAttributes, ReactNode } from 'react'; diff --git a/apps/trading/components/liquidity-supplied/liquidity-supplied.tsx b/apps/trading/components/liquidity-supplied/liquidity-supplied.tsx index 0c32c9579..f161a7454 100644 --- a/apps/trading/components/liquidity-supplied/liquidity-supplied.tsx +++ b/apps/trading/components/liquidity-supplied/liquidity-supplied.tsx @@ -22,8 +22,8 @@ import { AuctionTrigger, MarketTradingMode } from '@vegaprotocol/types'; import { addDecimalsFormatNumber, formatNumberPercentage, - t, } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; interface Props { marketId?: string; diff --git a/apps/trading/components/market-state/market-state.tsx b/apps/trading/components/market-state/market-state.tsx index 2b1d9ff1e..cd11604c6 100644 --- a/apps/trading/components/market-state/market-state.tsx +++ b/apps/trading/components/market-state/market-state.tsx @@ -5,7 +5,7 @@ import type { Market, } from '@vegaprotocol/market-list'; import { marketDataProvider } from '@vegaprotocol/market-list'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { useDataProvider } from '@vegaprotocol/react-helpers'; import * as Schema from '@vegaprotocol/types'; import { HeaderStat } from '../header'; diff --git a/apps/trading/components/market-trading-mode/market-trading-mode.tsx b/apps/trading/components/market-trading-mode/market-trading-mode.tsx index eb93521d7..c3c1a50e3 100644 --- a/apps/trading/components/market-trading-mode/market-trading-mode.tsx +++ b/apps/trading/components/market-trading-mode/market-trading-mode.tsx @@ -1,5 +1,5 @@ import type { RefObject } from 'react'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { TradingModeTooltip } from '@vegaprotocol/deal-ticket'; import { useInView } from 'react-intersection-observer'; import * as Schema from '@vegaprotocol/types'; diff --git a/apps/trading/components/market-volume/market-volume.tsx b/apps/trading/components/market-volume/market-volume.tsx index ae5697970..9d24df184 100644 --- a/apps/trading/components/market-volume/market-volume.tsx +++ b/apps/trading/components/market-volume/market-volume.tsx @@ -1,6 +1,7 @@ import { useCallback, useMemo, useRef, useState } from 'react'; import throttle from 'lodash/throttle'; -import { addDecimalsFormatNumber, t } from '@vegaprotocol/utils'; +import { addDecimalsFormatNumber } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { useDataProvider } from '@vegaprotocol/react-helpers'; import type { MarketData, diff --git a/apps/trading/components/navbar/navbar.tsx b/apps/trading/components/navbar/navbar.tsx index a3bc3634e..bc65bcaae 100644 --- a/apps/trading/components/navbar/navbar.tsx +++ b/apps/trading/components/navbar/navbar.tsx @@ -7,7 +7,7 @@ import { TOKEN_GOVERNANCE, useLinks, } from '@vegaprotocol/environment'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { useGlobalStore } from '../../stores'; import { VegaWalletConnectButton } from '../vega-wallet-connect-button'; import { diff --git a/apps/trading/components/select-market/select-market-columns.tsx b/apps/trading/components/select-market/select-market-columns.tsx index 9a80deee7..817992b94 100644 --- a/apps/trading/components/select-market/select-market-columns.tsx +++ b/apps/trading/components/select-market/select-market-columns.tsx @@ -5,7 +5,8 @@ import { calcCandleLow, calcCandleVolume, } from '@vegaprotocol/market-list'; -import { addDecimalsFormatNumber, t } from '@vegaprotocol/utils'; +import { addDecimalsFormatNumber } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { PriceCell, signedNumberCssClass } from '@vegaprotocol/datagrid'; import { Link as UILink, Sparkline, Tooltip } from '@vegaprotocol/ui-toolkit'; import isNil from 'lodash/isNil'; diff --git a/apps/trading/components/select-market/select-market.tsx b/apps/trading/components/select-market/select-market.tsx index ef944930b..6f08ab8de 100644 --- a/apps/trading/components/select-market/select-market.tsx +++ b/apps/trading/components/select-market/select-market.tsx @@ -2,7 +2,7 @@ import { useCallback, useEffect, useMemo, useState, useRef } from 'react'; import type { RefObject } from 'react'; import { useMarketList } from '@vegaprotocol/market-list'; import { positionsDataProvider } from '@vegaprotocol/positions'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { useDataProvider } from '@vegaprotocol/react-helpers'; import { ExternalLink, Icon, Loader, Popover } from '@vegaprotocol/ui-toolkit'; import { useVegaWallet } from '@vegaprotocol/wallet'; diff --git a/apps/trading/components/vega-wallet-connect-button/vega-wallet-connect-button.tsx b/apps/trading/components/vega-wallet-connect-button/vega-wallet-connect-button.tsx index 7f0891895..a83a59479 100644 --- a/apps/trading/components/vega-wallet-connect-button/vega-wallet-connect-button.tsx +++ b/apps/trading/components/vega-wallet-connect-button/vega-wallet-connect-button.tsx @@ -1,7 +1,8 @@ import { useCallback, useEffect, useMemo, useState } from 'react'; import CopyToClipboard from 'react-copy-to-clipboard'; import classNames from 'classnames'; -import { t, truncateByChars } from '@vegaprotocol/utils'; +import { truncateByChars } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { Button, DropdownMenu, diff --git a/apps/trading/components/vega-wallet-container/vega-wallet-container.tsx b/apps/trading/components/vega-wallet-container/vega-wallet-container.tsx index ae937da56..18d72ecae 100644 --- a/apps/trading/components/vega-wallet-container/vega-wallet-container.tsx +++ b/apps/trading/components/vega-wallet-container/vega-wallet-container.tsx @@ -1,5 +1,5 @@ import type { ReactNode } from 'react'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { Button, Splash } from '@vegaprotocol/ui-toolkit'; import { useVegaWallet, useVegaWalletDialogStore } from '@vegaprotocol/wallet'; diff --git a/apps/trading/components/welcome-dialog/proposed-markets.tsx b/apps/trading/components/welcome-dialog/proposed-markets.tsx index 169c27386..71d204586 100644 --- a/apps/trading/components/welcome-dialog/proposed-markets.tsx +++ b/apps/trading/components/welcome-dialog/proposed-markets.tsx @@ -1,5 +1,5 @@ import { useMemo } from 'react'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { useDataProvider } from '@vegaprotocol/react-helpers'; import { proposalsDataProvider } from '@vegaprotocol/governance'; import take from 'lodash/take'; diff --git a/apps/trading/components/welcome-dialog/risk-notice-dialog.tsx b/apps/trading/components/welcome-dialog/risk-notice-dialog.tsx index 79f0e272c..650d59da7 100644 --- a/apps/trading/components/welcome-dialog/risk-notice-dialog.tsx +++ b/apps/trading/components/welcome-dialog/risk-notice-dialog.tsx @@ -1,5 +1,5 @@ import { useCallback } from 'react'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { Button } from '@vegaprotocol/ui-toolkit'; import { LocalStorage } from '@vegaprotocol/utils'; import { RISK_ACCEPTED_KEY } from '../constants'; diff --git a/apps/trading/components/welcome-dialog/welcome-dialog.tsx b/apps/trading/components/welcome-dialog/welcome-dialog.tsx index a68dcca1d..de47d6694 100644 --- a/apps/trading/components/welcome-dialog/welcome-dialog.tsx +++ b/apps/trading/components/welcome-dialog/welcome-dialog.tsx @@ -1,7 +1,7 @@ import React, { useCallback } from 'react'; import { useLocation } from 'react-router-dom'; import { Dialog } from '@vegaprotocol/ui-toolkit'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { useDataProvider, useLocalStorage } from '@vegaprotocol/react-helpers'; import { activeMarketsProvider } from '@vegaprotocol/market-list'; import { useEnvironment, Networks } from '@vegaprotocol/environment'; diff --git a/apps/trading/components/welcome-dialog/welcome-landing-dialog.tsx b/apps/trading/components/welcome-dialog/welcome-landing-dialog.tsx index f00d4654e..b65f0cbe3 100644 --- a/apps/trading/components/welcome-dialog/welcome-landing-dialog.tsx +++ b/apps/trading/components/welcome-dialog/welcome-landing-dialog.tsx @@ -1,6 +1,6 @@ import React, { useCallback } from 'react'; import { useMarketList } from '@vegaprotocol/market-list'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { useAssetDetailsDialogStore } from '@vegaprotocol/assets'; import { Link as UILink } from '@vegaprotocol/ui-toolkit'; import type { OnCellClickHandler } from '../select-market'; diff --git a/apps/trading/components/welcome-dialog/welcome-notice-dialog.tsx b/apps/trading/components/welcome-dialog/welcome-notice-dialog.tsx index d699e8a23..a6540d3cc 100644 --- a/apps/trading/components/welcome-dialog/welcome-notice-dialog.tsx +++ b/apps/trading/components/welcome-dialog/welcome-notice-dialog.tsx @@ -1,5 +1,5 @@ import { ExternalLink } from '@vegaprotocol/ui-toolkit'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { BLOG, DApp, diff --git a/apps/trading/lib/hooks/use-ethereum-transaction-toasts.tsx b/apps/trading/lib/hooks/use-ethereum-transaction-toasts.tsx index b5cfd17b3..c41cfcfeb 100644 --- a/apps/trading/lib/hooks/use-ethereum-transaction-toasts.tsx +++ b/apps/trading/lib/hooks/use-ethereum-transaction-toasts.tsx @@ -1,7 +1,8 @@ import type { ReactNode } from 'react'; import { useAssetsDataProvider } from '@vegaprotocol/assets'; import { ETHERSCAN_TX, useEtherscanLink } from '@vegaprotocol/environment'; -import { formatNumber, t, toBigNum } from '@vegaprotocol/utils'; +import { formatNumber, toBigNum } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { Toast, ToastContent } from '@vegaprotocol/ui-toolkit'; import { ToastHeading } from '@vegaprotocol/ui-toolkit'; import { Panel } from '@vegaprotocol/ui-toolkit'; diff --git a/apps/trading/lib/hooks/use-ethereum-withdraw-approval-toasts.tsx b/apps/trading/lib/hooks/use-ethereum-withdraw-approval-toasts.tsx index 62daa7e4c..1582b57d4 100644 --- a/apps/trading/lib/hooks/use-ethereum-withdraw-approval-toasts.tsx +++ b/apps/trading/lib/hooks/use-ethereum-withdraw-approval-toasts.tsx @@ -1,4 +1,5 @@ -import { formatNumber, t, toBigNum } from '@vegaprotocol/utils'; +import { formatNumber, toBigNum } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { Toast } from '@vegaprotocol/ui-toolkit'; import { ToastHeading } from '@vegaprotocol/ui-toolkit'; import { Panel } from '@vegaprotocol/ui-toolkit'; diff --git a/apps/trading/lib/hooks/use-vega-transaction-toasts.tsx b/apps/trading/lib/hooks/use-vega-transaction-toasts.tsx index e0fc4b4b6..d8163a552 100644 --- a/apps/trading/lib/hooks/use-vega-transaction-toasts.tsx +++ b/apps/trading/lib/hooks/use-vega-transaction-toasts.tsx @@ -32,11 +32,10 @@ import { Button, ExternalLink, Intent } from '@vegaprotocol/ui-toolkit'; import { addDecimalsFormatNumber, formatNumber, - Size, - t, toBigNum, truncateByChars, } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { useAssetsDataProvider } from '@vegaprotocol/assets'; import { useEthWithdrawApprovalsStore } from '@vegaprotocol/web3'; import { DApp, EXPLORER_TX, useLinks } from '@vegaprotocol/environment'; @@ -45,6 +44,7 @@ import { useMarketList } from '@vegaprotocol/market-list'; import type { Side } from '@vegaprotocol/types'; import { OrderStatus } from '@vegaprotocol/types'; import { OrderStatusMapping } from '@vegaprotocol/types'; +import { Size } from '@vegaprotocol/react-helpers'; const intentMap: { [s in VegaTxStatus]: Intent } = { Default: Intent.Primary, diff --git a/apps/trading/pages/_app.page.tsx b/apps/trading/pages/_app.page.tsx index c883918a4..c55ee0b80 100644 --- a/apps/trading/pages/_app.page.tsx +++ b/apps/trading/pages/_app.page.tsx @@ -1,7 +1,7 @@ import Head from 'next/head'; import type { AppProps } from 'next/app'; import { Navbar } from '../components/navbar'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { useEagerConnect as useVegaEagerConnect, useVegaTransactionManager, diff --git a/apps/trading/pages/client-router.tsx b/apps/trading/pages/client-router.tsx index 21d0481a1..8a569bfd7 100644 --- a/apps/trading/pages/client-router.tsx +++ b/apps/trading/pages/client-router.tsx @@ -2,7 +2,7 @@ import { Suspense } from 'react'; import type { RouteObject } from 'react-router-dom'; import { useRoutes } from 'react-router-dom'; import dynamic from 'next/dynamic'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { Loader, Splash } from '@vegaprotocol/ui-toolkit'; import trimEnd from 'lodash/trimEnd'; diff --git a/libs/accounts/src/lib/accounts-manager.tsx b/libs/accounts/src/lib/accounts-manager.tsx index 9f4d0066a..32fe795ee 100644 --- a/libs/accounts/src/lib/accounts-manager.tsx +++ b/libs/accounts/src/lib/accounts-manager.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { useDataProvider } from '@vegaprotocol/react-helpers'; import { AsyncRenderer } from '@vegaprotocol/ui-toolkit'; import type { AgGridReact } from 'ag-grid-react'; diff --git a/libs/accounts/src/lib/accounts-table.tsx b/libs/accounts/src/lib/accounts-table.tsx index 2d9caf76d..2958a10f7 100644 --- a/libs/accounts/src/lib/accounts-table.tsx +++ b/libs/accounts/src/lib/accounts-table.tsx @@ -1,5 +1,6 @@ import { forwardRef, useMemo, useState } from 'react'; -import { addDecimalsFormatNumber, isNumeric, t } from '@vegaprotocol/utils'; +import { addDecimalsFormatNumber, isNumeric } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { VegaICellRendererParams, VegaValueFormatterParams, diff --git a/libs/accounts/src/lib/breakdown-table.tsx b/libs/accounts/src/lib/breakdown-table.tsx index 84de6551c..4ac287f5b 100644 --- a/libs/accounts/src/lib/breakdown-table.tsx +++ b/libs/accounts/src/lib/breakdown-table.tsx @@ -1,5 +1,6 @@ import { forwardRef } from 'react'; -import { addDecimalsFormatNumber, isNumeric, t } from '@vegaprotocol/utils'; +import { addDecimalsFormatNumber, isNumeric } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { Intent, progressBarCellRendererSelector, diff --git a/libs/accounts/src/lib/transfer-container.tsx b/libs/accounts/src/lib/transfer-container.tsx index 88abd2eeb..b8e98ef01 100644 --- a/libs/accounts/src/lib/transfer-container.tsx +++ b/libs/accounts/src/lib/transfer-container.tsx @@ -1,5 +1,6 @@ import * as Schema from '@vegaprotocol/types'; -import { addDecimal, t, truncateByChars } from '@vegaprotocol/utils'; +import { addDecimal, truncateByChars } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { NetworkParams, useDataProvider, diff --git a/libs/accounts/src/lib/transfer-dialog.tsx b/libs/accounts/src/lib/transfer-dialog.tsx index 5e58de06f..0627bddf4 100644 --- a/libs/accounts/src/lib/transfer-dialog.tsx +++ b/libs/accounts/src/lib/transfer-dialog.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { Dialog } from '@vegaprotocol/ui-toolkit'; import { create } from 'zustand'; import { TransferContainer } from './transfer-container'; diff --git a/libs/accounts/src/lib/transfer-form.tsx b/libs/accounts/src/lib/transfer-form.tsx index b1ab794bd..417d17ede 100644 --- a/libs/accounts/src/lib/transfer-form.tsx +++ b/libs/accounts/src/lib/transfer-form.tsx @@ -1,5 +1,4 @@ import { - t, minSafe, maxSafe, required, @@ -7,6 +6,7 @@ import { addDecimal, formatNumber, } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { Button, FormGroup, diff --git a/libs/assets/src/lib/asset-details-dialog.tsx b/libs/assets/src/lib/asset-details-dialog.tsx index 46f38b41e..00674020e 100644 --- a/libs/assets/src/lib/asset-details-dialog.tsx +++ b/libs/assets/src/lib/asset-details-dialog.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { useAssetsDataProvider } from './assets-data-provider'; import { Button, diff --git a/libs/assets/src/lib/asset-details-table.tsx b/libs/assets/src/lib/asset-details-table.tsx index 875e9c577..09fc6eefb 100644 --- a/libs/assets/src/lib/asset-details-table.tsx +++ b/libs/assets/src/lib/asset-details-table.tsx @@ -1,5 +1,6 @@ import { ContractAddressLink } from '@vegaprotocol/environment'; -import { addDecimalsFormatNumber, t } from '@vegaprotocol/utils'; +import { addDecimalsFormatNumber } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type * as Schema from '@vegaprotocol/types'; import type { KeyValueTableRowProps } from '@vegaprotocol/ui-toolkit'; import { CopyWithTooltip, Icon } from '@vegaprotocol/ui-toolkit'; diff --git a/libs/candles-chart/src/lib/candles-chart.tsx b/libs/candles-chart/src/lib/candles-chart.tsx index d9db04922..0990c5b0e 100644 --- a/libs/candles-chart/src/lib/candles-chart.tsx +++ b/libs/candles-chart/src/lib/candles-chart.tsx @@ -27,7 +27,7 @@ import { } from '@vegaprotocol/ui-toolkit'; import type { IconName } from '@blueprintjs/icons'; import { IconNames } from '@blueprintjs/icons'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; const chartTypeIcon = new Map([ [ChartType.AREA, IconNames.TIMELINE_AREA_CHART], diff --git a/libs/datagrid/src/lib/filters/date-range-filter.tsx b/libs/datagrid/src/lib/filters/date-range-filter.tsx index 3a9d6fb42..fb1b96c67 100644 --- a/libs/datagrid/src/lib/filters/date-range-filter.tsx +++ b/libs/datagrid/src/lib/filters/date-range-filter.tsx @@ -13,7 +13,8 @@ import { max, isValid, } from 'date-fns'; -import { t, formatForInput } from '@vegaprotocol/utils'; +import { formatForInput } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { InputError } from '@vegaprotocol/ui-toolkit'; const defaultFilterValue: Schema.DateRange = {}; diff --git a/libs/datagrid/src/lib/filters/set-filter.tsx b/libs/datagrid/src/lib/filters/set-filter.tsx index 75836b324..237abd9a0 100644 --- a/libs/datagrid/src/lib/filters/set-filter.tsx +++ b/libs/datagrid/src/lib/filters/set-filter.tsx @@ -6,7 +6,7 @@ import React, { useState, } from 'react'; import type { IDoesFilterPassParams, IFilterParams } from 'ag-grid-community'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; export const SetFilter = forwardRef((props: IFilterParams, ref) => { const [value, setValue] = useState([]); diff --git a/libs/deal-ticket/src/components/deal-ticket-estimates.tsx b/libs/deal-ticket/src/components/deal-ticket-estimates.tsx index e778f7e0d..1df6b7834 100644 --- a/libs/deal-ticket/src/components/deal-ticket-estimates.tsx +++ b/libs/deal-ticket/src/components/deal-ticket-estimates.tsx @@ -1,6 +1,6 @@ import React from 'react'; import type { ReactNode } from 'react'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { Icon, Tooltip, TrafficLight } from '@vegaprotocol/ui-toolkit'; import { IconNames } from '@blueprintjs/icons'; import * as constants from '../constants'; diff --git a/libs/deal-ticket/src/components/deal-ticket-validation/margin-warning.tsx b/libs/deal-ticket/src/components/deal-ticket-validation/margin-warning.tsx index 77867955e..774c7de40 100644 --- a/libs/deal-ticket/src/components/deal-ticket-validation/margin-warning.tsx +++ b/libs/deal-ticket/src/components/deal-ticket-validation/margin-warning.tsx @@ -1,4 +1,5 @@ -import { formatNumber, t } from '@vegaprotocol/utils'; +import { formatNumber } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { Notification, Intent } from '@vegaprotocol/ui-toolkit'; import { DepositDialog, useDepositDialog } from '@vegaprotocol/deposits'; diff --git a/libs/deal-ticket/src/components/deal-ticket-validation/zero-balance-error.tsx b/libs/deal-ticket/src/components/deal-ticket-validation/zero-balance-error.tsx index b8fb039b7..6a4c83eec 100644 --- a/libs/deal-ticket/src/components/deal-ticket-validation/zero-balance-error.tsx +++ b/libs/deal-ticket/src/components/deal-ticket-validation/zero-balance-error.tsx @@ -1,6 +1,6 @@ import { Intent, Notification, Link } from '@vegaprotocol/ui-toolkit'; import { useDepositDialog } from '@vegaprotocol/deposits'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; interface ZeroBalanceErrorProps { asset: { diff --git a/libs/deal-ticket/src/components/deal-ticket/deal-ticket-button.tsx b/libs/deal-ticket/src/components/deal-ticket/deal-ticket-button.tsx index cbd25f22c..a7e84fcfa 100644 --- a/libs/deal-ticket/src/components/deal-ticket/deal-ticket-button.tsx +++ b/libs/deal-ticket/src/components/deal-ticket/deal-ticket-button.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { ButtonVariant } from '@vegaprotocol/ui-toolkit'; import { Button } from '@vegaprotocol/ui-toolkit'; import { useVegaWallet } from '@vegaprotocol/wallet'; diff --git a/libs/deal-ticket/src/components/deal-ticket/deal-ticket-container.tsx b/libs/deal-ticket/src/components/deal-ticket/deal-ticket-container.tsx index 065a878f6..c7db7eca1 100644 --- a/libs/deal-ticket/src/components/deal-ticket/deal-ticket-container.tsx +++ b/libs/deal-ticket/src/components/deal-ticket/deal-ticket-container.tsx @@ -1,6 +1,6 @@ import { useMemo } from 'react'; import { AsyncRenderer, Splash } from '@vegaprotocol/ui-toolkit'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { useThrottledDataProvider } from '@vegaprotocol/react-helpers'; import { useVegaTransactionStore } from '@vegaprotocol/wallet'; import { useMarket, marketDataProvider } from '@vegaprotocol/market-list'; diff --git a/libs/deal-ticket/src/components/deal-ticket/deal-ticket-limit-amount.tsx b/libs/deal-ticket/src/components/deal-ticket/deal-ticket-limit-amount.tsx index 10656bd8c..a2946dc2f 100644 --- a/libs/deal-ticket/src/components/deal-ticket/deal-ticket-limit-amount.tsx +++ b/libs/deal-ticket/src/components/deal-ticket/deal-ticket-limit-amount.tsx @@ -1,5 +1,6 @@ import { FormGroup, Input, InputError } from '@vegaprotocol/ui-toolkit'; -import { t, toDecimal, validateAmount } from '@vegaprotocol/utils'; +import { toDecimal, validateAmount } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { DealTicketAmountProps } from './deal-ticket-amount'; export type DealTicketLimitAmountProps = Omit< diff --git a/libs/deal-ticket/src/components/deal-ticket/deal-ticket-market-amount.tsx b/libs/deal-ticket/src/components/deal-ticket/deal-ticket-market-amount.tsx index 136d39604..86ca473e0 100644 --- a/libs/deal-ticket/src/components/deal-ticket/deal-ticket-market-amount.tsx +++ b/libs/deal-ticket/src/components/deal-ticket/deal-ticket-market-amount.tsx @@ -1,9 +1,9 @@ import { addDecimalsFormatNumber, - t, toDecimal, validateAmount, } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { Input, InputError, Tooltip } from '@vegaprotocol/ui-toolkit'; import { isMarketInAuction } from '../../utils'; import type { DealTicketAmountProps } from './deal-ticket-amount'; diff --git a/libs/deal-ticket/src/components/deal-ticket/deal-ticket.spec.tsx b/libs/deal-ticket/src/components/deal-ticket/deal-ticket.spec.tsx index 521250ba2..6ef4e3eb4 100644 --- a/libs/deal-ticket/src/components/deal-ticket/deal-ticket.spec.tsx +++ b/libs/deal-ticket/src/components/deal-ticket/deal-ticket.spec.tsx @@ -7,8 +7,9 @@ import * as Schema from '@vegaprotocol/types'; import type { OrderSubmissionBody } from '@vegaprotocol/wallet'; import type { MockedResponse } from '@apollo/client/testing'; import { MockedProvider } from '@apollo/client/testing'; -import type { ChainIdQuery } from '@vegaprotocol/utils'; -import { ChainIdDocument, addDecimal } from '@vegaprotocol/utils'; +import type { ChainIdQuery } from '@vegaprotocol/react-helpers'; +import { ChainIdDocument } from '@vegaprotocol/react-helpers'; +import { addDecimal } from '@vegaprotocol/utils'; const market = generateMarket(); const marketData = generateMarketData(); diff --git a/libs/deal-ticket/src/components/deal-ticket/deal-ticket.tsx b/libs/deal-ticket/src/components/deal-ticket/deal-ticket.tsx index ec3bee3b4..a71611c53 100644 --- a/libs/deal-ticket/src/components/deal-ticket/deal-ticket.tsx +++ b/libs/deal-ticket/src/components/deal-ticket/deal-ticket.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import * as Schema from '@vegaprotocol/types'; import { memo, useCallback, useEffect } from 'react'; import { Controller, useForm } from 'react-hook-form'; diff --git a/libs/deal-ticket/src/components/deal-ticket/expiry-selector.tsx b/libs/deal-ticket/src/components/deal-ticket/expiry-selector.tsx index 5c8cf7095..0ab9972dd 100644 --- a/libs/deal-ticket/src/components/deal-ticket/expiry-selector.tsx +++ b/libs/deal-ticket/src/components/deal-ticket/expiry-selector.tsx @@ -1,6 +1,6 @@ import { FormGroup, Input, InputError } from '@vegaprotocol/ui-toolkit'; import { formatForInput } from '@vegaprotocol/utils'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { UseFormRegister } from 'react-hook-form'; import { validateExpiration } from '../../utils/validate-expiration'; import type { DealTicketFormFields } from '.'; diff --git a/libs/deal-ticket/src/components/deal-ticket/market-selector.tsx b/libs/deal-ticket/src/components/deal-ticket/market-selector.tsx index 01534d6dc..a6d3ad8a4 100644 --- a/libs/deal-ticket/src/components/deal-ticket/market-selector.tsx +++ b/libs/deal-ticket/src/components/deal-ticket/market-selector.tsx @@ -20,7 +20,7 @@ import { useOutsideClick, useDataProvider, } from '@vegaprotocol/react-helpers'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { IconNames } from '@blueprintjs/icons'; import * as Schema from '@vegaprotocol/types'; import type { Market } from '@vegaprotocol/market-list'; diff --git a/libs/deal-ticket/src/components/deal-ticket/side-selector.tsx b/libs/deal-ticket/src/components/deal-ticket/side-selector.tsx index 72cd52db2..08a636972 100644 --- a/libs/deal-ticket/src/components/deal-ticket/side-selector.tsx +++ b/libs/deal-ticket/src/components/deal-ticket/side-selector.tsx @@ -1,6 +1,6 @@ import { FormGroup } from '@vegaprotocol/ui-toolkit'; import { Toggle } from '@vegaprotocol/ui-toolkit'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import * as Schema from '@vegaprotocol/types'; interface SideSelectorProps { diff --git a/libs/deal-ticket/src/components/deal-ticket/time-in-force-selector.tsx b/libs/deal-ticket/src/components/deal-ticket/time-in-force-selector.tsx index e11b29c51..5cd343907 100644 --- a/libs/deal-ticket/src/components/deal-ticket/time-in-force-selector.tsx +++ b/libs/deal-ticket/src/components/deal-ticket/time-in-force-selector.tsx @@ -7,7 +7,7 @@ import { SimpleGrid, } from '@vegaprotocol/ui-toolkit'; import * as Schema from '@vegaprotocol/types'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { timeInForceLabel } from '@vegaprotocol/orders'; import { compileGridData } from '../trading-mode-tooltip'; import { MarketModeValidationType } from '../../constants'; diff --git a/libs/deal-ticket/src/components/deal-ticket/type-selector.tsx b/libs/deal-ticket/src/components/deal-ticket/type-selector.tsx index 8fee3047f..e17dc2f72 100644 --- a/libs/deal-ticket/src/components/deal-ticket/type-selector.tsx +++ b/libs/deal-ticket/src/components/deal-ticket/type-selector.tsx @@ -4,7 +4,7 @@ import { SimpleGrid, Tooltip, } from '@vegaprotocol/ui-toolkit'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import * as Schema from '@vegaprotocol/types'; import { Toggle } from '@vegaprotocol/ui-toolkit'; import type { Market, MarketData } from '@vegaprotocol/market-list'; diff --git a/libs/deal-ticket/src/components/trading-mode-tooltip/compile-grid-data.tsx b/libs/deal-ticket/src/components/trading-mode-tooltip/compile-grid-data.tsx index b8262f11c..f91891fbf 100644 --- a/libs/deal-ticket/src/components/trading-mode-tooltip/compile-grid-data.tsx +++ b/libs/deal-ticket/src/components/trading-mode-tooltip/compile-grid-data.tsx @@ -1,8 +1,8 @@ import { - t, getDateTimeFormat, addDecimalsFormatNumber, } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import * as Schema from '@vegaprotocol/types'; import { Link as UILink } from '@vegaprotocol/ui-toolkit'; import type { SimpleGridProps } from '@vegaprotocol/ui-toolkit'; diff --git a/libs/deal-ticket/src/components/trading-mode-tooltip/trading-mode-tooltip.tsx b/libs/deal-ticket/src/components/trading-mode-tooltip/trading-mode-tooltip.tsx index 2ad5a856f..9a6f367ed 100644 --- a/libs/deal-ticket/src/components/trading-mode-tooltip/trading-mode-tooltip.tsx +++ b/libs/deal-ticket/src/components/trading-mode-tooltip/trading-mode-tooltip.tsx @@ -3,10 +3,10 @@ import { parseISO, isValid, isAfter } from 'date-fns'; import classNames from 'classnames'; import { useProposalOfMarketQuery } from '@vegaprotocol/governance'; import { useEnvironment } from '@vegaprotocol/environment'; -import { getDateTimeFormat, t } from '@vegaprotocol/utils'; +import { createDocsLinks, getDateTimeFormat } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import * as Schema from '@vegaprotocol/types'; import { ExternalLink, SimpleGrid } from '@vegaprotocol/ui-toolkit'; -import { createDocsLinks } from '@vegaprotocol/utils'; import { compileGridData } from './compile-grid-data'; import { useMarket, useStaticMarketData } from '@vegaprotocol/market-list'; import BigNumber from 'bignumber.js'; diff --git a/libs/deal-ticket/src/constants.ts b/libs/deal-ticket/src/constants.ts index 9ae60a53e..61095fda3 100644 --- a/libs/deal-ticket/src/constants.ts +++ b/libs/deal-ticket/src/constants.ts @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; export const EST_MARGIN_TOOLTIP_TEXT = (settlementAsset: string) => t( diff --git a/libs/deal-ticket/src/hooks/use-fee-deal-ticket-details.tsx b/libs/deal-ticket/src/hooks/use-fee-deal-ticket-details.tsx index 145334121..6fa925ffa 100644 --- a/libs/deal-ticket/src/hooks/use-fee-deal-ticket-details.tsx +++ b/libs/deal-ticket/src/hooks/use-fee-deal-ticket-details.tsx @@ -3,8 +3,8 @@ import { addDecimal, addDecimalsFormatNumber, formatNumber, - t, } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import * as Schema from '@vegaprotocol/types'; import { useVegaWallet } from '@vegaprotocol/wallet'; import BigNumber from 'bignumber.js'; diff --git a/libs/deal-ticket/src/utils/validate-expiration.ts b/libs/deal-ticket/src/utils/validate-expiration.ts index 1c2537b16..294816960 100644 --- a/libs/deal-ticket/src/utils/validate-expiration.ts +++ b/libs/deal-ticket/src/utils/validate-expiration.ts @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { Validate } from 'react-hook-form'; export const validateExpiration: Validate = ( diff --git a/libs/deal-ticket/src/utils/validate-market-state.ts b/libs/deal-ticket/src/utils/validate-market-state.ts index 995f17993..0208ab973 100644 --- a/libs/deal-ticket/src/utils/validate-market-state.ts +++ b/libs/deal-ticket/src/utils/validate-market-state.ts @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import * as Schema from '@vegaprotocol/types'; export const validateMarketState = (state: Schema.MarketState) => { diff --git a/libs/deal-ticket/src/utils/validate-market-trading-mode.ts b/libs/deal-ticket/src/utils/validate-market-trading-mode.ts index 5fe58a823..687de02d0 100644 --- a/libs/deal-ticket/src/utils/validate-market-trading-mode.ts +++ b/libs/deal-ticket/src/utils/validate-market-trading-mode.ts @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import * as Schema from '@vegaprotocol/types'; export const validateMarketTradingMode = ( diff --git a/libs/deposits/src/lib/deposit-container.tsx b/libs/deposits/src/lib/deposit-container.tsx index 69bde128f..ea1b2ea85 100644 --- a/libs/deposits/src/lib/deposit-container.tsx +++ b/libs/deposits/src/lib/deposit-container.tsx @@ -1,7 +1,7 @@ import { Networks, useEnvironment } from '@vegaprotocol/environment'; import { AsyncRenderer, Splash } from '@vegaprotocol/ui-toolkit'; import { DepositManager } from './deposit-manager'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { useDataProvider } from '@vegaprotocol/react-helpers'; import { enabledAssetsProvider } from '@vegaprotocol/assets'; import type { DepositDialogStylePropsSetter } from './deposit-dialog'; diff --git a/libs/deposits/src/lib/deposit-dialog.tsx b/libs/deposits/src/lib/deposit-dialog.tsx index 6b5d1ef6c..a73f56c0d 100644 --- a/libs/deposits/src/lib/deposit-dialog.tsx +++ b/libs/deposits/src/lib/deposit-dialog.tsx @@ -1,5 +1,5 @@ import { create } from 'zustand'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { Intent } from '@vegaprotocol/ui-toolkit'; import { Dialog } from '@vegaprotocol/ui-toolkit'; import { useCallback, useState } from 'react'; diff --git a/libs/deposits/src/lib/deposit-form.tsx b/libs/deposits/src/lib/deposit-form.tsx index bd832f0ac..577015263 100644 --- a/libs/deposits/src/lib/deposit-form.tsx +++ b/libs/deposits/src/lib/deposit-form.tsx @@ -1,16 +1,16 @@ import type { Asset } from '@vegaprotocol/assets'; import { AssetOption } from '@vegaprotocol/assets'; import { - t, ethereumAddress, required, vegaPublicKey, minSafe, maxSafe, addDecimal, - useLocalStorage, isAssetTypeERC20, } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; +import { useLocalStorage } from '@vegaprotocol/react-helpers'; import { Button, FormGroup, diff --git a/libs/deposits/src/lib/deposit-limits.tsx b/libs/deposits/src/lib/deposit-limits.tsx index 03944d061..8cf74c020 100644 --- a/libs/deposits/src/lib/deposit-limits.tsx +++ b/libs/deposits/src/lib/deposit-limits.tsx @@ -1,5 +1,5 @@ import type { Asset } from '@vegaprotocol/assets'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { CompactNumber } from '@vegaprotocol/react-helpers'; import { KeyValueTable, KeyValueTableRow } from '@vegaprotocol/ui-toolkit'; import type BigNumber from 'bignumber.js'; diff --git a/libs/deposits/src/lib/deposit-manager.tsx b/libs/deposits/src/lib/deposit-manager.tsx index 85945600f..b57f9c6ca 100644 --- a/libs/deposits/src/lib/deposit-manager.tsx +++ b/libs/deposits/src/lib/deposit-manager.tsx @@ -18,7 +18,7 @@ import { useBridgeContract, useEthereumConfig, } from '@vegaprotocol/web3'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; interface DepositManagerProps { assetId?: string; diff --git a/libs/deposits/src/lib/deposits-table.tsx b/libs/deposits/src/lib/deposits-table.tsx index 9764a7de8..2145f30f6 100644 --- a/libs/deposits/src/lib/deposits-table.tsx +++ b/libs/deposits/src/lib/deposits-table.tsx @@ -1,12 +1,12 @@ import { forwardRef } from 'react'; import { AgGridColumn } from 'ag-grid-react'; import { - t, addDecimalsFormatNumber, getDateTimeFormat, truncateByChars, isNumeric, } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { AgGridReact } from 'ag-grid-react'; import { Link } from '@vegaprotocol/ui-toolkit'; import { AgGridDynamic as AgGrid } from '@vegaprotocol/datagrid'; diff --git a/libs/environment/src/components/network-switcher/network-switcher.spec.tsx b/libs/environment/src/components/network-switcher/network-switcher.spec.tsx index 5e008d358..a6bf46f6b 100644 --- a/libs/environment/src/components/network-switcher/network-switcher.spec.tsx +++ b/libs/environment/src/components/network-switcher/network-switcher.spec.tsx @@ -1,6 +1,6 @@ import { render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { useEnvironment } from '../../hooks/use-environment'; import { NetworkSwitcher, diff --git a/libs/environment/src/components/network-switcher/network-switcher.tsx b/libs/environment/src/components/network-switcher/network-switcher.tsx index 9e1f3943b..8effd6489 100644 --- a/libs/environment/src/components/network-switcher/network-switcher.tsx +++ b/libs/environment/src/components/network-switcher/network-switcher.tsx @@ -1,5 +1,5 @@ import { useState, useCallback, useRef } from 'react'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { Link, DropdownMenu, diff --git a/libs/environment/src/components/node-switcher/layout-cell.tsx b/libs/environment/src/components/node-switcher/layout-cell.tsx index 03e355277..c5491a7fb 100644 --- a/libs/environment/src/components/node-switcher/layout-cell.tsx +++ b/libs/environment/src/components/node-switcher/layout-cell.tsx @@ -1,6 +1,6 @@ import type { ReactNode } from 'react'; import classnames from 'classnames'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; type LayoutCellProps = { label?: string; diff --git a/libs/environment/src/components/node-switcher/node-switcher.tsx b/libs/environment/src/components/node-switcher/node-switcher.tsx index ec5093f07..9dee3bbd4 100644 --- a/libs/environment/src/components/node-switcher/node-switcher.tsx +++ b/libs/environment/src/components/node-switcher/node-switcher.tsx @@ -1,5 +1,6 @@ import { useCallback, useState } from 'react'; -import { isValidUrl, t } from '@vegaprotocol/utils'; +import { isValidUrl } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { Button, ButtonLink, diff --git a/libs/environment/src/components/node-switcher/row-data.tsx b/libs/environment/src/components/node-switcher/row-data.tsx index 75e4bb1ec..a1a4daee1 100644 --- a/libs/environment/src/components/node-switcher/row-data.tsx +++ b/libs/environment/src/components/node-switcher/row-data.tsx @@ -1,6 +1,7 @@ import type { ApolloError } from '@apollo/client'; import { useHeaderStore } from '@vegaprotocol/apollo-client'; -import { isValidUrl, t } from '@vegaprotocol/utils'; +import { isValidUrl } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { Radio } from '@vegaprotocol/ui-toolkit'; import { useEffect, useState } from 'react'; import { CUSTOM_NODE_KEY } from '../../types'; diff --git a/libs/environment/src/hooks/use-environment.ts b/libs/environment/src/hooks/use-environment.ts index 7e5302068..73696cc88 100644 --- a/libs/environment/src/hooks/use-environment.ts +++ b/libs/environment/src/hooks/use-environment.ts @@ -1,4 +1,5 @@ -import { isValidUrl, LocalStorage, t } from '@vegaprotocol/utils'; +import { isValidUrl, LocalStorage } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { useEffect } from 'react'; import { create } from 'zustand'; import { createClient } from '@vegaprotocol/apollo-client'; diff --git a/libs/fills/src/lib/fills-container.tsx b/libs/fills/src/lib/fills-container.tsx index 307f0cc3d..df759df4a 100644 --- a/libs/fills/src/lib/fills-container.tsx +++ b/libs/fills/src/lib/fills-container.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { Splash } from '@vegaprotocol/ui-toolkit'; import { useVegaWallet } from '@vegaprotocol/wallet'; import { FillsManager } from './fills-manager'; diff --git a/libs/fills/src/lib/fills-manager.tsx b/libs/fills/src/lib/fills-manager.tsx index 99d2b176a..ba776ef17 100644 --- a/libs/fills/src/lib/fills-manager.tsx +++ b/libs/fills/src/lib/fills-manager.tsx @@ -1,7 +1,7 @@ import type { AgGridReact } from 'ag-grid-react'; import { useRef } from 'react'; import { AsyncRenderer } from '@vegaprotocol/ui-toolkit'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { FillsTable } from './fills-table'; import type { BodyScrollEvent, BodyScrollEndEvent } from 'ag-grid-community'; import { useFillsList } from './use-fills-list'; diff --git a/libs/fills/src/lib/fills-table.tsx b/libs/fills/src/lib/fills-table.tsx index 6e4f51cc4..f500f9d98 100644 --- a/libs/fills/src/lib/fills-table.tsx +++ b/libs/fills/src/lib/fills-table.tsx @@ -9,9 +9,9 @@ import { addDecimalsFormatNumber, formatNumber, getDateTimeFormat, - t, isNumeric, } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import * as Schema from '@vegaprotocol/types'; import { AgGridColumn } from 'ag-grid-react'; import { Link } from '@vegaprotocol/ui-toolkit'; diff --git a/libs/governance/src/components/asset-proposal-notification.tsx b/libs/governance/src/components/asset-proposal-notification.tsx index 2bdacb95a..2301d8a3e 100644 --- a/libs/governance/src/components/asset-proposal-notification.tsx +++ b/libs/governance/src/components/asset-proposal-notification.tsx @@ -1,5 +1,5 @@ import { DApp, TOKEN_PROPOSAL, useLinks } from '@vegaprotocol/environment'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import * as Schema from '@vegaprotocol/types'; import { ExternalLink, Intent, Notification } from '@vegaprotocol/ui-toolkit'; import { useUpdateProposal } from '../lib'; diff --git a/libs/governance/src/components/market-proposal-notification.tsx b/libs/governance/src/components/market-proposal-notification.tsx index b84a2c8fa..99ee236fc 100644 --- a/libs/governance/src/components/market-proposal-notification.tsx +++ b/libs/governance/src/components/market-proposal-notification.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import * as Schema from '@vegaprotocol/types'; import { ExternalLink, Intent, Notification } from '@vegaprotocol/ui-toolkit'; import { DApp, TOKEN_PROPOSAL, useLinks } from '@vegaprotocol/environment'; diff --git a/libs/governance/src/lib/proposals-hooks/use-update-network-paramaters-toasts.tsx b/libs/governance/src/lib/proposals-hooks/use-update-network-paramaters-toasts.tsx index f61f07875..6145262cd 100644 --- a/libs/governance/src/lib/proposals-hooks/use-update-network-paramaters-toasts.tsx +++ b/libs/governance/src/lib/proposals-hooks/use-update-network-paramaters-toasts.tsx @@ -1,5 +1,6 @@ import { DApp, TOKEN_PROPOSAL, useLinks } from '@vegaprotocol/environment'; -import { getDateTimeFormat, t } from '@vegaprotocol/utils'; +import { getDateTimeFormat } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { UpdateNetworkParameter } from '@vegaprotocol/types'; import { ProposalStateMapping } from '@vegaprotocol/types'; import { ProposalState } from '@vegaprotocol/types'; diff --git a/libs/governance/src/lib/proposals-list/use-column-defs.tsx b/libs/governance/src/lib/proposals-list/use-column-defs.tsx index 30802b8f5..097b0d7e4 100644 --- a/libs/governance/src/lib/proposals-list/use-column-defs.tsx +++ b/libs/governance/src/lib/proposals-list/use-column-defs.tsx @@ -2,12 +2,13 @@ import { useMemo } from 'react'; import BigNumber from 'bignumber.js'; import type { ColDef } from 'ag-grid-community'; import { useEnvironment } from '@vegaprotocol/environment'; -import { t, getDateTimeFormat } from '@vegaprotocol/utils'; +import { getDateTimeFormat } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { NetworkParams, useNetworkParams } from '@vegaprotocol/react-helpers'; import type { VegaICellRendererParams, VegaValueFormatterParams, -} from '@vegaprotocol/ui-toolkit'; +} from '@vegaprotocol/datagrid'; import { ExternalLink } from '@vegaprotocol/ui-toolkit'; import { ProposalStateMapping } from '@vegaprotocol/types'; import type { ProposalListFieldsFragment } from '../proposals-data-provider/__generated__/Proposals'; diff --git a/libs/governance/src/utils/proposal-dialog-helpers.tsx b/libs/governance/src/utils/proposal-dialog-helpers.tsx index 9dac6aa5f..342a882a7 100644 --- a/libs/governance/src/utils/proposal-dialog-helpers.tsx +++ b/libs/governance/src/utils/proposal-dialog-helpers.tsx @@ -1,5 +1,5 @@ import { ProposalState } from '@vegaprotocol/types'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { Icon, Intent } from '@vegaprotocol/ui-toolkit'; import type { ReactNode } from 'react'; diff --git a/libs/i18n/.babelrc b/libs/i18n/.babelrc new file mode 100644 index 000000000..e24a5465f --- /dev/null +++ b/libs/i18n/.babelrc @@ -0,0 +1,10 @@ +{ + "presets": [ + [ + "@nrwl/web/babel", + { + "useBuiltIns": "usage" + } + ] + ] +} diff --git a/libs/i18n/.eslintrc.json b/libs/i18n/.eslintrc.json new file mode 100644 index 000000000..9d9c0db55 --- /dev/null +++ b/libs/i18n/.eslintrc.json @@ -0,0 +1,18 @@ +{ + "extends": ["../../.eslintrc.json"], + "ignorePatterns": ["!**/*"], + "overrides": [ + { + "files": ["*.ts", "*.tsx", "*.js", "*.jsx"], + "rules": {} + }, + { + "files": ["*.ts", "*.tsx"], + "rules": {} + }, + { + "files": ["*.js", "*.jsx"], + "rules": {} + } + ] +} diff --git a/libs/i18n/README.md b/libs/i18n/README.md new file mode 100644 index 000000000..507c17a09 --- /dev/null +++ b/libs/i18n/README.md @@ -0,0 +1,11 @@ +# i18n + +This library was generated with [Nx](https://nx.dev). + +## Building + +Run `nx build i18n` to build the library. + +## Running unit tests + +Run `nx test i18n` to execute the unit tests via [Jest](https://jestjs.io). diff --git a/libs/i18n/jest.config.ts b/libs/i18n/jest.config.ts new file mode 100644 index 000000000..80cde765e --- /dev/null +++ b/libs/i18n/jest.config.ts @@ -0,0 +1,15 @@ +/* eslint-disable */ +export default { + displayName: 'i18n', + preset: '../../jest.preset.js', + globals: { + 'ts-jest': { + tsconfig: '/tsconfig.spec.json', + }, + }, + transform: { + '^.+\\.[tj]s$': 'ts-jest', + }, + moduleFileExtensions: ['ts', 'js', 'html'], + coverageDirectory: '../../coverage/libs/i18n', +}; diff --git a/libs/i18n/package.json b/libs/i18n/package.json new file mode 100644 index 000000000..09cfaad85 --- /dev/null +++ b/libs/i18n/package.json @@ -0,0 +1,5 @@ +{ + "name": "@vegaprotocol/i18n", + "version": "0.0.1", + "type": "commonjs" +} diff --git a/libs/i18n/project.json b/libs/i18n/project.json new file mode 100644 index 000000000..073eb1ee5 --- /dev/null +++ b/libs/i18n/project.json @@ -0,0 +1,45 @@ +{ + "$schema": "../../node_modules/nx/schemas/project-schema.json", + "sourceRoot": "libs/i18n/src", + "projectType": "library", + "targets": { + "build": { + "executor": "@nrwl/js:tsc", + "outputs": ["{options.outputPath}"], + "options": { + "outputPath": "dist/libs/i18n", + "main": "libs/i18n/src/index.ts", + "tsConfig": "libs/i18n/tsconfig.lib.json", + "assets": ["libs/i18n/*.md"] + } + }, + "publish": { + "executor": "@nrwl/workspace:run-commands", + "options": { + "command": "node tools/scripts/publish.mjs i18n {args.ver} {args.tag}" + }, + "dependsOn": [ + { + "projects": "self", + "target": "build" + } + ] + }, + "lint": { + "executor": "@nrwl/linter:eslint", + "outputs": ["{options.outputFile}"], + "options": { + "lintFilePatterns": ["libs/i18n/**/*.ts"] + } + }, + "test": { + "executor": "@nrwl/jest:jest", + "outputs": ["coverage/libs/i18n"], + "options": { + "jestConfig": "libs/i18n/jest.config.ts", + "passWithNoTests": true + } + } + }, + "tags": [] +} diff --git a/libs/i18n/src/index.ts b/libs/i18n/src/index.ts new file mode 100644 index 000000000..cda584c32 --- /dev/null +++ b/libs/i18n/src/index.ts @@ -0,0 +1 @@ +export * from './lib/i18n'; diff --git a/libs/utils/src/lib/i18n.ts b/libs/i18n/src/lib/i18n.ts similarity index 100% rename from libs/utils/src/lib/i18n.ts rename to libs/i18n/src/lib/i18n.ts diff --git a/libs/i18n/tsconfig.json b/libs/i18n/tsconfig.json new file mode 100644 index 000000000..f5b85657a --- /dev/null +++ b/libs/i18n/tsconfig.json @@ -0,0 +1,22 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "module": "commonjs", + "forceConsistentCasingInFileNames": true, + "strict": true, + "noImplicitOverride": true, + "noPropertyAccessFromIndexSignature": true, + "noImplicitReturns": true, + "noFallthroughCasesInSwitch": true + }, + "files": [], + "include": [], + "references": [ + { + "path": "./tsconfig.lib.json" + }, + { + "path": "./tsconfig.spec.json" + } + ] +} diff --git a/libs/i18n/tsconfig.lib.json b/libs/i18n/tsconfig.lib.json new file mode 100644 index 000000000..623dd477a --- /dev/null +++ b/libs/i18n/tsconfig.lib.json @@ -0,0 +1,10 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "../../dist/out-tsc", + "declaration": true, + "types": [] + }, + "include": ["**/*.ts", "../utils/src/lib/i18n.ts"], + "exclude": ["jest.config.ts", "**/*.spec.ts", "**/*.test.ts"] +} diff --git a/libs/i18n/tsconfig.spec.json b/libs/i18n/tsconfig.spec.json new file mode 100644 index 000000000..546f12877 --- /dev/null +++ b/libs/i18n/tsconfig.spec.json @@ -0,0 +1,9 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "../../dist/out-tsc", + "module": "commonjs", + "types": ["jest", "node"] + }, + "include": ["jest.config.ts", "**/*.test.ts", "**/*.spec.ts", "**/*.d.ts"] +} diff --git a/libs/ledger/src/lib/ledger-container.tsx b/libs/ledger/src/lib/ledger-container.tsx index d38f308b6..820a8713a 100644 --- a/libs/ledger/src/lib/ledger-container.tsx +++ b/libs/ledger/src/lib/ledger-container.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { Splash } from '@vegaprotocol/ui-toolkit'; import { useVegaWallet } from '@vegaprotocol/wallet'; import { LedgerManager } from './ledger-manager'; diff --git a/libs/ledger/src/lib/ledger-entries-data-provider.ts b/libs/ledger/src/lib/ledger-entries-data-provider.ts index 004a9c2db..3022803db 100644 --- a/libs/ledger/src/lib/ledger-entries-data-provider.ts +++ b/libs/ledger/src/lib/ledger-entries-data-provider.ts @@ -2,8 +2,11 @@ import type { Asset } from '@vegaprotocol/assets'; import { assetsProvider } from '@vegaprotocol/assets'; import type { Market } from '@vegaprotocol/market-list'; import { marketsProvider } from '@vegaprotocol/market-list'; -import { makeInfiniteScrollGetRows } from '@vegaprotocol/utils'; -import { makeDataProvider, makeDerivedDataProvider } from '@vegaprotocol/utils'; +import { + makeDataProvider, + makeDerivedDataProvider, + makeInfiniteScrollGetRows, +} from '@vegaprotocol/utils'; import { useDataProvider, updateGridData } from '@vegaprotocol/react-helpers'; import type * as Schema from '@vegaprotocol/types'; import type { AgGridReact } from 'ag-grid-react'; diff --git a/libs/ledger/src/lib/ledger-manager.tsx b/libs/ledger/src/lib/ledger-manager.tsx index c032edf7c..a6771d2e1 100644 --- a/libs/ledger/src/lib/ledger-manager.tsx +++ b/libs/ledger/src/lib/ledger-manager.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type * as Schema from '@vegaprotocol/types'; import { AsyncRenderer } from '@vegaprotocol/ui-toolkit'; import type { FilterChangedEvent } from 'ag-grid-community'; diff --git a/libs/ledger/src/lib/ledger-table.tsx b/libs/ledger/src/lib/ledger-table.tsx index 21b39440a..12e9a96c7 100644 --- a/libs/ledger/src/lib/ledger-table.tsx +++ b/libs/ledger/src/lib/ledger-table.tsx @@ -2,9 +2,9 @@ import { addDecimalsFormatNumber, fromNanoSeconds, getDateTimeFormat, - t, truncateByChars, } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { VegaValueFormatterParams, TypedDataAgGrid, diff --git a/libs/liquidity/src/lib/liquidity-table.tsx b/libs/liquidity/src/lib/liquidity-table.tsx index 16c974234..13f834513 100644 --- a/libs/liquidity/src/lib/liquidity-table.tsx +++ b/libs/liquidity/src/lib/liquidity-table.tsx @@ -3,8 +3,8 @@ import { addDecimalsFormatNumber, formatNumberPercentage, getDateTimeFormat, - t, } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { VegaValueFormatterParams, TypedDataAgGrid, diff --git a/libs/market-depth/src/lib/depth-chart.tsx b/libs/market-depth/src/lib/depth-chart.tsx index e55bd85b7..7bbc0b4e5 100644 --- a/libs/market-depth/src/lib/depth-chart.tsx +++ b/libs/market-depth/src/lib/depth-chart.tsx @@ -1,7 +1,8 @@ import { DepthChart } from 'pennant'; import throttle from 'lodash/throttle'; import { AsyncRenderer } from '@vegaprotocol/ui-toolkit'; -import { addDecimal, getNumberFormat, t } from '@vegaprotocol/utils'; +import { addDecimal, getNumberFormat } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { useDataProvider, useThemeSwitcher } from '@vegaprotocol/react-helpers'; import { marketDepthProvider } from './market-depth-provider'; import { useCallback, useEffect, useMemo, useRef, useState } from 'react'; diff --git a/libs/market-depth/src/lib/orderbook.tsx b/libs/market-depth/src/lib/orderbook.tsx index 91353dafa..83021ab24 100644 --- a/libs/market-depth/src/lib/orderbook.tsx +++ b/libs/market-depth/src/lib/orderbook.tsx @@ -4,9 +4,9 @@ import { useEffect, useRef, useState, useCallback, Fragment } from 'react'; import classNames from 'classnames'; import { addDecimalsFixedFormatNumber, - t, formatNumberFixed, } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { useResizeObserver, useThemeSwitcher, diff --git a/libs/market-info/src/components/fees-breakdown/fees-breakdown.tsx b/libs/market-info/src/components/fees-breakdown/fees-breakdown.tsx index a310d9aaa..2ba9ab2a6 100644 --- a/libs/market-info/src/components/fees-breakdown/fees-breakdown.tsx +++ b/libs/market-info/src/components/fees-breakdown/fees-breakdown.tsx @@ -2,8 +2,8 @@ import { totalFeesPercentage } from '@vegaprotocol/market-list'; import { addDecimalsFormatNumber, formatNumberPercentage, - t, } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { Tooltip } from '@vegaprotocol/ui-toolkit'; import BigNumber from 'bignumber.js'; diff --git a/libs/market-info/src/components/market-info/info-key-value-table.tsx b/libs/market-info/src/components/market-info/info-key-value-table.tsx index 8924de917..3d5b27cb6 100644 --- a/libs/market-info/src/components/market-info/info-key-value-table.tsx +++ b/libs/market-info/src/components/market-info/info-key-value-table.tsx @@ -2,8 +2,8 @@ import { addDecimalsFormatNumber, formatNumber, formatNumberPercentage, - t, } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { KeyValueTable, KeyValueTableRow, diff --git a/libs/market-info/src/components/market-info/info-market.tsx b/libs/market-info/src/components/market-info/info-market.tsx index f6668ae99..ac679b0c0 100644 --- a/libs/market-info/src/components/market-info/info-market.tsx +++ b/libs/market-info/src/components/market-info/info-market.tsx @@ -6,8 +6,10 @@ import { formatNumber, formatNumberPercentage, removePaginationWrapper, - t, + TokenLinks, + getMarketExpiryDateFormatted, } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { useDataProvider, useYesterday } from '@vegaprotocol/react-helpers'; import * as Schema from '@vegaprotocol/types'; import { @@ -24,7 +26,6 @@ import { generatePath, Link } from 'react-router-dom'; import { MarketInfoTable } from './info-key-value-table'; import { marketInfoDataProvider } from './market-info-data-provider'; -import { TokenLinks, getMarketExpiryDateFormatted } from '@vegaprotocol/utils'; import type { MarketInfoQuery } from './__generated__/MarketInfo'; import { MarketProposalNotification } from '@vegaprotocol/governance'; diff --git a/libs/market-info/src/components/market-info/tooltip-mapping.tsx b/libs/market-info/src/components/market-info/tooltip-mapping.tsx index 67d92f84a..7aabd3b3d 100644 --- a/libs/market-info/src/components/market-info/tooltip-mapping.tsx +++ b/libs/market-info/src/components/market-info/tooltip-mapping.tsx @@ -1,5 +1,6 @@ -import { ExternalLinks, t } from '@vegaprotocol/utils'; +import { ExternalLinks } from '@vegaprotocol/utils'; import { ExternalLink } from '@vegaprotocol/ui-toolkit'; +import { t } from '@vegaprotocol/i18n'; import type { ReactNode } from 'react'; export const tooltipMapping: Record = { diff --git a/libs/market-list/src/lib/components/markets-container/market-list-table.tsx b/libs/market-list/src/lib/components/markets-container/market-list-table.tsx index 2d07ad109..358c1daa3 100644 --- a/libs/market-list/src/lib/components/markets-container/market-list-table.tsx +++ b/libs/market-list/src/lib/components/markets-container/market-list-table.tsx @@ -1,5 +1,6 @@ import { forwardRef } from 'react'; -import { addDecimalsFormatNumber, t, toBigNum } from '@vegaprotocol/utils'; +import { addDecimalsFormatNumber, toBigNum } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { VegaValueGetterParams, VegaValueFormatterParams, diff --git a/libs/market-list/src/lib/components/markets-container/markets-container.tsx b/libs/market-list/src/lib/components/markets-container/markets-container.tsx index 2f3fcbd4f..a6a80df7b 100644 --- a/libs/market-list/src/lib/components/markets-container/markets-container.tsx +++ b/libs/market-list/src/lib/components/markets-container/markets-container.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { AsyncRenderer } from '@vegaprotocol/ui-toolkit'; import { MarketListTable } from './market-list-table'; import { useDataProvider } from '@vegaprotocol/react-helpers'; diff --git a/libs/network-info/src/network-info.tsx b/libs/network-info/src/network-info.tsx index 6d7a66b07..f64e41fc9 100644 --- a/libs/network-info/src/network-info.tsx +++ b/libs/network-info/src/network-info.tsx @@ -1,5 +1,5 @@ import { Fragment, useState } from 'react'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { Link, Lozenge } from '@vegaprotocol/ui-toolkit'; import { NodeSwitcherDialog, useEnvironment } from '@vegaprotocol/environment'; diff --git a/libs/network-stats/src/config/stats-fields.ts b/libs/network-stats/src/config/stats-fields.ts index 718a616d3..5839d2543 100644 --- a/libs/network-stats/src/config/stats-fields.ts +++ b/libs/network-stats/src/config/stats-fields.ts @@ -3,8 +3,8 @@ import { getDateTimeFormat, getTimeFormat, isValidDate, - t, } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { Stats, StatFields } from './types'; // Stats fields config. Keys will correspond to graphql queries when used, and values diff --git a/libs/orders/src/lib/components/order-list-container.tsx b/libs/orders/src/lib/components/order-list-container.tsx index f726a526e..5b91ff427 100644 --- a/libs/orders/src/lib/components/order-list-container.tsx +++ b/libs/orders/src/lib/components/order-list-container.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { Splash } from '@vegaprotocol/ui-toolkit'; import { useVegaWallet } from '@vegaprotocol/wallet'; import { OrderListManager } from './order-list-manager'; diff --git a/libs/orders/src/lib/components/order-list-manager/order-list-manager.tsx b/libs/orders/src/lib/components/order-list-manager/order-list-manager.tsx index 9393eeea8..49aaec2da 100644 --- a/libs/orders/src/lib/components/order-list-manager/order-list-manager.tsx +++ b/libs/orders/src/lib/components/order-list-manager/order-list-manager.tsx @@ -1,5 +1,6 @@ import { AsyncRenderer } from '@vegaprotocol/ui-toolkit'; -import { t, truncateByChars } from '@vegaprotocol/utils'; +import { truncateByChars } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { useRef, useState } from 'react'; import type { BodyScrollEvent, diff --git a/libs/orders/src/lib/components/order-list/order-edit-dialog.tsx b/libs/orders/src/lib/components/order-list/order-edit-dialog.tsx index fd076834b..6a50033b5 100644 --- a/libs/orders/src/lib/components/order-list/order-edit-dialog.tsx +++ b/libs/orders/src/lib/components/order-list/order-edit-dialog.tsx @@ -1,12 +1,12 @@ import { - t, toDecimal, - Size, getDateTimeFormat, addDecimal, addDecimalsFormatNumber, validateAmount, } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; +import { Size } from '@vegaprotocol/react-helpers'; import * as Schema from '@vegaprotocol/types'; import { FormGroup, diff --git a/libs/orders/src/lib/components/order-list/order-list.tsx b/libs/orders/src/lib/components/order-list/order-list.tsx index b27be52a0..4af68a4cb 100644 --- a/libs/orders/src/lib/components/order-list/order-list.tsx +++ b/libs/orders/src/lib/components/order-list/order-list.tsx @@ -2,8 +2,8 @@ import { addDecimalsFormatNumber, getDateTimeFormat, isNumeric, - t, } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import * as Schema from '@vegaprotocol/types'; import { ButtonLink, Link } from '@vegaprotocol/ui-toolkit'; import { AgGridColumn } from 'ag-grid-react'; diff --git a/libs/orders/src/lib/order-hooks/use-order-submit.tsx b/libs/orders/src/lib/order-hooks/use-order-submit.tsx index fd304b52c..4be232443 100644 --- a/libs/orders/src/lib/order-hooks/use-order-submit.tsx +++ b/libs/orders/src/lib/order-hooks/use-order-submit.tsx @@ -10,7 +10,7 @@ import * as Sentry from '@sentry/react'; import { useOrderUpdate } from './use-order-update'; import * as Schema from '@vegaprotocol/types'; import { Icon, Intent } from '@vegaprotocol/ui-toolkit'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { OrderSubmissionBody } from '@vegaprotocol/wallet'; export const getOrderDialogTitle = ( diff --git a/libs/orders/src/lib/utils.ts b/libs/orders/src/lib/utils.ts index bddb5e809..b9e4060ed 100644 --- a/libs/orders/src/lib/utils.ts +++ b/libs/orders/src/lib/utils.ts @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import * as Schema from '@vegaprotocol/types'; import type { OrderSubFieldsFragment } from './order-hooks'; diff --git a/libs/positions/src/lib/close-position-dialog/complete.tsx b/libs/positions/src/lib/close-position-dialog/complete.tsx index 75ae4a29d..2bc3bc23e 100644 --- a/libs/positions/src/lib/close-position-dialog/complete.tsx +++ b/libs/positions/src/lib/close-position-dialog/complete.tsx @@ -1,6 +1,7 @@ import { useEnvironment } from '@vegaprotocol/environment'; -import type { OrderEventFieldsFragment } from '@vegaprotocol/orders'; -import { t, truncateByChars } from '@vegaprotocol/utils'; +import type { OrderFieldsFragment } from '@vegaprotocol/orders'; +import { truncateByChars } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import * as Schema from '@vegaprotocol/types'; import { Link } from '@vegaprotocol/ui-toolkit'; import type { TransactionResult, VegaTxState } from '@vegaprotocol/wallet'; @@ -13,7 +14,7 @@ interface CompleteProps { transaction: VegaTxState; transactionResult?: TransactionResult; closingOrder?: IClosingOrder; - closingOrderResult?: OrderEventFieldsFragment; + closingOrderResult?: OrderFieldsFragment; } export const Complete = ({ @@ -89,7 +90,7 @@ const Error = ({ closingOrderResult, }: { transactionResult: TransactionResult; - closingOrderResult: OrderEventFieldsFragment; + closingOrderResult: OrderFieldsFragment; }) => { const reason = closingOrderResult.rejectionReason && diff --git a/libs/positions/src/lib/close-position-dialog/requested.tsx b/libs/positions/src/lib/close-position-dialog/requested.tsx index 27174a4cf..8d965661b 100644 --- a/libs/positions/src/lib/close-position-dialog/requested.tsx +++ b/libs/positions/src/lib/close-position-dialog/requested.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { ClosingOrder as IClosingOrder } from '../use-close-position'; import { useRequestClosePositionData } from '../use-request-close-position-data'; import { ActiveOrders, ClosingOrder } from './shared'; diff --git a/libs/positions/src/lib/close-position-dialog/shared.tsx b/libs/positions/src/lib/close-position-dialog/shared.tsx index f4cb13abb..e8d6df8aa 100644 --- a/libs/positions/src/lib/close-position-dialog/shared.tsx +++ b/libs/positions/src/lib/close-position-dialog/shared.tsx @@ -1,7 +1,9 @@ import type { MarketData, Market } from '@vegaprotocol/market-list'; import type { Order } from '@vegaprotocol/orders'; import { timeInForceLabel } from '@vegaprotocol/orders'; -import { addDecimalsFormatNumber, Size, t } from '@vegaprotocol/utils'; +import { addDecimalsFormatNumber } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; +import { Size } from '@vegaprotocol/react-helpers'; import type { ReactNode } from 'react'; import type { ClosingOrder as IClosingOrder } from '../use-close-position'; diff --git a/libs/positions/src/lib/positions-container.tsx b/libs/positions/src/lib/positions-container.tsx index 2a9a7d5aa..4f079c318 100644 --- a/libs/positions/src/lib/positions-container.tsx +++ b/libs/positions/src/lib/positions-container.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { Splash } from '@vegaprotocol/ui-toolkit'; import { useVegaWallet } from '@vegaprotocol/wallet'; import { PositionsManager } from './positions-manager'; diff --git a/libs/positions/src/lib/positions-manager.tsx b/libs/positions/src/lib/positions-manager.tsx index 0023d270d..f3dcece01 100644 --- a/libs/positions/src/lib/positions-manager.tsx +++ b/libs/positions/src/lib/positions-manager.tsx @@ -4,7 +4,7 @@ import { usePositionsData, PositionsTable } from '../'; import type { AgGridReact } from 'ag-grid-react'; import * as Schema from '@vegaprotocol/types'; import { useVegaTransactionStore } from '@vegaprotocol/wallet'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; interface PositionsManagerProps { partyId: string; diff --git a/libs/positions/src/lib/positions-table.tsx b/libs/positions/src/lib/positions-table.tsx index a724e8098..0acec30bd 100644 --- a/libs/positions/src/lib/positions-table.tsx +++ b/libs/positions/src/lib/positions-table.tsx @@ -17,12 +17,12 @@ import { } from '@vegaprotocol/datagrid'; import { volumePrefix, - t, toBigNum, formatNumber, getDateTimeFormat, addDecimalsFormatNumber, } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { AgGridColumn } from 'ag-grid-react'; import type { AgGridReact } from 'ag-grid-react'; import type { Position } from './positions-data-providers'; diff --git a/libs/trades/src/lib/trades-table.tsx b/libs/trades/src/lib/trades-table.tsx index a738429dc..54284992e 100644 --- a/libs/trades/src/lib/trades-table.tsx +++ b/libs/trades/src/lib/trades-table.tsx @@ -4,15 +4,14 @@ import { forwardRef } from 'react'; import type { VegaICellRendererParams, VegaValueFormatterParams, -} from '@vegaprotocol/ui-toolkit'; -import { AgGridDynamic as AgGrid } from '@vegaprotocol/ui-toolkit'; +} from '@vegaprotocol/datagrid'; +import { AgGridDynamic as AgGrid, NumericCell } from '@vegaprotocol/datagrid'; import { addDecimal, addDecimalsFormatNumber, getDateTimeFormat, - NumericCell, - t, } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import type { IDatasource, IGetRowsParams } from 'ag-grid-community'; import type { CellClassParams } from 'ag-grid-community'; import type { AgGridReactProps } from 'ag-grid-react'; diff --git a/libs/ui-toolkit/src/components/async-renderer/async-renderer.tsx b/libs/ui-toolkit/src/components/async-renderer/async-renderer.tsx index c8a7f3f1d..854df25b7 100644 --- a/libs/ui-toolkit/src/components/async-renderer/async-renderer.tsx +++ b/libs/ui-toolkit/src/components/async-renderer/async-renderer.tsx @@ -1,6 +1,6 @@ import { Splash } from '../splash'; import type { ReactNode } from 'react'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { Button } from '../button'; interface AsyncRendererProps { diff --git a/libs/ui-toolkit/src/components/maintenance-page/maintenance-page.tsx b/libs/ui-toolkit/src/components/maintenance-page/maintenance-page.tsx index 6c1f244c2..ea2a8c7f1 100644 --- a/libs/ui-toolkit/src/components/maintenance-page/maintenance-page.tsx +++ b/libs/ui-toolkit/src/components/maintenance-page/maintenance-page.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { ExternalLink } from '../link'; import { BackgroundVideo } from '../background-video'; diff --git a/libs/ui-toolkit/src/components/theme-switcher/theme-switcher.tsx b/libs/ui-toolkit/src/components/theme-switcher/theme-switcher.tsx index 892b13ec1..6ca96ecc6 100644 --- a/libs/ui-toolkit/src/components/theme-switcher/theme-switcher.tsx +++ b/libs/ui-toolkit/src/components/theme-switcher/theme-switcher.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { useThemeSwitcher } from '@vegaprotocol/react-helpers'; import { SunIcon, MoonIcon } from './icons'; import { Toggle } from '../toggle'; diff --git a/libs/ui-toolkit/src/components/toast/toasts-container.tsx b/libs/ui-toolkit/src/components/toast/toasts-container.tsx index 792e0c2de..a1675d6b3 100644 --- a/libs/ui-toolkit/src/components/toast/toasts-container.tsx +++ b/libs/ui-toolkit/src/components/toast/toasts-container.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { usePrevious } from '@vegaprotocol/react-helpers'; import classNames from 'classnames'; import type { Ref } from 'react'; diff --git a/libs/ui-toolkit/src/components/vega-logo/vega-logo.tsx b/libs/ui-toolkit/src/components/vega-logo/vega-logo.tsx index 6a12b4fd3..73ce63c4a 100644 --- a/libs/ui-toolkit/src/components/vega-logo/vega-logo.tsx +++ b/libs/ui-toolkit/src/components/vega-logo/vega-logo.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; export const VegaLogo = () => { return ( diff --git a/libs/ui-toolkit/src/components/viewing-as-user/index.tsx b/libs/ui-toolkit/src/components/viewing-as-user/index.tsx index a40728328..deb69c510 100644 --- a/libs/ui-toolkit/src/components/viewing-as-user/index.tsx +++ b/libs/ui-toolkit/src/components/viewing-as-user/index.tsx @@ -1,5 +1,5 @@ import { Button } from '../button'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; export function truncateMiddle(address: string) { if (address.length < 11) return address; diff --git a/libs/utils/src/index.ts b/libs/utils/src/index.ts index ebce1b9d4..f099ed873 100644 --- a/libs/utils/src/index.ts +++ b/libs/utils/src/index.ts @@ -6,7 +6,6 @@ export * from './lib/get-events'; export * from './lib/get-nodes'; export * from './lib/get-user-locale'; export * from './lib/helpers'; -export * from './lib/i18n'; export * from './lib/is-asset-erc20'; export * from './lib/is-valid-url'; export * from './lib/links'; diff --git a/libs/utils/src/lib/markets.ts b/libs/utils/src/lib/markets.ts index dbb558428..11a56607f 100644 --- a/libs/utils/src/lib/markets.ts +++ b/libs/utils/src/lib/markets.ts @@ -1,7 +1,7 @@ import { MarketState } from '@vegaprotocol/types'; +import { t } from '@vegaprotocol/i18n'; import { isValid, parseISO } from 'date-fns'; import { getDateTimeFormat } from './format'; -import { t } from './i18n'; export const getMarketExpiryDate = ( tags?: ReadonlyArray | null diff --git a/libs/utils/src/lib/validate/common.ts b/libs/utils/src/lib/validate/common.ts index 9a87d44c9..434fd5e37 100644 --- a/libs/utils/src/lib/validate/common.ts +++ b/libs/utils/src/lib/validate/common.ts @@ -1,6 +1,6 @@ import BigNumber from 'bignumber.js'; import { ethers } from 'ethers'; -import { t } from '../../../../utils/src/lib/i18n'; +import { t } from '@vegaprotocol/i18n'; export const required = (value: string) => { if (value === null || value === undefined || value === '') { diff --git a/libs/utils/src/lib/validate/validate-amount.ts b/libs/utils/src/lib/validate/validate-amount.ts index 35e597ddd..55d9f1941 100644 --- a/libs/utils/src/lib/validate/validate-amount.ts +++ b/libs/utils/src/lib/validate/validate-amount.ts @@ -1,4 +1,4 @@ -import { t } from '../../../../utils/src/lib/i18n'; +import { t } from '@vegaprotocol/i18n'; export const validateAmount = (step: number | string, field: string) => { const [, stepDecimals = ''] = String(step).split('.'); diff --git a/libs/wallet/src/connect-dialog/connect-dialog-elements.tsx b/libs/wallet/src/connect-dialog/connect-dialog-elements.tsx index 27897632e..820ae9505 100644 --- a/libs/wallet/src/connect-dialog/connect-dialog-elements.tsx +++ b/libs/wallet/src/connect-dialog/connect-dialog-elements.tsx @@ -1,5 +1,6 @@ import { useEnvironment } from '@vegaprotocol/environment'; -import { createDocsLinks, ExternalLinks, t } from '@vegaprotocol/utils'; +import { createDocsLinks, ExternalLinks } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { Link } from '@vegaprotocol/ui-toolkit'; import type { ReactNode } from 'react'; diff --git a/libs/wallet/src/connect-dialog/connect-dialog.spec.tsx b/libs/wallet/src/connect-dialog/connect-dialog.spec.tsx index 14ed885a1..04a34e4b9 100644 --- a/libs/wallet/src/connect-dialog/connect-dialog.spec.tsx +++ b/libs/wallet/src/connect-dialog/connect-dialog.spec.tsx @@ -19,8 +19,8 @@ import { WalletError, } from '../connectors'; import { useEnvironment } from '@vegaprotocol/environment'; -import type { ChainIdQuery } from '@vegaprotocol/utils'; -import { ChainIdDocument } from '@vegaprotocol/utils'; +import type { ChainIdQuery } from '@vegaprotocol/react-helpers'; +import { ChainIdDocument } from '@vegaprotocol/react-helpers'; const mockUpdateDialogOpen = jest.fn(); const mockCloseVegaDialog = jest.fn(); diff --git a/libs/wallet/src/connect-dialog/connect-dialog.tsx b/libs/wallet/src/connect-dialog/connect-dialog.tsx index 0ab32c401..131998236 100644 --- a/libs/wallet/src/connect-dialog/connect-dialog.tsx +++ b/libs/wallet/src/connect-dialog/connect-dialog.tsx @@ -10,7 +10,8 @@ import { } from '@vegaprotocol/ui-toolkit'; import { useCallback, useState } from 'react'; import type { WalletClientError } from '@vegaprotocol/wallet-client'; -import { ExternalLinks, t } from '@vegaprotocol/utils'; +import { ExternalLinks } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { useChainIdQuery } from '@vegaprotocol/react-helpers'; import type { VegaConnector } from '../connectors'; import { ViewConnector } from '../connectors'; diff --git a/libs/wallet/src/connect-dialog/json-rpc-connector-form.tsx b/libs/wallet/src/connect-dialog/json-rpc-connector-form.tsx index fed5c21bc..b3cb78874 100644 --- a/libs/wallet/src/connect-dialog/json-rpc-connector-form.tsx +++ b/libs/wallet/src/connect-dialog/json-rpc-connector-form.tsx @@ -1,5 +1,6 @@ import capitalize from 'lodash/capitalize'; -import { createDocsLinks, t } from '@vegaprotocol/utils'; +import { createDocsLinks } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { ButtonLink, Diamond, diff --git a/libs/wallet/src/connect-dialog/rest-connector-form.tsx b/libs/wallet/src/connect-dialog/rest-connector-form.tsx index db76242aa..d2e90c97c 100644 --- a/libs/wallet/src/connect-dialog/rest-connector-form.tsx +++ b/libs/wallet/src/connect-dialog/rest-connector-form.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { Button, FormGroup, Input, InputError } from '@vegaprotocol/ui-toolkit'; import { useState } from 'react'; import { useForm } from 'react-hook-form'; diff --git a/libs/wallet/src/connect-dialog/view-connector-form.tsx b/libs/wallet/src/connect-dialog/view-connector-form.tsx index 87aeb9a43..d6367f2a7 100644 --- a/libs/wallet/src/connect-dialog/view-connector-form.tsx +++ b/libs/wallet/src/connect-dialog/view-connector-form.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { Button, FormGroup, diff --git a/libs/wallet/src/connectors/json-rpc-connector.ts b/libs/wallet/src/connectors/json-rpc-connector.ts index 8717dd5ef..7a1186b48 100644 --- a/libs/wallet/src/connectors/json-rpc-connector.ts +++ b/libs/wallet/src/connectors/json-rpc-connector.ts @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { WalletClient, WalletClientError } from '@vegaprotocol/wallet-client'; import { clearConfig, getConfig, setConfig } from '../storage'; import type { Transaction, VegaConnector } from './vega-connector'; diff --git a/libs/wallet/src/connectors/rest-connector.ts b/libs/wallet/src/connectors/rest-connector.ts index fb97b8804..f7dc1b3be 100644 --- a/libs/wallet/src/connectors/rest-connector.ts +++ b/libs/wallet/src/connectors/rest-connector.ts @@ -3,7 +3,7 @@ import { clearConfig, getConfig, setConfig } from '../storage'; import type { Transaction, VegaConnector } from './vega-connector'; import { WalletError } from './vega-connector'; import { z } from 'zod'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; type TransactionError = | { diff --git a/libs/wallet/src/manage-dialog/manage-dialog.tsx b/libs/wallet/src/manage-dialog/manage-dialog.tsx index 9c08d5dab..738837f55 100644 --- a/libs/wallet/src/manage-dialog/manage-dialog.tsx +++ b/libs/wallet/src/manage-dialog/manage-dialog.tsx @@ -1,4 +1,5 @@ -import { t, truncateByChars } from '@vegaprotocol/utils'; +import { truncateByChars } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { Button, Dialog, diff --git a/libs/wallet/src/vega-transaction-dialog/vega-transaction-dialog.tsx b/libs/wallet/src/vega-transaction-dialog/vega-transaction-dialog.tsx index 48c16ca22..7c5ff30f4 100644 --- a/libs/wallet/src/vega-transaction-dialog/vega-transaction-dialog.tsx +++ b/libs/wallet/src/vega-transaction-dialog/vega-transaction-dialog.tsx @@ -1,5 +1,5 @@ import { Networks, useEnvironment } from '@vegaprotocol/environment'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { Dialog, Icon, Intent, Loader } from '@vegaprotocol/ui-toolkit'; import type { ReactNode } from 'react'; import { WalletClientError } from '@vegaprotocol/wallet-client'; diff --git a/libs/web3/src/lib/ethereum-transaction-dialog/dialog-rows.tsx b/libs/web3/src/lib/ethereum-transaction-dialog/dialog-rows.tsx index bf89f4927..f9994d2cb 100644 --- a/libs/web3/src/lib/ethereum-transaction-dialog/dialog-rows.tsx +++ b/libs/web3/src/lib/ethereum-transaction-dialog/dialog-rows.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { Link } from '@vegaprotocol/ui-toolkit'; import { useEnvironment } from '@vegaprotocol/environment'; import { EthTxStatus } from '../use-ethereum-transaction'; diff --git a/libs/web3/src/lib/ethereum-transaction-dialog/ethereum-transaction-dialog.tsx b/libs/web3/src/lib/ethereum-transaction-dialog/ethereum-transaction-dialog.tsx index 1c60a6553..6e9ab909e 100644 --- a/libs/web3/src/lib/ethereum-transaction-dialog/ethereum-transaction-dialog.tsx +++ b/libs/web3/src/lib/ethereum-transaction-dialog/ethereum-transaction-dialog.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { Button, Dialog, Icon, Intent, Loader } from '@vegaprotocol/ui-toolkit'; import { isEthereumError } from '../ethereum-error'; import type { EthTxState, TxError } from '../use-ethereum-transaction'; diff --git a/libs/web3/src/lib/use-ethereum-withdraw-approvals-manager.spec.tsx b/libs/web3/src/lib/use-ethereum-withdraw-approvals-manager.spec.tsx index 788caf719..6d167b600 100644 --- a/libs/web3/src/lib/use-ethereum-withdraw-approvals-manager.spec.tsx +++ b/libs/web3/src/lib/use-ethereum-withdraw-approvals-manager.spec.tsx @@ -16,8 +16,8 @@ import type { EthTransactionStore } from './use-ethereum-transaction-store'; import { WithdrawalApprovalDocument } from '@vegaprotocol/wallet'; import type { WithdrawalApprovalQuery } from '@vegaprotocol/wallet'; -import { NetworkParamsDocument } from '@vegaprotocol/utils'; -import type { NetworkParamsQuery } from '@vegaprotocol/utils'; +import { NetworkParamsDocument } from '@vegaprotocol/react-helpers'; +import type { NetworkParamsQuery } from '@vegaprotocol/react-helpers'; const mockWeb3Provider = jest.fn(); diff --git a/libs/web3/src/lib/use-ethereum-withdraw-approvals-manager.tsx b/libs/web3/src/lib/use-ethereum-withdraw-approvals-manager.tsx index e8bc1bb97..fa9bdf272 100644 --- a/libs/web3/src/lib/use-ethereum-withdraw-approvals-manager.tsx +++ b/libs/web3/src/lib/use-ethereum-withdraw-approvals-manager.tsx @@ -4,7 +4,7 @@ import { useRef, useEffect } from 'react'; import { addDecimal } from '@vegaprotocol/utils'; import { useGetWithdrawThreshold } from './use-get-withdraw-threshold'; import { useGetWithdrawDelay } from './use-get-withdraw-delay'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { CollateralBridge } from '@vegaprotocol/smart-contracts'; diff --git a/libs/web3/src/lib/web3-connect-dialog.tsx b/libs/web3/src/lib/web3-connect-dialog.tsx index dfb24b768..3ebc85794 100644 --- a/libs/web3/src/lib/web3-connect-dialog.tsx +++ b/libs/web3/src/lib/web3-connect-dialog.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { useLocalStorage } from '@vegaprotocol/react-helpers'; import { Dialog, Intent } from '@vegaprotocol/ui-toolkit'; import { MetaMask } from '@web3-react/metamask'; diff --git a/libs/withdraws/src/lib/create-withdrawal-dialog.tsx b/libs/withdraws/src/lib/create-withdrawal-dialog.tsx index 66be6a6fd..ed3760664 100644 --- a/libs/withdraws/src/lib/create-withdrawal-dialog.tsx +++ b/libs/withdraws/src/lib/create-withdrawal-dialog.tsx @@ -1,4 +1,4 @@ -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { Dialog } from '@vegaprotocol/ui-toolkit'; import { useVegaWallet } from '@vegaprotocol/wallet'; import { WithdrawFormContainer } from './withdraw-form-container'; diff --git a/libs/withdraws/src/lib/use-verify-withdrawal.ts b/libs/withdraws/src/lib/use-verify-withdrawal.ts index 7b6126280..6e75f6a6c 100644 --- a/libs/withdraws/src/lib/use-verify-withdrawal.ts +++ b/libs/withdraws/src/lib/use-verify-withdrawal.ts @@ -1,7 +1,8 @@ import { useCallback, useState } from 'react'; import { captureException } from '@sentry/react'; import BigNumber from 'bignumber.js'; -import { addDecimal, t } from '@vegaprotocol/utils'; +import { addDecimal } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { useGetWithdrawThreshold, useGetWithdrawDelay, diff --git a/libs/withdraws/src/lib/withdraw-form-container.tsx b/libs/withdraws/src/lib/withdraw-form-container.tsx index c127a2d5b..7e6b4c614 100644 --- a/libs/withdraws/src/lib/withdraw-form-container.tsx +++ b/libs/withdraws/src/lib/withdraw-form-container.tsx @@ -1,5 +1,6 @@ import { useMemo } from 'react'; -import { t, toBigNum } from '@vegaprotocol/utils'; +import { toBigNum } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { useDataProvider } from '@vegaprotocol/react-helpers'; import { AsyncRenderer } from '@vegaprotocol/ui-toolkit'; import { accountsDataProvider } from '@vegaprotocol/accounts'; diff --git a/libs/withdraws/src/lib/withdraw-form.tsx b/libs/withdraws/src/lib/withdraw-form.tsx index 0145c6578..108ea5e84 100644 --- a/libs/withdraws/src/lib/withdraw-form.tsx +++ b/libs/withdraws/src/lib/withdraw-form.tsx @@ -3,11 +3,11 @@ import { AssetOption } from '@vegaprotocol/assets'; import { ethereumAddress, minSafe, - t, removeDecimal, required, isAssetTypeERC20, } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { useLocalStorage } from '@vegaprotocol/react-helpers'; import { Button, diff --git a/libs/withdraws/src/lib/withdraw-limits.tsx b/libs/withdraws/src/lib/withdraw-limits.tsx index 0a1e7e832..c56fd0f6e 100644 --- a/libs/withdraws/src/lib/withdraw-limits.tsx +++ b/libs/withdraws/src/lib/withdraw-limits.tsx @@ -1,5 +1,5 @@ import type { Asset } from '@vegaprotocol/assets'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { CompactNumber } from '@vegaprotocol/react-helpers'; import { KeyValueTable, KeyValueTableRow } from '@vegaprotocol/ui-toolkit'; import BigNumber from 'bignumber.js'; diff --git a/libs/withdraws/src/lib/withdrawal-dialog.tsx b/libs/withdraws/src/lib/withdrawal-dialog.tsx index e17353988..d31cf9bc6 100644 --- a/libs/withdraws/src/lib/withdrawal-dialog.tsx +++ b/libs/withdraws/src/lib/withdrawal-dialog.tsx @@ -1,5 +1,5 @@ import { create } from 'zustand'; -import { t } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { Dialog } from '@vegaprotocol/ui-toolkit'; import { useVegaWallet } from '@vegaprotocol/wallet'; import { useCompleteWithdraw } from './use-complete-withdraw'; diff --git a/libs/withdraws/src/lib/withdrawal-feedback.tsx b/libs/withdraws/src/lib/withdrawal-feedback.tsx index 7783059e1..647cd5fa1 100644 --- a/libs/withdraws/src/lib/withdrawal-feedback.tsx +++ b/libs/withdraws/src/lib/withdrawal-feedback.tsx @@ -1,9 +1,6 @@ import { useEnvironment } from '@vegaprotocol/environment'; -import { - addDecimalsFormatNumber, - t, - truncateByChars, -} from '@vegaprotocol/utils'; +import { addDecimalsFormatNumber, truncateByChars } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { Button, KeyValueTable, diff --git a/libs/withdraws/src/lib/withdrawals-provider.ts b/libs/withdraws/src/lib/withdrawals-provider.ts index 58086e609..1c056d1ae 100644 --- a/libs/withdraws/src/lib/withdrawals-provider.ts +++ b/libs/withdraws/src/lib/withdrawals-provider.ts @@ -1,5 +1,9 @@ import uniqBy from 'lodash/uniqBy'; -import { makeDataProvider } from '@vegaprotocol/utils'; +import { + makeDataProvider, + removePaginationWrapper, + getEvents, +} from '@vegaprotocol/utils'; import * as Schema from '@vegaprotocol/types'; import { WithdrawalsDocument, @@ -11,7 +15,6 @@ import type { WithdrawalEventSubscription, WithdrawalEventSubscriptionVariables, } from './__generated__/Withdrawal'; -import { removePaginationWrapper, getEvents } from '@vegaprotocol/utils'; const sortWithdrawals = (data: WithdrawalFieldsFragment[]) => data.sort((a, b) => { diff --git a/libs/withdraws/src/lib/withdrawals-table.tsx b/libs/withdraws/src/lib/withdrawals-table.tsx index d57c0a825..d21887bff 100644 --- a/libs/withdraws/src/lib/withdrawals-table.tsx +++ b/libs/withdraws/src/lib/withdrawals-table.tsx @@ -1,11 +1,11 @@ import { AgGridColumn } from 'ag-grid-react'; import { getDateTimeFormat, - t, truncateByChars, addDecimalsFormatNumber, isNumeric, } from '@vegaprotocol/utils'; +import { t } from '@vegaprotocol/i18n'; import { Link, ButtonLink, diff --git a/tsconfig.base.json b/tsconfig.base.json index 755c680e3..3fe089ba6 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -27,6 +27,7 @@ "@vegaprotocol/environment": ["libs/environment/src/index.ts"], "@vegaprotocol/fills": ["libs/fills/src/index.ts"], "@vegaprotocol/governance": ["libs/governance/src/index.ts"], + "@vegaprotocol/i18n": ["libs/i18n/src/index.ts"], "@vegaprotocol/ledger": ["libs/ledger/src/index.ts"], "@vegaprotocol/liquidity": ["libs/liquidity/src/index.ts"], "@vegaprotocol/market-depth": ["libs/market-depth/src/index.ts"], diff --git a/workspace.json b/workspace.json index 4013aa445..ee37de7fd 100644 --- a/workspace.json +++ b/workspace.json @@ -14,6 +14,7 @@ "explorer-e2e": "apps/explorer-e2e", "fills": "libs/fills", "governance": "libs/governance", + "i18n": "libs/i18n", "ledger": "libs/ledger", "liquidity": "libs/liquidity", "liquidity-provision-dashboard": "apps/liquidity-provision-dashboard",