diff --git a/packages/apps/src/Content/index.tsx b/packages/apps/src/Content/index.tsx index 4804e2910e..920b56f7fe 100644 --- a/packages/apps/src/Content/index.tsx +++ b/packages/apps/src/Content/index.tsx @@ -48,7 +48,7 @@ function Content ({ className }: Props): React.ReactElement { return (
- {needsApi && (!isApiReady || !isApiConnected) + {(!isApiReady || !isApiConnected) ? (
('Initializing connection')} /> diff --git a/packages/apps/src/Menu/Grouping.tsx b/packages/apps/src/Menu/Grouping.tsx index d997c6358d..9ee194d597 100644 --- a/packages/apps/src/Menu/Grouping.tsx +++ b/packages/apps/src/Menu/Grouping.tsx @@ -80,7 +80,7 @@ export default React.memo(styled(Grouping)` &:hover { .groupHdr, .groupMenu li { - background: rgba(254, 252, 250, 0.925); + background: rgba(254, 252, 250, 0.95); } .groupHdr { diff --git a/packages/apps/src/Menu/NodeInfo.tsx b/packages/apps/src/Menu/NodeInfo.tsx index eb05d0d80c..6c686732d2 100644 --- a/packages/apps/src/Menu/NodeInfo.tsx +++ b/packages/apps/src/Menu/NodeInfo.tsx @@ -35,7 +35,7 @@ export default React.memo(styled(NodeInfo)` background: transparent; font-size: 0.9rem; line-height: 1.2; - padding: 0 1.5rem; + padding: 0 1.5rem 0 1rem; text-align: right; > div { diff --git a/packages/apps/src/Menu/index.tsx b/packages/apps/src/Menu/index.tsx index e000603ed1..5b82da7fa8 100644 --- a/packages/apps/src/Menu/index.tsx +++ b/packages/apps/src/Menu/index.tsx @@ -48,8 +48,6 @@ function checkVisible (name: string, { api, isApiConnected, isApiReady }: ApiPro return false; } else if (needsAccounts && !hasAccounts) { return false; - } else if (!needsApi) { - return true; } else if (!isApiReady || !isApiConnected) { return false; } else if (needsSudo && !hasSudo) { @@ -124,11 +122,11 @@ function Menu ({ className = '' }: Props): React.ReactElement { const isLoading = !apiProps.isApiReady || !apiProps.isApiConnected; return ( -
+
{activeRoute && ( -
+
{activeRoute.text}
@@ -168,6 +166,14 @@ export default React.memo(styled(Menu)` position: relative; z-index: 220; + &.isLoading { + filter: grayscale(1); + + .menuActive { + opacity: 0.66; + } + } + &.menuBg, .menuBg { &:after { @@ -217,10 +223,6 @@ export default React.memo(styled(Menu)` padding: 1rem 1.5rem; margin: 0 1rem; - &.isLoading { - background: #f5f3f1; - } - .ui--Icon { margin-right: 0.5rem; } diff --git a/packages/react-query/src/Chain.tsx b/packages/react-query/src/Chain.tsx index 7d2bf74946..019cd4814d 100644 --- a/packages/react-query/src/Chain.tsx +++ b/packages/react-query/src/Chain.tsx @@ -5,6 +5,8 @@ import React from 'react'; import { useApi } from '@polkadot/react-hooks'; +import { useTranslation } from './translate'; + interface Props { children?: React.ReactNode; className?: string; @@ -12,11 +14,12 @@ interface Props { } function Chain ({ children, className = '', label }: Props): React.ReactElement { + const { t } = useTranslation(); const { systemChain } = useApi(); return (
- {label || ''}{systemChain}{children} + {label || ''}{systemChain || t('Unknown')}{children}
); }