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.

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(trade): last transactions design #15502

Merged
merged 1 commit into from
Dec 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import styled from 'styled-components';

import { Box, iconSizes, Image } from '@trezor/components';
import { borders, spacings } from '@trezor/theme';

import { useSelector } from 'src/hooks/suite';

const CoinmarketIconWrapper = styled.div<{ $isDark: boolean }>`
${({ $isDark }) => $isDark && `background-color: #fff;`}
jvaclavik marked this conversation as resolved.
Show resolved Hide resolved
border-radius: ${borders.radii.xxs};
`;

interface CoinmarketIconProps {
iconUrl: string;
}

export const CoinmarketIcon = ({ iconUrl }: CoinmarketIconProps) => {
const currentTheme = useSelector(state => state.suite.settings.theme.variant);

return (
<CoinmarketIconWrapper $isDark={currentTheme === 'dark'}>
<Box margin={spacings.xxxs} height={iconSizes.mediumLarge}>
<Image imageSrc={iconUrl} width={iconSizes.mediumLarge} alt="" />
</Box>
</CoinmarketIconWrapper>
);
};
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { spacings } from '@trezor/theme';
import invityAPI from 'src/services/suite/invityAPI';
import { CoinmarketPaymentPlainType } from 'src/views/wallet/coinmarket/common/CoinmarketPaymentPlainType';
import { CoinmarketPaymentMethodType } from 'src/types/coinmarket/coinmarket';
import { CoinmarketIcon } from 'src/views/wallet/coinmarket/common/CoinmarketIcon';

interface CoinmarketPaymentTypeProps {
method?: CoinmarketPaymentMethodType;
Expand All @@ -12,7 +13,7 @@ interface CoinmarketPaymentTypeProps {

export const CoinmarketPaymentType = ({ method, methodName }: CoinmarketPaymentTypeProps) => (
<Row gap={spacings.xs}>
{method && <img width="24px" src={invityAPI.getPaymentMethodUrl(method)} alt="" />}
{method && <CoinmarketIcon iconUrl={invityAPI.getPaymentMethodUrl(method)} />}
<CoinmarketPaymentPlainType method={method} methodName={methodName} />
</Row>
);
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import { Row } from '@trezor/components';
import { Row, Text } from '@trezor/components';
import { spacings } from '@trezor/theme';

import { Translation } from 'src/components/suite';
import invityAPI from 'src/services/suite/invityAPI';
import { CoinmarketIcon } from 'src/views/wallet/coinmarket/common/CoinmarketIcon';

export interface CoinmarketProviderInfoProps {
exchange?: string;
Expand All @@ -19,19 +21,16 @@ export const CoinmarketProviderInfo = ({ exchange, providers }: CoinmarketProvid

return (
<Row data-testid="@coinmarket/form/info/provider" gap={spacings.xs}>
{!exchange && 'Unknown provider'}
{!provider && exchange}
{provider && (
{!exchange && <Translation id="TR_COINMARKET_UNKNOWN_PROVIDER" />}
{provider ? (
<>
{provider.logo && (
<img
width="16px"
src={invityAPI.getProviderLogoUrl(provider.logo)}
alt=""
/>
<CoinmarketIcon iconUrl={invityAPI.getProviderLogoUrl(provider.logo)} />
)}
{provider.brandName || provider.companyName}
{provider.brandName ?? provider.companyName}
</>
) : (
<Text margin={{ left: spacings.xxl }}>{exchange}</Text>
)}
</Row>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,9 @@ export const CoinmarketTransactionContainer = ({
const isMobile = useMediaQuery(`(max-width: ${variables.SCREEN_SIZE.SM})`);

return (
<Card fillType="none">
<Card fillType="none" margin={{ bottom: spacings.lg }}>
<Row flexWrap={isBelowDesktop ? 'wrap' : undefined}>
<Column
alignItems="flex-start"
flex="auto"
width={isBelowDesktop ? 'calc(100% - 180px)' : '100%'}
>
<Column flex="auto" width={isBelowDesktop ? 'calc(100% - 180px)' : '100%'}>
{TradeDetail}
</Column>
<Column
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Text } from '@trezor/components';
import { InfoSegments } from '@trezor/components';
import { spacings } from '@trezor/theme';

import { FormattedDate } from 'src/components/suite';
Expand Down Expand Up @@ -26,9 +26,10 @@ export const CoinmarketTransactionInfo = ({ trade }: CoinmarketTransactionInfoPr
const tradeType = translationString(translationKeys[trade.tradeType]).toUpperCase();

return (
<Text margin={{ top: spacings.xs }} variant="tertiary" typographyStyle="label" as="div">
{tradeType} • <FormattedDate value={date} date time /> •{' '}
<InfoSegments variant="tertiary" typographyStyle="label" margin={{ top: spacings.xs }}>
{tradeType}
<FormattedDate value={date} date time />
<CoinmarketTransactionStatus trade={trade} />
</Text>
</InfoSegments>
);
};
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { DefaultTheme, useTheme } from 'styled-components';
import { BuyTradeStatus, ExchangeTradeStatus, SellTradeStatus } from 'invity-api';

import { Icon, Row, Text } from '@trezor/components';
import { spacings } from '@trezor/theme';

import { Translation } from 'src/components/suite';
import { getStatusMessage as getBuyStatusMessage } from 'src/utils/wallet/coinmarket/buyUtils';
Expand Down Expand Up @@ -131,7 +130,7 @@ export const CoinmarketTransactionStatus = ({ trade }: CoinmarketTransactionStat
if (!data) return null;

return (
<Row margin={{ left: spacings.xxs }}>
<Row>
<Icon color={data.color} size={10} name={data.icon} margin={{ right: 4 }} />
<Text color={data.color} data-testid="@coinmarket/transaction/status">
<Translation id={data.statusMessageId} />
Expand Down
Loading