diff --git a/src/App.tsx b/src/App.tsx index 3095ba2b..2fe038be 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -23,6 +23,7 @@ import { } from '@mui/material'; import { useEffect, useMemo, useRef, useState } from 'react'; import ReconnectingWebSocket from 'reconnecting-websocket'; +import { NAV_BASENAME } from './components/Navigation/Navigation'; import { Router } from './components/Router'; import { MessageSnackbar, @@ -101,7 +102,7 @@ const App: React.FC = () => { } else { setSelectedNamespace(status.defaults.namespace); window.location.replace( - `/${NAMESPACES_PATH}/${status.defaults.namespace}/home` + `${NAV_BASENAME}/${NAMESPACES_PATH}/${status.defaults.namespace}/home` ); } } else { diff --git a/src/components/Header.tsx b/src/components/Header.tsx index da3442d4..6c5509ef 100644 --- a/src/components/Header.tsx +++ b/src/components/Header.tsx @@ -44,7 +44,7 @@ export const Header: React.FC = ({ subtitle, onRefresh, numNewEvents = 0, - showNumNewEvents = true, + showNumNewEvents = false, noDateFilter = false, noNsFilter = false, }) => { diff --git a/src/components/Navigation/Navigation.tsx b/src/components/Navigation/Navigation.tsx index e6e777b6..b0293ce0 100644 --- a/src/components/Navigation/Navigation.tsx +++ b/src/components/Navigation/Navigation.tsx @@ -22,6 +22,7 @@ import { NetworkNav } from './NetworkNav'; import { OffChainNav } from './OffChainNav'; import { TokensNav } from './TokensNav'; +export const NAV_BASENAME = '/ui'; export const NAV_WIDTH = 225; export const Navigation: React.FC = () => { diff --git a/src/components/Router.tsx b/src/components/Router.tsx index 091daaa1..ebf207b2 100644 --- a/src/components/Router.tsx +++ b/src/components/Router.tsx @@ -26,6 +26,7 @@ import { NetworkRoutes } from '../pages/Network/Routes'; import { OffChainRoutes } from '../pages/Off-Chain/Routes'; import { TokensRoutes } from '../pages/Tokens/Routes'; import { AppWrapper } from './AppWrapper'; +import { NAV_BASENAME } from './Navigation/Navigation'; const queryClient = new QueryClient({ defaultOptions: { @@ -39,7 +40,7 @@ export const Router: () => JSX.Element = () => { return ( - + diff --git a/src/components/Timeline/FFTimeline.tsx b/src/components/Timeline/FFTimeline.tsx index 876274df..46821ff4 100644 --- a/src/components/Timeline/FFTimeline.tsx +++ b/src/components/Timeline/FFTimeline.tsx @@ -88,7 +88,7 @@ export const FFTimeline: React.FC = ({ onClick={fetchNewData} > - {`${t('see')} ${numNewEvents} ${t('newEvents')}`} + {`${t('seeNewEvents')}`} )} diff --git a/src/pages/Activity/views/Operations.tsx b/src/pages/Activity/views/Operations.tsx index d419fc62..880fe43e 100644 --- a/src/pages/Activity/views/Operations.tsx +++ b/src/pages/Activity/views/Operations.tsx @@ -240,7 +240,6 @@ export const ActivityOperations: () => JSX.Element = () => { subtitle={t('activity')} onRefresh={refreshData} numNewEvents={numNewEvents} - showNumNewEvents={false} > diff --git a/src/translations/en.json b/src/translations/en.json index ecab4822..74f78b04 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -232,6 +232,7 @@ "save": "Save", "schema": "Schema", "see": "See", + "seeNewEvents": "See New Events", "selectedFilters": "Selected Filters", "sequence": "Sequence", "sharedStorageBatchBroadcast": "Shared Storage Batch Broadcast",