Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix the issue with the deploy status error message #1063

Merged
merged 2 commits into from
Sep 17, 2024
Merged

fix the issue with the deploy status error message #1063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce34f4e
fix the issue with the deploy status error message
ost-ptk Sep 16, 2024
89a838b
Merge branch 'develop' into WALLET-422-cw-extension-name-of-the-error…
Comp0te Sep 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion src/apps/popup/pages/deploy-details/content.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { DeployDetailsResult } from '@popup/pages/deploy-details/components/depl
import { getEntryPointName } from '@popup/pages/deploy-details/utils';

import {
AlignedFlexRow,
AlignedSpaceBetweenFlexRow,
BorderBottomPseudoElementProps,
ContentContainer,
Expand All @@ -24,6 +25,8 @@ import {
DeployStatus,
Hash,
HashVariant,
Status,
SvgIcon,
Tile,
Typography
} from '@libs/ui/components';
Expand Down Expand Up @@ -97,14 +100,31 @@ export const DeployDetailsPageContent = ({
status: singleDeploy.status,
errorMessage: singleDeploy.errorMessage
}}
placement="bottomLeft"
/>
</TitleContainer>
</ParagraphContainer>
<DeployDetailsAction deploy={singleDeploy} />
<DeployDetailsResult deploy={singleDeploy} />
<Tile style={{ marginTop: '16px' }}>
<RowsContainer marginLeftForSeparatorLine={16}>
{singleDeploy.errorMessage &&
singleDeploy.status === Status.Error && (
<RowContainer gap={SpacingSize.Medium}>
<Typography type="captionRegular" color="contentSecondary">
<Trans t={t}>Status</Trans>
</Typography>
<AlignedFlexRow gap={SpacingSize.Small}>
<SvgIcon
src="assets/icons/error.svg"
color="contentActionCritical"
size={20}
/>
<Typography type="captionRegular" wordBreak>
{singleDeploy.errorMessage}
</Typography>
</AlignedFlexRow>
</RowContainer>
)}
<RowContainer>
<Typography type="captionRegular" color="contentSecondary">
<Trans t={t}>Deploy hash</Trans>
Expand Down
53 changes: 21 additions & 32 deletions src/libs/ui/components/deploy-status/deploy-status.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { useTranslation } from 'react-i18next';
import styled from 'styled-components';

import { AlignedFlexRow, SpacingSize } from '@libs/layout';
import { Placement, SvgIcon, Tooltip, Typography } from '@libs/ui/components';
import { SvgIcon, Typography } from '@libs/ui/components';
import { ContentColor } from '@libs/ui/utils';

export enum Status {
Expand Down Expand Up @@ -69,7 +69,6 @@ export interface DeployStatusProps {
| null
| undefined;
textWithIcon?: boolean;
placement?: Placement;
}

const StatusContainer = styled(AlignedFlexRow)<{ status: Status }>(
Expand All @@ -83,8 +82,7 @@ const StatusContainer = styled(AlignedFlexRow)<{ status: Status }>(

export const DeployStatus = ({
deployResult,
textWithIcon,
placement = 'topRight'
textWithIcon
}: DeployStatusProps) => {
const { t } = useTranslation();

Expand All @@ -98,42 +96,33 @@ export const DeployStatus = ({
};

const status = getDeployStatus(deployResult);
const message = deployResult?.errorMessage;

if (textWithIcon) {
return (
<Tooltip
title={message}
placement={placement}
noWrap={!(message?.length! >= 29)}
>
<StatusContainer status={status} gap={SpacingSize.Small}>
<SvgIcon
src={StatusIcons[status]}
color={StatusColors[status] as ContentColor}
size={16}
/>
<Typography
type="captionMedium"
color={StatusColors[status] as ContentColor}
capitalize
>
{StatusLabel[status]}
</Typography>
</StatusContainer>
</Tooltip>
);
}

if (status === Status.Error || status === Status.Pending) {
return (
<Tooltip title={message} placement="bottomCenter">
<StatusContainer status={status} gap={SpacingSize.Small}>
<SvgIcon
src={StatusIcons[status]}
color={StatusColors[status] as ContentColor}
size={16}
/>
</Tooltip>
<Typography
type="captionMedium"
color={StatusColors[status] as ContentColor}
capitalize
>
{StatusLabel[status]}
</Typography>
</StatusContainer>
);
}

if (status === Status.Error || status === Status.Pending) {
return (
<SvgIcon
src={StatusIcons[status]}
color={StatusColors[status] as ContentColor}
size={16}
/>
);
}

Expand Down
Loading