diff --git a/packages/suite/src/components/suite/FormattedDateWithBullet.tsx b/packages/suite/src/components/suite/FormattedDateWithBullet.tsx index aee1eeefdcf..5e60e967aad 100644 --- a/packages/suite/src/components/suite/FormattedDateWithBullet.tsx +++ b/packages/suite/src/components/suite/FormattedDateWithBullet.tsx @@ -5,13 +5,10 @@ import { FormattedDate, FormattedDateProps } from './FormattedDate'; const Bullet = styled.span` margin-left: 0.5ch; margin-right: 0.5ch; - color: ${({ theme }) => theme.legacy.TYPE_LIGHT_GREY}; `; const HourWrapper = styled.div<{ $timeLightColor?: boolean }>` display: inline-flex; - color: ${({ theme, $timeLightColor }) => - $timeLightColor ? theme.legacy.TYPE_LIGHT_GREY : 'inherit'}; `; const Timestamp = styled.span` diff --git a/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewSummary.tsx b/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewSummary.tsx index a33e50089f6..42a5838164a 100644 --- a/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewSummary.tsx +++ b/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewSummary.tsx @@ -293,7 +293,7 @@ export const TransactionReviewSummary = ({ {!!tx.feeLimit && network.networkType !== 'solana' && ( - + @@ -304,7 +304,7 @@ export const TransactionReviewSummary = ({ )} - + diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/BasicTxDetails.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/BasicTxDetails.tsx index 54c4c1bf034..c3a677eab46 100644 --- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/BasicTxDetails.tsx +++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/BasicTxDetails.tsx @@ -26,7 +26,7 @@ const Wrapper = styled.div<{ $elevation: Elevation }>` const Confirmations = styled.div` display: flex; - color: ${({ theme }) => theme.textSubdued}; + color: ${({ theme }) => theme.textDefault}; ${typography.hint} `; @@ -82,12 +82,6 @@ const Value = styled.div` text-overflow: ellipsis; font-variant-numeric: tabular-nums; `; - -const TxidValue = styled.div` - color: ${({ theme }) => theme.textDefault}; - ${typography.label} -`; - const IconWrapper = styled.div<{ $elevation: Elevation }>` background-color: ${mapElevationToBorder}; border-radius: ${borders.radii.full}; @@ -145,18 +139,13 @@ const ConfirmationStatus = styled.div<{ $confirmed: boolean; $tiny?: boolean }>` const Circle = styled.div` margin-left: ${spacingsPx.xxs}; margin-right: ${spacingsPx.xxs}; - color: ${({ theme }) => theme.textSubdued}; + color: ${({ theme }) => theme.textDefault}; `; const Timestamp = styled.span` white-space: nowrap; `; -const IconPlaceholder = styled.span` - min-width: 10px; - margin-right: ${spacingsPx.xs}; -`; - interface BasicTxDetailsProps { tx: WalletAccountTransaction; network: Network; @@ -229,7 +218,12 @@ export const BasicTxDetails = ({ {/* MINED TIME */} - <Icon name="calendar" size={10} margin={{ right: spacings.xs }} /> + <Icon + name="calendar" + size={15} + margin={{ right: spacings.xs }} + variant="tertiary" + /> {isConfirmed ? ( <Translation id="TR_MINED_TIME" /> ) : ( @@ -252,23 +246,31 @@ export const BasicTxDetails = ({ {/* TX ID */} <Title> - <Icon name="biometric" size={10} margin={{ right: spacings.xs }} /> + <Icon + name="biometric" + size={15} + margin={{ right: spacings.xs }} + variant="tertiary" + /> <Translation id="TR_TXID" /> - - - + {network.networkType === 'bitcoin' && ( <> {/* Fee level */} - <Icon margin={{ right: spacings.xs }} name="gas" size={10} /> + <Icon + margin={{ right: spacings.xs }} + name="gas" + size={15} + variant="tertiary" + /> <Translation id="TR_FEE_RATE" /> @@ -287,13 +289,23 @@ export const BasicTxDetails = ({ {tx.ethereumSpecific && ( <> - <Icon name="gas" size={10} margin={{ right: spacings.xs }} /> + <Icon + name="gasPump" + size={15} + margin={{ right: spacings.xs }} + variant="tertiary" + /> <Translation id="TR_GAS_LIMIT" /> {tx.ethereumSpecific.gasLimit} - <Icon name="gas" size={10} margin={{ right: spacings.xs }} /> + <Icon + name="gasPump" + size={15} + margin={{ right: spacings.xs }} + variant="tertiary" + /> <Translation id="TR_GAS_USED" /> @@ -305,7 +317,12 @@ export const BasicTxDetails = ({ - <Icon name="gas" size={10} margin={{ right: spacings.xs }} /> + <Icon + name="gasPump" + size={15} + margin={{ right: spacings.xs }} + variant="tertiary" + /> <Translation id="TR_GAS_PRICE" /> {`${fromWei(tx.ethereumSpecific?.gasPrice ?? '0', 'gwei')} ${getFeeUnits( @@ -313,7 +330,12 @@ export const BasicTxDetails = ({ )}`} - <IconPlaceholder>#</IconPlaceholder> + <Icon + name="hash" + size={15} + margin={{ right: spacings.xs }} + variant="tertiary" + /> <Translation id="TR_NONCE" /> {tx.ethereumSpecific?.nonce} diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/IOAddress.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/IOAddress.tsx index 12551fbcad5..b47b2b51bea 100644 --- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/IOAddress.tsx +++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/IOAddress.tsx @@ -1,5 +1,5 @@ import { HiddenPlaceholder } from 'src/components/suite/HiddenPlaceholder'; -import { Icon, Link } from '@trezor/components'; +import { Icon, Link, Paragraph } from '@trezor/components'; import { useState } from 'react'; import { copyToClipboard } from '@trezor/dom-utils'; import styled, { css, useTheme } from 'styled-components'; @@ -34,7 +34,6 @@ const TextOverflowContainer = styled.div<{ $shouldAllowCopy?: boolean }>` align-items: center; max-width: 100%; overflow: hidden; - color: ${({ theme }) => theme.textSubdued}; cursor: ${({ $shouldAllowCopy }) => ($shouldAllowCopy ? 'pointer' : 'cursor')}; user-select: none; @@ -95,42 +94,44 @@ export const IOAddress = ({ // HiddenPlaceholder disableKeepingWidth: it isn't needed (no numbers to redact), but inline-block disrupts overflow behavior return ( - - setIsClicked(false)} - data-testid="@tx-detail/txid-value" - id={txAddress} - $shouldAllowCopy={shouldAllowCopy} - > - {txAddress.length <= 5 ? ( - {txAddress} - ) : ( - <> - {txAddress.slice(0, -4)} - {txAddress.slice(-4)} - - )} - {shouldAllowCopy ? ( - - - - ) : null} - {explorerUrl ? ( - - - - - - ) : null} - - + + + setIsClicked(false)} + data-testid="@tx-detail/txid-value" + id={txAddress} + $shouldAllowCopy={shouldAllowCopy} + > + {txAddress.length <= 5 ? ( + {txAddress} + ) : ( + <> + {txAddress.slice(0, -4)} + {txAddress.slice(-4)} + + )} + {shouldAllowCopy ? ( + + + + ) : null} + {explorerUrl ? ( + + + + + + ) : null} + + + ); };