Skip to content

Commit

Permalink
Revert "chore: tweak send page styling (#25982)"
Browse files Browse the repository at this point in the history
This reverts commit ef38d62.
  • Loading branch information
danjm committed Jul 24, 2024
1 parent be1c107 commit ffa1b86
Show file tree
Hide file tree
Showing 19 changed files with 60 additions and 26 deletions.
3 changes: 3 additions & 0 deletions app/_locales/de/messages.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions app/_locales/el/messages.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions app/_locales/en/messages.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions app/_locales/es/messages.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions app/_locales/fr/messages.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions app/_locales/hi/messages.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions app/_locales/id/messages.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions app/_locales/ja/messages.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions app/_locales/ko/messages.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions app/_locales/pt/messages.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions app/_locales/ru/messages.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions app/_locales/tl/messages.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions app/_locales/tr/messages.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions app/_locales/vi/messages.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions app/_locales/zh_CN/messages.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -273,14 +273,8 @@ export function AssetPickerModal({
]);

const Search = useCallback(
({
isNFTSearch = false,
props,
}: {
isNFTSearch?: boolean;
props?: React.ComponentProps<typeof Box>;
}) => (
<Box padding={4} {...props}>
({ isNFTSearch = false }: { isNFTSearch?: boolean }) => (
<Box padding={1} paddingLeft={4} paddingRight={4}>
<TextFieldSearch
borderRadius={BorderRadius.LG}
placeholder={t(isNFTSearch ? 'searchNfts' : 'searchTokens')}
Expand All @@ -301,6 +295,7 @@ export function AssetPickerModal({
}}
endAccessory={null}
size={TextFieldSearchSize.Lg}
marginBottom={1}
/>
</Box>
),
Expand All @@ -316,7 +311,7 @@ export function AssetPickerModal({
>
<ModalOverlay />
<ModalContent modalDialogProps={{ padding: 0 }}>
<ModalHeader paddingBottom={2} onClose={onClose}>
<ModalHeader onClose={onClose}>
<Text variant={TextVariant.headingSm} textAlign={TextAlign.Center}>
{t(isDest ? 'sendSelectReceiveAsset' : 'sendSelectSendAsset')}
</Text>
Expand All @@ -327,7 +322,7 @@ export function AssetPickerModal({
gap={1}
alignItems={AlignItems.center}
marginInline="auto"
marginBottom={3}
marginBottom={4}
>
<AvatarToken
borderRadius={BorderRadius.full}
Expand All @@ -342,7 +337,7 @@ export function AssetPickerModal({
<Box className="modal-tab__wrapper">
{isDest ? (
<>
<Search props={{ paddingTop: 1 }} />
<Search />
<AssetList
handleAssetChange={handleAssetChange}
asset={asset}
Expand All @@ -357,6 +352,8 @@ export function AssetPickerModal({
tabsClassName="modal-tab__tabs"
>
{
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
<Tab
activeClassName="modal-tab__tab--active"
className="modal-tab__tab"
Expand All @@ -374,6 +371,8 @@ export function AssetPickerModal({
}

{
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
<Tab
activeClassName="modal-tab__tab--active"
className="modal-tab__tab"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,13 @@ interface HeaderProps extends StyleUtilityProps {
* Additional CSS class provided to the footer
*/
className?: string;
/**
* Additional props to pass to the text
*/
textProps?: React.ComponentProps<typeof Text>;
}

export const Header = ({
children,
endAccessory = null,
startAccessory = null,
className = '',
textProps,
...props
}: HeaderProps) => {
return (
Expand All @@ -61,7 +56,6 @@ export const Header = ({
paddingInlineStart={8}
paddingInlineEnd={8}
ellipsis
{...textProps}
>
{children}
</Text>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ exports[`SendPage render and initialization should render correctly even when a
<div
class="mm-box"
>
<h4
class="mm-box mm-text mm-text--heading-sm mm-text--ellipsis mm-text--text-align-center mm-box--padding-inline-start-8 mm-box--padding-inline-end-8 mm-box--display-block mm-box--color-text-default"
<p
class="mm-box mm-text mm-text--body-md-bold mm-text--ellipsis mm-text--text-align-center mm-box--padding-inline-start-8 mm-box--padding-inline-end-8 mm-box--display-block mm-box--color-text-default"
>
Send
</h4>
Send a token
</p>
</div>
</div>
<div
Expand Down
6 changes: 1 addition & 5 deletions ui/components/multichain/pages/send/send.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ import { AssetPickerAmount } from '../..';
import useUpdateSwapsState from '../../../../pages/swaps/hooks/useUpdateSwapsState';
import { getIsDraftSwapAndSend } from '../../../../ducks/send/helpers';
import { smartTransactionsListSelector } from '../../../../selectors';
import { TextVariant } from '../../../../helpers/constants/design-system';
import {
SendPageAccountPicker,
SendPageRecipientContent,
Expand Down Expand Up @@ -302,9 +301,6 @@ export const SendPage = () => {
return (
<Page className="multichain-send-page">
<Header
textProps={{
variant: TextVariant.headingSm,
}}
startAccessory={
<ButtonIcon
size={ButtonIconSize.Sm}
Expand All @@ -314,7 +310,7 @@ export const SendPage = () => {
/>
}
>
{t('send')}
{t('sendAToken')}
</Header>
<Content>
<SendPageAccountPicker />
Expand Down

0 comments on commit ffa1b86

Please sign in to comment.