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: design related fixes in confirmation pages #29137

Merged
merged 1 commit into from
Dec 12, 2024
+176 −176
Merged

fix: design related fixes in confirmation pages #29137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 13 additions & 13 deletions ui/components/app/confirm/info/row/text.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,18 +53,6 @@ export const ConfirmInfoRowText: React.FC<ConfirmInfoRowTextProps> = ({
gap={2}
minWidth={BlockSize.Zero}
>
{tooltip ? (
<Tooltip
position="bottom"
title={tooltip}
wrapperStyle={{ minWidth: 0 }}
interactive
>
<InfoText text={text} />
</Tooltip>
) : (
<InfoText text={text} />
)}
{isEditable ? (
<ButtonIcon
className={editIconClassName || undefined}
Expand All @@ -74,10 +62,22 @@ export const ConfirmInfoRowText: React.FC<ConfirmInfoRowTextProps> = ({
onClick={onEditClick}
size={ButtonIconSize.Sm}
// to reset the button padding
style={{ marginLeft: '-4px' }}
style={{ marginRight: '-4px' }}
data-testid={editIconDataTestId}
/>
) : null}
{tooltip ? (
<Tooltip
position="bottom"
title={tooltip}
wrapperStyle={{ minWidth: 0 }}
interactive
>
<InfoText text={text} />
</Tooltip>
) : (
<InfoText text={text} />
)}
</Box>
);
};
72 changes: 36 additions & 36 deletions ui/pages/confirmations/components/confirm/info/__snapshots__/info.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,18 +92,6 @@ exports[`Info renders info section for approve request 1`] = `
<div
class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-space-between mm-box--align-items-center mm-box--text-align-center"
>
<p
class="mm-box mm-text mm-text--body-md mm-box--margin-right-1 mm-box--color-text-default"
data-testid="first-gas-field"
>
0.0001 ETH
</p>
<p
class="mm-box mm-text mm-text--body-md mm-box--margin-right-2 mm-box--color-text-alternative"
data-testid="native-currency"
>
$0.08
</p>
<button
class="mm-box mm-text mm-button-base mm-button-base--size-sm mm-button-link mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
data-testid="edit-gas-fee-icon"
Expand All @@ -117,6 +105,18 @@ exports[`Info renders info section for approve request 1`] = `
class="mm-box mm-text mm-text--inherit mm-box--color-primary-default"
/>
</button>
<p
class="mm-box mm-text mm-text--body-md mm-box--margin-right-1 mm-box--color-text-default"
data-testid="first-gas-field"
>
0.0001 ETH
</p>
<p
class="mm-box mm-text mm-text--body-md mm-box--margin-right-2 mm-box--color-text-alternative"
data-testid="native-currency"
>
$0.08
</p>
</div>
</div>
<div
Expand Down Expand Up @@ -439,18 +439,6 @@ exports[`Info renders info section for contract interaction request 1`] = `
<div
class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-space-between mm-box--align-items-center mm-box--text-align-center"
>
<p
class="mm-box mm-text mm-text--body-md mm-box--margin-right-1 mm-box--color-text-default"
data-testid="first-gas-field"
>
0.0001 ETH
</p>
<p
class="mm-box mm-text mm-text--body-md mm-box--margin-right-2 mm-box--color-text-alternative"
data-testid="native-currency"
>
$0.04
</p>
<button
class="mm-box mm-text mm-button-base mm-button-base--size-sm mm-button-link mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
data-testid="edit-gas-fee-icon"
Expand All @@ -464,6 +452,18 @@ exports[`Info renders info section for contract interaction request 1`] = `
class="mm-box mm-text mm-text--inherit mm-box--color-primary-default"
/>
</button>
<p
class="mm-box mm-text mm-text--body-md mm-box--margin-right-1 mm-box--color-text-default"
data-testid="first-gas-field"
>
0.0001 ETH
</p>
<p
class="mm-box mm-text mm-text--body-md mm-box--margin-right-2 mm-box--color-text-alternative"
data-testid="native-currency"
>
$0.04
</p>
</div>
</div>
<div
Expand Down Expand Up @@ -810,18 +810,6 @@ exports[`Info renders info section for setApprovalForAll request 1`] = `
<div
class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-space-between mm-box--align-items-center mm-box--text-align-center"
>
<p
class="mm-box mm-text mm-text--body-md mm-box--margin-right-1 mm-box--color-text-default"
data-testid="first-gas-field"
>
0.0001 ETH
</p>
<p
class="mm-box mm-text mm-text--body-md mm-box--margin-right-2 mm-box--color-text-alternative"
data-testid="native-currency"
>
$0.08
</p>
<button
class="mm-box mm-text mm-button-base mm-button-base--size-sm mm-button-link mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
data-testid="edit-gas-fee-icon"
Expand All @@ -835,6 +823,18 @@ exports[`Info renders info section for setApprovalForAll request 1`] = `
class="mm-box mm-text mm-text--inherit mm-box--color-primary-default"
/>
</button>
<p
class="mm-box mm-text mm-text--body-md mm-box--margin-right-1 mm-box--color-text-default"
data-testid="first-gas-field"
>
0.0001 ETH
</p>
<p
class="mm-box mm-text mm-text--body-md mm-box--margin-right-2 mm-box--color-text-alternative"
data-testid="native-currency"
>
$0.08
</p>
</div>
</div>
<div
Expand Down
38 changes: 19 additions & 19 deletions ui/pages/confirmations/components/confirm/info/approve/__snapshots__/approve.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,23 +414,23 @@ exports[`<ApproveInfo /> renders component for approve request 1`] = `
<div
class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
>
<p
class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
style="white-space: pre-wrap;"
>
1000
</p>
<button
aria-label="Edit"
class="mm-box mm-button-icon mm-button-icon--size-sm edit-spending-cap-btn mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent mm-box--rounded-lg"
data-testid="edit-spending-cap-icon"
style="margin-left: -4px;"
style="margin-right: -4px;"
>
<span
class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
style="mask-image: url('./images/icons/edit.svg');"
/>
</button>
<p
class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
style="white-space: pre-wrap;"
>
1000
</p>
</div>
</div>
</div>
Expand Down Expand Up @@ -475,18 +475,6 @@ exports[`<ApproveInfo /> renders component for approve request 1`] = `
<div
class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-space-between mm-box--align-items-center mm-box--text-align-center"
>
<p
class="mm-box mm-text mm-text--body-md mm-box--margin-right-1 mm-box--color-text-default"
data-testid="first-gas-field"
>
0.0001 ETH
</p>
<p
class="mm-box mm-text mm-text--body-md mm-box--margin-right-2 mm-box--color-text-alternative"
data-testid="native-currency"
>
$0.08
</p>
<button
class="mm-box mm-text mm-button-base mm-button-base--size-sm mm-button-link mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
data-testid="edit-gas-fee-icon"
Expand All @@ -500,6 +488,18 @@ exports[`<ApproveInfo /> renders component for approve request 1`] = `
class="mm-box mm-text mm-text--inherit mm-box--color-primary-default"
/>
</button>
<p
class="mm-box mm-text mm-text--body-md mm-box--margin-right-1 mm-box--color-text-default"
data-testid="first-gas-field"
>
0.0001 ETH
</p>
<p
class="mm-box mm-text mm-text--body-md mm-box--margin-right-2 mm-box--color-text-alternative"
data-testid="native-currency"
>
$0.08
</p>
</div>
</div>
<div
Expand Down
14 changes: 7 additions & 7 deletions ...ons/components/confirm/info/approve/spending-cap/__snapshots__/spending-cap.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,23 +74,23 @@ exports[`<SpendingCap /> renders component 1`] = `
<div
class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
>
<p
class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
style="white-space: pre-wrap;"
>
1000
</p>
<button
aria-label="Edit"
class="mm-box mm-button-icon mm-button-icon--size-sm edit-spending-cap-btn mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent mm-box--rounded-lg"
data-testid="edit-spending-cap-icon"
style="margin-left: -4px;"
style="margin-right: -4px;"
>
<span
class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
style="mask-image: url('./images/icons/edit.svg');"
/>
</button>
<p
class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
style="white-space: pre-wrap;"
>
1000
</p>
</div>
</div>
</div>
Expand Down
24 changes: 12 additions & 12 deletions ...ents/confirm/info/base-transaction-info/__snapshots__/base-transaction-info.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,18 +276,6 @@ exports[`<BaseTransactionInfo /> renders component for contract interaction requ
<div
class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-space-between mm-box--align-items-center mm-box--text-align-center"
>
<p
class="mm-box mm-text mm-text--body-md mm-box--margin-right-1 mm-box--color-text-default"
data-testid="first-gas-field"
>
0.0001 ETH
</p>
<p
class="mm-box mm-text mm-text--body-md mm-box--margin-right-2 mm-box--color-text-alternative"
data-testid="native-currency"
>
$0.04
</p>
<button
class="mm-box mm-text mm-button-base mm-button-base--size-sm mm-button-link mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
data-testid="edit-gas-fee-icon"
Expand All @@ -301,6 +289,18 @@ exports[`<BaseTransactionInfo /> renders component for contract interaction requ
class="mm-box mm-text mm-text--inherit mm-box--color-primary-default"
/>
</button>
<p
class="mm-box mm-text mm-text--body-md mm-box--margin-right-1 mm-box--color-text-default"
data-testid="first-gas-field"
>
0.0001 ETH
</p>
<p
class="mm-box mm-text mm-text--body-md mm-box--margin-right-2 mm-box--color-text-alternative"
data-testid="native-currency"
>
$0.04
</p>
</div>
</div>
<div
Expand Down
24 changes: 12 additions & 12 deletions ...tions/components/confirm/info/native-transfer/__snapshots__/native-transfer.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,18 +321,6 @@ exports[`NativeTransferInfo renders correctly 1`] = `
<div
class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-space-between mm-box--align-items-center mm-box--text-align-center"
>
<p
class="mm-box mm-text mm-text--body-md mm-box--margin-right-1 mm-box--color-text-default"
data-testid="first-gas-field"
>
0.0001 ETH
</p>
<p
class="mm-box mm-text mm-text--body-md mm-box--margin-right-2 mm-box--color-text-alternative"
data-testid="native-currency"
>
$0.08
</p>
<button
class="mm-box mm-text mm-button-base mm-button-base--size-sm mm-button-link mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
data-testid="edit-gas-fee-icon"
Expand All @@ -346,6 +334,18 @@ exports[`NativeTransferInfo renders correctly 1`] = `
class="mm-box mm-text mm-text--inherit mm-box--color-primary-default"
/>
</button>
<p
class="mm-box mm-text mm-text--body-md mm-box--margin-right-1 mm-box--color-text-default"
data-testid="first-gas-field"
>
0.0001 ETH
</p>
<p
class="mm-box mm-text mm-text--body-md mm-box--margin-right-2 mm-box--color-text-alternative"
data-testid="native-currency"
>
$0.08
</p>
</div>
</div>
<div
Expand Down
24 changes: 12 additions & 12 deletions ...components/confirm/info/nft-token-transfer/__snapshots__/nft-token-transfer.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,18 +349,6 @@ exports[`NFTTokenTransferInfo renders correctly 1`] = `
<div
class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-space-between mm-box--align-items-center mm-box--text-align-center"
>
<p
class="mm-box mm-text mm-text--body-md mm-box--margin-right-1 mm-box--color-text-default"
data-testid="first-gas-field"
>
0.0001 ETH
</p>
<p
class="mm-box mm-text mm-text--body-md mm-box--margin-right-2 mm-box--color-text-alternative"
data-testid="native-currency"
>
$0.08
</p>
<button
class="mm-box mm-text mm-button-base mm-button-base--size-sm mm-button-link mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
data-testid="edit-gas-fee-icon"
Expand All @@ -374,6 +362,18 @@ exports[`NFTTokenTransferInfo renders correctly 1`] = `
class="mm-box mm-text mm-text--inherit mm-box--color-primary-default"
/>
</button>
<p
class="mm-box mm-text mm-text--body-md mm-box--margin-right-1 mm-box--color-text-default"
data-testid="first-gas-field"
>
0.0001 ETH
</p>
<p
class="mm-box mm-text mm-text--body-md mm-box--margin-right-2 mm-box--color-text-alternative"
data-testid="native-currency"
>
$0.08
</p>
</div>
</div>
<div
Expand Down
Loading
Loading