Skip to content

fix: Permit signature re-design papercuts #25383

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

Merged
merged 7 commits into from
Jun 21, 2024
Merged

fix: Permit signature re-design papercuts #25383

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
36028e3
Permit signature re-design papercuts
jpuri Jun 17, 2024
88b35b3
Merge branch 'develop' into permit_papercuts
jpuri Jun 18, 2024
400dac7
Merge branch 'develop' into permit_papercuts
jpuri Jun 18, 2024
b4ebab7
Merge branch 'develop' into permit_papercuts
jpuri Jun 19, 2024
81f3ecd
Update
jpuri Jun 19, 2024
78a9317
Merge branch 'develop' into permit_papercuts
digiwand Jun 19, 2024
4f51e69
Update
jpuri Jun 20, 2024
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
8 changes: 1 addition & 7 deletions ui/pages/confirmations/components/confirm/footer/footer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@ import useAlerts from '../../../../../hooks/useAlerts';
import { confirmSelector } from '../../../selectors';
import { getConfirmationSender } from '../utils';

function getIconName(hasUnconfirmedAlerts: boolean): IconName {
return hasUnconfirmedAlerts ? IconName.SecuritySearch : IconName.Danger;
}

const ConfirmButton = ({
alertOwnerId = '',
disabled,
Expand Down Expand Up @@ -68,9 +64,7 @@ const ConfirmButton = ({
<Button
block
data-testid="confirm-footer-button"
startIconName={
hasDangerAlerts ? getIconName(hasUnconfirmedDangerAlerts) : undefined
}
startIconName={hasDangerAlerts ? IconName.Danger : undefined}
onClick={hasDangerAlerts ? handleOpenConfirmModal : onSubmit}
danger={hasDangerAlerts}
size={ButtonSize.Lg}
Expand Down
4 changes: 2 additions & 2 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 @@ -81,7 +81,7 @@ exports[`Info renders info section for typed sign request 1`] = `
class="mm-box mm-box--margin-bottom-4 mm-box--padding-0 mm-box--background-color-background-default mm-box--rounded-md"
>
<div
class="mm-box mm-box--padding-2"
class="mm-box mm-box--padding-inline-2"
>
<div
class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
Expand Down Expand Up @@ -123,7 +123,7 @@ exports[`Info renders info section for typed sign request 1`] = `
</div>
</div>
<div
class="mm-box mm-box--padding-2"
class="mm-box mm-box--padding-inline-2"
>
<div
class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
Expand Down
12 changes: 6 additions & 6 deletions ...s/confirmations/components/confirm/info/typed-sign/__snapshots__/typed-sign.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ exports[`TypedSignInfo renders origin for typed sign data request 1`] = `
class="mm-box mm-box--margin-bottom-4 mm-box--padding-0 mm-box--background-color-background-default mm-box--rounded-md"
>
<div
class="mm-box mm-box--padding-2"
class="mm-box mm-box--padding-inline-2"
>
<div
class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
Expand Down Expand Up @@ -50,7 +50,7 @@ exports[`TypedSignInfo renders origin for typed sign data request 1`] = `
</div>
</div>
<div
class="mm-box mm-box--padding-2"
class="mm-box mm-box--padding-inline-2"
>
<div
class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
Expand Down Expand Up @@ -439,7 +439,7 @@ exports[`TypedSignInfo should render message for typed sign v3 request 1`] = `
class="mm-box mm-box--margin-bottom-4 mm-box--padding-0 mm-box--background-color-background-default mm-box--rounded-md"
>
<div
class="mm-box mm-box--padding-2"
class="mm-box mm-box--padding-inline-2"
>
<div
class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
Expand Down Expand Up @@ -481,7 +481,7 @@ exports[`TypedSignInfo should render message for typed sign v3 request 1`] = `
</div>
</div>
<div
class="mm-box mm-box--padding-2"
class="mm-box mm-box--padding-inline-2"
>
<div
class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
Expand Down Expand Up @@ -870,7 +870,7 @@ exports[`TypedSignInfo should render message for typed sign v4 request 1`] = `
class="mm-box mm-box--margin-bottom-4 mm-box--padding-0 mm-box--background-color-background-default mm-box--rounded-md"
>
<div
class="mm-box mm-box--padding-2"
class="mm-box mm-box--padding-inline-2"
>
<div
class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
Expand Down Expand Up @@ -912,7 +912,7 @@ exports[`TypedSignInfo should render message for typed sign v4 request 1`] = `
</div>
</div>
<div
class="mm-box mm-box--padding-2"
class="mm-box mm-box--padding-inline-2"
>
<div
class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
Expand Down
1 change: 1 addition & 0 deletions ...s/confirm/info/typed-sign/permit-simulation/__snapshots__/permit-simulation.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ exports[`PermitSimulation renders component correctly 1`] = `
</div>
<div
class="mm-box"
style="align-self: flex-end; margin-left: auto;"
>
<div
class="mm-box mm-box--display-flex"
Expand Down
2 changes: 1 addition & 1 deletion .../confirmations/components/confirm/info/typed-sign/permit-simulation/permit-simulation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ const PermitSimulation: React.FC = () => {
<ConfirmInfoRowText text={t('permitSimulationDetailInfo')} />
</ConfirmInfoRow>
<ConfirmInfoRow label={t('approve')}>
<Box>
<Box style={{ alignSelf: 'flex-end', marginLeft: 'auto' }}>
<Box display={Display.Flex}>
<Box display={Display.Inline} marginInlineEnd={1}>
<Text
Expand Down
6 changes: 3 additions & 3 deletions ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,15 @@ const TypedSignInfo: React.FC = () => {
>
{isPermit && (
<>
<Box padding={2}>
<Box paddingInline={2}>
<ConfirmInfoRow label={t('spender')}>
<ConfirmInfoRowAddress address={spender} />
</ConfirmInfoRow>
</Box>
<ConfirmInfoRowDivider />
</>
)}
<Box padding={2}>
<Box paddingInline={2}>
<ConfirmInfoRow
label={t('requestFrom')}
tooltip={t('requestFromInfo')}
Expand All @@ -70,7 +70,7 @@ const TypedSignInfo: React.FC = () => {
</ConfirmInfoRow>
</Box>
{isValidAddress(verifyingContract) && (
<Box padding={2}>
<Box paddingInline={2}>
<ConfirmInfoRow label={t('interactingWith')}>
<ConfirmInfoRowAddress address={verifyingContract} />
</ConfirmInfoRow>
Expand Down
4 changes: 2 additions & 2 deletions ui/pages/confirmations/confirm/__snapshots__/confirm.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ exports[`Confirm should match snapshot for typed sign signature 1`] = `
class="mm-box mm-box--margin-bottom-4 mm-box--padding-0 mm-box--background-color-background-default mm-box--rounded-md"
>
<div
class="mm-box mm-box--padding-2"
class="mm-box mm-box--padding-inline-2"
>
<div
class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
Expand Down Expand Up @@ -423,7 +423,7 @@ exports[`Confirm should match snapshot for typed sign signature 1`] = `
</div>
</div>
<div
class="mm-box mm-box--padding-2"
class="mm-box mm-box--padding-inline-2"
>
<div
class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
Expand Down