diff --git a/src/app/components/address-displayer/form-address-displayer.tsx b/src/app/components/address-displayer/form-address-displayer.tsx index b6bf6370adb..71fba94b964 100644 --- a/src/app/components/address-displayer/form-address-displayer.tsx +++ b/src/app/components/address-displayer/form-address-displayer.tsx @@ -9,12 +9,12 @@ interface FormAddressDisplayerProps extends BoxProps { export function FormAddressDisplayer({ address, ...rest }: FormAddressDisplayerProps) { return ( diff --git a/src/app/components/info-card/info-card.tsx b/src/app/components/info-card/info-card.tsx index d057f3ad001..aefa2d30f86 100644 --- a/src/app/components/info-card/info-card.tsx +++ b/src/app/components/info-card/info-card.tsx @@ -126,7 +126,7 @@ export function InfoCardFooter({ children }: InfoCardFooterProps) { alignItems="center" bg={whenPageMode({ full: '', - popup: '#fff', + popup: 'accent.background-primary', })} bottom="0" justifyContent="center" diff --git a/src/app/components/transaction/pending-label.tsx b/src/app/components/transaction/pending-label.tsx index ca07d3dfbaf..43c97e81f00 100644 --- a/src/app/components/transaction/pending-label.tsx +++ b/src/app/components/transaction/pending-label.tsx @@ -1,4 +1,4 @@ -import { Box, Flex, Stack, styled } from 'leather-styles/jsx'; +import { Box, Flex, styled } from 'leather-styles/jsx'; import { Tooltip } from '@app/components/tooltip'; import { InfoIcon } from '@app/ui/components/icons/info-icon'; @@ -18,13 +18,10 @@ export function PendingLabel({ Pending - - - - - - + + + ); diff --git a/src/app/features/increase-fee-drawer/components/fee-multiplier-button.tsx b/src/app/features/increase-fee-drawer/components/fee-multiplier-button.tsx index fbb72d043ae..30fdf431f79 100644 --- a/src/app/features/increase-fee-drawer/components/fee-multiplier-button.tsx +++ b/src/app/features/increase-fee-drawer/components/fee-multiplier-button.tsx @@ -1,14 +1,24 @@ -import { ButtonProps, LeatherButton } from '@app/ui/components/button'; +import { HTMLStyledProps, styled } from 'leather-styles/jsx'; -interface FeeMultiplierButtonProps extends ButtonProps { +interface FeeMultiplierButtonProps extends HTMLStyledProps<'button'> { multiplier: number; } export function FeeMultiplierButton(props: FeeMultiplierButtonProps) { const { multiplier, ...rest } = props; return ( - + {multiplier}x - + ); } diff --git a/src/app/features/increase-fee-drawer/components/fee-multiplier.tsx b/src/app/features/increase-fee-drawer/components/fee-multiplier.tsx index 00819f86f00..26511870f62 100644 --- a/src/app/features/increase-fee-drawer/components/fee-multiplier.tsx +++ b/src/app/features/increase-fee-drawer/components/fee-multiplier.tsx @@ -9,7 +9,7 @@ interface FeeMultiplierProps extends HstackProps { showReset?: boolean; } -export function FeeMultiplier(props: FeeMultiplierProps): React.JSX.Element { +export function FeeMultiplier(props: FeeMultiplierProps) { const { onSelectMultiplier, showReset, ...rest } = props; return ( diff --git a/src/app/features/increase-fee-drawer/components/increase-fee-field.tsx b/src/app/features/increase-fee-drawer/components/increase-fee-field.tsx index 4f6264cd187..cca9531c0f9 100644 --- a/src/app/features/increase-fee-drawer/components/increase-fee-field.tsx +++ b/src/app/features/increase-fee-drawer/components/increase-fee-field.tsx @@ -23,10 +23,10 @@ export function IncreaseFeeField(props: IncreaseFeeFieldProps): React.JSX.Elemen }, [currentFee, modified, field.value]); const onSelectMultiplier = useCallback( - (multiplier: number) => { + async (multiplier: number) => { if (!currentFee) return; setModified(multiplier !== 1); - helpers.setValue(microStxToStx(currentFee * multiplier)); + await helpers.setValue(microStxToStx(currentFee * multiplier)); }, [currentFee, helpers] ); @@ -35,7 +35,6 @@ export function IncreaseFeeField(props: IncreaseFeeFieldProps): React.JSX.Elemen <> - Fee @@ -53,7 +51,6 @@ export function IncreaseFeeField(props: IncreaseFeeFieldProps): React.JSX.Elemen openInNewTab(`https://explorer.hiro.so/address/${address}?chain=${mode}`)} textStyle="label.03" - variant="link" + variant="text" wordBreak="break-all" > {address} diff --git a/src/app/pages/receive/components/receive-tokens.layout.tsx b/src/app/pages/receive/components/receive-tokens.layout.tsx index 29ac2031e71..54981fe688e 100644 --- a/src/app/pages/receive/components/receive-tokens.layout.tsx +++ b/src/app/pages/receive/components/receive-tokens.layout.tsx @@ -45,8 +45,7 @@ export function ReceiveTokensLayout(props: ReceiveTokensLayoutProps) { data-testid={SharedComponentsSelectors.AddressDisplayer} flexWrap="wrap" justifyContent="center" - lineHeight={1.8} - maxWidth="280px" + maxWidth="300px" mt="space.04" > diff --git a/src/app/pages/rpc-send-transfer/components/send-transfer-footer.tsx b/src/app/pages/rpc-send-transfer/components/send-transfer-footer.tsx index 97e0d9a15ac..edec1c9209d 100644 --- a/src/app/pages/rpc-send-transfer/components/send-transfer-footer.tsx +++ b/src/app/pages/rpc-send-transfer/components/send-transfer-footer.tsx @@ -11,10 +11,7 @@ export function SendTransferFooter({ children }: HasChildren) { full: 'unset', popup: 'accent.background-primary', })} - // TODO #4476 check this border colour it was EFEFF2 - // - can we pass it with shorthand? - borderTop="1px solid" - borderColor="border-default" + borderTop="default" bottom="0" justifyContent="center" position={whenPageMode({ diff --git a/src/app/pages/send/send-crypto-asset-form/components/form-footer.tsx b/src/app/pages/send/send-crypto-asset-form/components/form-footer.tsx index fa5258ae843..2993596e33b 100644 --- a/src/app/pages/send/send-crypto-asset-form/components/form-footer.tsx +++ b/src/app/pages/send/send-crypto-asset-form/components/form-footer.tsx @@ -1,6 +1,5 @@ import { Box } from 'leather-styles/jsx'; import { Flex } from 'leather-styles/jsx'; -import { token } from 'leather-styles/tokens'; import { Money } from '@shared/models/money.model'; @@ -13,6 +12,7 @@ export function FormFooter(props: { balance: Money; balanceTooltipLabel?: string return ( diff --git a/src/app/pages/send/send-crypto-asset-form/components/tx-done.tsx b/src/app/pages/send/send-crypto-asset-form/components/tx-done.tsx index c24c0149b37..4926d5099bd 100644 --- a/src/app/pages/send/send-crypto-asset-form/components/tx-done.tsx +++ b/src/app/pages/send/send-crypto-asset-form/components/tx-done.tsx @@ -4,7 +4,7 @@ import { Flex, styled } from 'leather-styles/jsx'; export function TxDone() { return ( - + All done diff --git a/src/app/pages/send/send-crypto-asset-form/form/send-form-confirmation.tsx b/src/app/pages/send/send-crypto-asset-form/form/send-form-confirmation.tsx index 542424cd781..e557804a6f9 100644 --- a/src/app/pages/send/send-crypto-asset-form/form/send-form-confirmation.tsx +++ b/src/app/pages/send/send-crypto-asset-form/form/send-form-confirmation.tsx @@ -51,14 +51,15 @@ export function SendFormConfirmation({ data-testid={SendCryptoAssetSelectors.ConfirmationDetails} pb={whenPageMode({ full: '0px', - popup: '80px', + popup: '120px', })} > ); return ( - +