chore(trading): misc fixes (#5785)

This commit is contained in:
Matthew Russell 2024-02-13 11:17:00 -05:00 committed by GitHub
parent 1c2389dee5
commit 8fe6f3f5f2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 19 additions and 51 deletions

View File

@ -1,27 +1,20 @@
import { useEffect } from 'react'; import { TinyScroll } from '@vegaprotocol/ui-toolkit';
import { titlefy } from '@vegaprotocol/utils';
import { ErrorBoundary } from '../../components/error-boundary'; import { ErrorBoundary } from '../../components/error-boundary';
import { FeesContainer } from '../../components/fees-container'; import { FeesContainer } from '../../components/fees-container';
import { useT } from '../../lib/use-t'; import { useT } from '../../lib/use-t';
import { usePageTitleStore } from '../../stores'; import { usePageTitle } from '../../lib/hooks/use-page-title';
export const Fees = () => { export const Fees = () => {
const t = useT(); const t = useT();
const title = t('Fees'); const title = t('Fees');
const { updateTitle } = usePageTitleStore((store) => ({ usePageTitle(title);
updateTitle: store.updateTitle,
}));
useEffect(() => {
updateTitle(titlefy([title]));
}, [updateTitle, title]);
return ( return (
<ErrorBoundary feature="fees"> <ErrorBoundary feature="fees">
<div className="container p-4 mx-auto"> <TinyScroll className="p-4 max-h-full overflow-auto">
<h1 className="px-4 pb-4 text-2xl">{title}</h1> <h1 className="md:px-4 pb-4 text-2xl">{title}</h1>
<FeesContainer /> <FeesContainer />
</div> </TinyScroll>
</ErrorBoundary> </ErrorBoundary>
); );
}; };

View File

@ -1,5 +1,3 @@
import React, { useEffect } from 'react';
import { titlefy } from '@vegaprotocol/utils';
import { import {
LocalStoragePersistTabs as Tabs, LocalStoragePersistTabs as Tabs,
Tab, Tab,
@ -7,7 +5,6 @@ import {
} from '@vegaprotocol/ui-toolkit'; } from '@vegaprotocol/ui-toolkit';
import { OpenMarkets } from './open-markets'; import { OpenMarkets } from './open-markets';
import { Proposed } from './proposed'; import { Proposed } from './proposed';
import { usePageTitleStore } from '../../stores';
import { Closed } from './closed'; import { Closed } from './closed';
import { import {
DApp, DApp,
@ -17,19 +14,14 @@ import {
import { useT } from '../../lib/use-t'; import { useT } from '../../lib/use-t';
import { ErrorBoundary } from '../../components/error-boundary'; import { ErrorBoundary } from '../../components/error-boundary';
import { MarketsSettings } from './markets-settings'; import { MarketsSettings } from './markets-settings';
import { usePageTitle } from '../../lib/hooks/use-page-title';
export const MarketsPage = () => { export const MarketsPage = () => {
const t = useT(); const t = useT();
const { updateTitle } = usePageTitleStore((store) => ({
updateTitle: store.updateTitle,
}));
const governanceLink = useLinks(DApp.Governance); const governanceLink = useLinks(DApp.Governance);
const externalLink = governanceLink(TOKEN_NEW_MARKET_PROPOSAL); const externalLink = governanceLink(TOKEN_NEW_MARKET_PROPOSAL);
useEffect(() => { usePageTitle(t('Markets'));
updateTitle(titlefy([t('Markets')]));
}, [updateTitle, t]);
return ( return (
<div className="h-full pt-0.5 pb-3 px-1.5"> <div className="h-full pt-0.5 pb-3 px-1.5">

View File

@ -1,10 +1,8 @@
import { useEffect } from 'react'; import { useEffect } from 'react';
import type { ReactNode } from 'react'; import type { ReactNode } from 'react';
import { LayoutPriority } from 'allotment'; import { LayoutPriority } from 'allotment';
import { titlefy } from '@vegaprotocol/utils';
import { useIncompleteWithdrawals } from '@vegaprotocol/withdraws'; import { useIncompleteWithdrawals } from '@vegaprotocol/withdraws';
import { Tab, LocalStoragePersistTabs as Tabs } from '@vegaprotocol/ui-toolkit'; import { Tab, LocalStoragePersistTabs as Tabs } from '@vegaprotocol/ui-toolkit';
import { usePageTitleStore } from '../../stores';
import { import {
AccountsContainer, AccountsContainer,
AccountsSettings, AccountsSettings,
@ -41,6 +39,7 @@ import { WithdrawalsMenu } from '../../components/withdrawals-menu';
import { useGetCurrentRouteId } from '../../lib/hooks/use-get-current-route-id'; import { useGetCurrentRouteId } from '../../lib/hooks/use-get-current-route-id';
import { useT } from '../../lib/use-t'; import { useT } from '../../lib/use-t';
import { ErrorBoundary } from '../../components/error-boundary'; import { ErrorBoundary } from '../../components/error-boundary';
import { usePageTitle } from '../../lib/hooks/use-page-title';
const WithdrawalsIndicator = () => { const WithdrawalsIndicator = () => {
const { ready } = useIncompleteWithdrawals(); const { ready } = useIncompleteWithdrawals();
@ -69,14 +68,7 @@ const SidebarViewInitializer = () => {
export const Portfolio = () => { export const Portfolio = () => {
const t = useT(); const t = useT();
usePageTitle(t('Portfolio'));
const { updateTitle } = usePageTitleStore((store) => ({
updateTitle: store.updateTitle,
}));
useEffect(() => {
updateTitle(titlefy([t('Portfolio')]));
}, [updateTitle, t]);
const [sizes, handleOnLayoutChange] = usePaneLayout({ id: 'portfolio' }); const [sizes, handleOnLayoutChange] = usePaneLayout({ id: 'portfolio' });
const wrapperClasses = 'p-0.5 h-full max-h-full flex flex-col'; const wrapperClasses = 'p-0.5 h-full max-h-full flex flex-col';

View File

@ -1,24 +1,18 @@
import { useEffect } from 'react'; import { TinyScroll } from '@vegaprotocol/ui-toolkit';
import { titlefy } from '@vegaprotocol/utils';
import { useT } from '../../lib/use-t'; import { useT } from '../../lib/use-t';
import { RewardsContainer } from '../../components/rewards-container'; import { RewardsContainer } from '../../components/rewards-container';
import { usePageTitleStore } from '../../stores';
import { ErrorBoundary } from '../../components/error-boundary'; import { ErrorBoundary } from '../../components/error-boundary';
import { TinyScroll } from '@vegaprotocol/ui-toolkit'; import { usePageTitle } from '../../lib/hooks/use-page-title';
export const Rewards = () => { export const Rewards = () => {
const t = useT(); const t = useT();
const title = t('Rewards'); const title = t('Rewards');
const { updateTitle } = usePageTitleStore((store) => ({ usePageTitle(title);
updateTitle: store.updateTitle,
}));
useEffect(() => {
updateTitle(titlefy([title]));
}, [updateTitle, title]);
return ( return (
<ErrorBoundary feature="rewards"> <ErrorBoundary feature="rewards">
<TinyScroll className="p-4 max-h-full overflow-auto"> <TinyScroll className="p-4 max-h-full overflow-auto">
<h1 className="px-4 pb-4 text-2xl">{title}</h1> <h1 className="md:px-4 pb-4 text-2xl">{title}</h1>
<RewardsContainer /> <RewardsContainer />
</TinyScroll> </TinyScroll>
</ErrorBoundary> </ErrorBoundary>

View File

@ -4,7 +4,6 @@ import {
ExternalLink, ExternalLink,
Intent, Intent,
NotificationBanner, NotificationBanner,
SHORT,
} from '@vegaprotocol/ui-toolkit'; } from '@vegaprotocol/ui-toolkit';
import type { StoredNextProtocolUpgradeData } from '../lib'; import type { StoredNextProtocolUpgradeData } from '../lib';
import { import {
@ -70,7 +69,7 @@ export const ProtocolUpgradeInProgressNotification = () => {
if (!upgradeInProgress) return null; if (!upgradeInProgress) return null;
return ( return (
<NotificationBanner intent={Intent.Danger} className={SHORT}> <NotificationBanner intent={Intent.Danger}>
<div className="uppercase"> <div className="uppercase">
{t('The network is being upgraded to {{vegaReleaseTag}}', { {t('The network is being upgraded to {{vegaReleaseTag}}', {
vegaReleaseTag, vegaReleaseTag,

View File

@ -4,8 +4,6 @@ import { Intent } from '../../utils/intent';
import { Icon, VegaIcon, VegaIconNames } from '../icon'; import { Icon, VegaIcon, VegaIconNames } from '../icon';
import type { HTMLAttributes } from 'react'; import type { HTMLAttributes } from 'react';
export const SHORT = '!px-1 !py-1 min-h-fit';
interface NotificationBannerProps { interface NotificationBannerProps {
intent?: Intent; intent?: Intent;
children?: React.ReactNode; children?: React.ReactNode;
@ -23,7 +21,7 @@ export const NotificationBanner = ({
return ( return (
<div <div
className={classNames( className={classNames(
'flex items-center border-b px-2', 'flex items-center border-b pl-3 pr-2',
'text-xs leading-tight font-normal', 'text-xs leading-tight font-normal',
{ {
'bg-vega-light-100 dark:bg-vega-dark-100 ': intent === Intent.None, 'bg-vega-light-100 dark:bg-vega-dark-100 ': intent === Intent.None,

View File

@ -1,4 +1,4 @@
import { NotificationBanner, SHORT } from '../notification-banner'; import { NotificationBanner } from '../notification-banner';
import { Intent } from '../../utils/intent'; import { Intent } from '../../utils/intent';
import { TradingButton } from '../trading-button'; import { TradingButton } from '../trading-button';
import { useT } from '../../use-t'; import { useT } from '../../use-t';
@ -23,7 +23,7 @@ export const ViewingAsBanner = ({
}: ViewingAsBannerProps) => { }: ViewingAsBannerProps) => {
const t = useT(); const t = useT();
return ( return (
<NotificationBanner intent={Intent.None} className={SHORT}> <NotificationBanner>
<div className="flex items-baseline justify-between"> <div className="flex items-baseline justify-between">
<span data-testid="view-banner"> <span data-testid="view-banner">
{t('Viewing as Vega user: {{pubKey}}', { {t('Viewing as Vega user: {{pubKey}}', {