Skip to content

Commit

Permalink
Merge pull request #491 from ergolabs/dev
Browse files Browse the repository at this point in the history
Release 2.0.4
  • Loading branch information
yasha-black authored May 11, 2022
2 parents 1d015ee + 334229a commit bcecede
Show file tree
Hide file tree
Showing 5 changed files with 52 additions and 1 deletion.
2 changes: 2 additions & 0 deletions src/applicationConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ interface NetworkConfig {
}

interface ApplicationConfig {
readonly cardanoMaintenance: boolean;
readonly reCaptchaKey: string;
readonly networksSettings: Dictionary<NetworkConfig>;
readonly social: {
Expand All @@ -40,6 +41,7 @@ interface ApplicationConfig {
}

export const applicationConfig: ApplicationConfig = {
cardanoMaintenance: true,
reCaptchaKey: '6LeUJ8YfAAAAAMYIqGvtOmJGLeJtCSv6FBH_5sA3',
requestRetryCount: 3,
networksSettings: {
Expand Down
4 changes: 4 additions & 0 deletions src/components/Header/Header.less
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
justify-content: space-between;
transition: transform .3s;

&_maintenance {
top: 30px;
}

&__wrapper {
position: relative;
top: 0;
Expand Down
12 changes: 11 additions & 1 deletion src/components/Header/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@ import cn from 'classnames';
import React, { useEffect, useState } from 'react';
import { isBrowser } from 'react-device-detect';

import { applicationConfig } from '../../applicationConfig';
import { useObservable } from '../../common/hooks/useObservable';
import { useAssetsBalance } from '../../gateway/api/assetBalance';
import { useNetworkAsset } from '../../gateway/api/networkAsset';
import { selectedWalletState$ } from '../../gateway/api/wallets';
import { useSelectedNetwork } from '../../gateway/common/network';
import { settings$ } from '../../gateway/settings/settings';
import { WalletState } from '../../network/common/Wallet';
import { AppLogo } from '../common/AppLogo/AppLogo';
Expand All @@ -24,6 +26,7 @@ import { NetworkDropdown } from './NetworkDropdown/NetworkDropdown';
export const Header: React.FC = () => {
const [settings] = useObservable(settings$);
const [balance, isBalanceLoading] = useAssetsBalance();
const [selectedNetwork] = useSelectedNetwork();
const [networkAsset] = useNetworkAsset();
const [walletState] = useObservable(selectedWalletState$);
const [hidden, setHidden] = useState(false);
Expand All @@ -46,7 +49,14 @@ export const Header: React.FC = () => {
}, []);

return (
<header className={cn('header', { header_hidden: hidden })}>
<header
className={cn('header', {
header_hidden: hidden,
header_maintenance:
applicationConfig.cardanoMaintenance &&
selectedNetwork.name === 'cardano',
})}
>
<div className="header__wrapper">
<div className="header__left">
<AppLogo isNoWording />
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import { Trans } from '@lingui/macro';
import React, { FC } from 'react';
import styled from 'styled-components';

import { applicationConfig } from '../../../../applicationConfig';
import { Flex } from '../../../../ergodex-cdk';
import { IsCardano } from '../../../IsCardano/IsCardano';

export interface CardanoMaintenanceProps {
readonly className?: string;
}

const _CardanoMaintenance: FC<CardanoMaintenanceProps> = ({ className }) => (
<IsCardano>
{applicationConfig.cardanoMaintenance && (
<Flex className={className} align="center" justify="center">
<Trans>
Cardano testnet is under maintenance. Some operations may not work as
expected. We are working on it.
</Trans>
</Flex>
)}
</IsCardano>
);

export const CardanoMaintenance = styled(_CardanoMaintenance)`
height: 30px;
background: #177ddc;
color: #dbdbdb;
font-weight: 400;
font-size: 14px;
line-height: 22px;
`;
2 changes: 2 additions & 0 deletions src/components/common/Layout/Layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { Header } from '../../Header/Header';
import { NetworkHeight } from '../../NetworkHeight/NetworkHeight';
import { SocialLinks } from '../../SocialLinks/SocialLinks';
import { KyaModal } from '../KyaModal/KyaModal';
import { CardanoMaintenance } from './CardanoMaintenance/CardanoMaintenance';

interface Props {
children: React.ReactChild | React.ReactChild[];
Expand All @@ -33,6 +34,7 @@ const Layout = ({ children }: Props): JSX.Element => {
return (
<div className="layout">
<div className="glow" />
<CardanoMaintenance />
<Header />
<main>{children}</main>
<footer>
Expand Down

0 comments on commit bcecede

Please sign in to comment.