diff --git a/ui/components/app/signature-request-original/signature-request-original.component.js b/ui/components/app/signature-request-original/signature-request-original.component.js index fe20b8adbd97..3a8d06934a33 100644 --- a/ui/components/app/signature-request-original/signature-request-original.component.js +++ b/ui/components/app/signature-request-original/signature-request-original.component.js @@ -168,11 +168,7 @@ export default class SignatureRequestOriginal extends Component { color={IconColor.infoDefault} marginRight={2} /> - + {this.context.t('mismatchAccount', [ shortenAddress(this.props.selectedAccount.address), shortenAddress(this.props.fromAccount.address), diff --git a/ui/components/app/signature-request/index.scss b/ui/components/app/signature-request/index.scss index a53a9d71c613..5cc2a0981e2e 100644 --- a/ui/components/app/signature-request/index.scss +++ b/ui/components/app/signature-request/index.scss @@ -47,12 +47,6 @@ flex-direction: column; min-height: min-content; - &__title { - @include H5; - - font-weight: 500; - } - &__info { @include H7; diff --git a/ui/components/app/signature-request/signature-request-message/signature-request-message.js b/ui/components/app/signature-request/signature-request-message/signature-request-message.js index fc9864748f0b..52322d084fd1 100644 --- a/ui/components/app/signature-request/signature-request-message/signature-request-message.js +++ b/ui/components/app/signature-request/signature-request-message/signature-request-message.js @@ -5,8 +5,8 @@ import { I18nContext } from '../../../../contexts/i18n'; import Box from '../../../ui/box'; import { Text } from '../../../component-library'; import { - DISPLAY, - FLEX_DIRECTION, + Display, + FlexDirection, AlignItems, JustifyContent, Color, @@ -44,14 +44,14 @@ export default function SignatureRequestMessage({ return ( {messageIsScrollable ? ( {primaryType} diff --git a/ui/components/app/signature-request/signature-request-message/signature-request-message.stories.js b/ui/components/app/signature-request/signature-request-message/signature-request-message.stories.js index 9449e33a5189..db848c04ecec 100644 --- a/ui/components/app/signature-request/signature-request-message/signature-request-message.stories.js +++ b/ui/components/app/signature-request/signature-request-message/signature-request-message.stories.js @@ -4,7 +4,6 @@ import SignatureRequestMessage from './signature-request-message'; export default { title: 'Components/App/SignatureRequestMessage', - component: SignatureRequestMessage, argTypes: { data: { control: 'object' }, diff --git a/ui/components/app/signature-request/signature-request.component.js b/ui/components/app/signature-request/signature-request.component.js index 428579d38279..3467cbb0bcff 100644 --- a/ui/components/app/signature-request/signature-request.component.js +++ b/ui/components/app/signature-request/signature-request.component.js @@ -20,8 +20,8 @@ import { TextColor, ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) IconColor, - DISPLAY, - BLOCK_SIZES, + Display, + BlockSize, TextVariant, BackgroundColor, ///: END:ONLY_INCLUDE_IN @@ -287,8 +287,8 @@ export default class SignatureRequest extends PureComponent { this.props.selectedAccount.address === address ? null : ( {this.context.t('mismatchAccount', [ shortenAddress(this.props.selectedAccount.address), diff --git a/ui/components/app/signature-request/signature-request.stories.js b/ui/components/app/signature-request/signature-request.stories.js index fbae8f99cae7..1fc2e555baa1 100644 --- a/ui/components/app/signature-request/signature-request.stories.js +++ b/ui/components/app/signature-request/signature-request.stories.js @@ -9,7 +9,6 @@ const [MOCK_PRIMARY_IDENTITY, MOCK_SECONDARY_IDENTITY] = Object.values( export default { title: 'Components/App/SignatureRequest', - component: SignatureRequest, parameters: { docs: { @@ -30,6 +29,10 @@ export default { clearConfirmTransaction: { action: 'Clean Confirm' }, cancel: { action: 'Cancel' }, sign: { action: 'Sign' }, + showRejectTransactionsConfirmationModal: { + action: 'showRejectTransactionsConfirmationModal', + }, + cancelAll: { action: 'cancelAll' }, }, }; @@ -79,6 +82,8 @@ DefaultStory.args = { fromAccount: MOCK_PRIMARY_IDENTITY, providerConfig: { name: 'Goerli ETH' }, selectedAccount: MOCK_PRIMARY_IDENTITY, + hardwareWalletRequiresConnection: false, + currentCurrency: 'usd', }; export const AccountMismatchStory = (args) => {