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

refactor: replace deprecated mixins with text component in transaction-confirmed #25551

Merged
merged 9 commits into from
Aug 1, 2024
Merged

refactor: replace deprecated mixins with text component in transaction-confirmed #25551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3001854
Removed SCSS instances
devin-ai-integration[bot] Jun 27, 2024
3ec8dce
Added Text components instead of div
devin-ai-integration[bot] Jun 27, 2024
ed3cc4a
Fixed lint and updated snapshot
devin-ai-integration[bot] Jun 27, 2024
04b5172
Updated font weight to medium instead of 500
devin-ai-integration[bot] Jun 27, 2024
6d676c1
Update ui/components/app/modals/transaction-confirmed/transaction-con…
georgewrmarshall Jul 26, 2024
885566f
Update ui/components/app/modals/transaction-confirmed/transaction-con…
georgewrmarshall Jul 26, 2024
9ec4ce6
Update ui/components/app/modals/transaction-confirmed/transaction-con…
georgewrmarshall Jul 26, 2024
c103007
Update snapshots and fix lint error in transaction-confirmed.componen…
devin-ai-integration[bot] Jul 31, 2024
741695c
Merge branch 'develop' into devin/mixin-565343
georgewrmarshall Jul 31, 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
12 changes: 6 additions & 6 deletions ...ponents/app/modals/transaction-confirmed/__snapshots__/transaction-confirmed.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@ exports[`Transaction Confirmed should match snapshot 1`] = `
class="mm-box mm-icon mm-icon--size-xl mm-box--display-inline-block mm-box--color-success-default"
style="mask-image: url('./images/icons/check.svg');"
/>
<div
class="transaction-confirmed__title"
<h3
class="mm-box mm-text mm-text--heading-md mm-text--font-weight-medium mm-text--text-align-center mm-box--color-text-default"
>
[confirmed]!
</div>
<div
class="transaction-confirmed__description"
</h3>
<p
class="mm-box mm-text mm-text--body-md mm-text--text-align-center mm-box--color-text-default"
>
[initialTransactionConfirmed]
</div>
</p>
</div>
</div>
<div
Expand Down
14 changes: 0 additions & 14 deletions ui/components/app/modals/transaction-confirmed/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,6 @@
@use "design-system";

.transaction-confirmed {
&__title {
@include design-system.H3;

font-weight: 500;
padding: 16px 0;
text-align: center;
}

&__description {
@include design-system.H6;

text-align: center;
}

&__content {
overflow-y: auto;
flex: 1;
Expand Down
21 changes: 15 additions & 6 deletions ui/components/app/modals/transaction-confirmed/transaction-confirmed.component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
import React, { PureComponent } from 'react';
import PropTypes from 'prop-types';
import Modal from '../../modal';
import { Icon, IconName, IconSize } from '../../../component-library';
import { IconColor } from '../../../../helpers/constants/design-system';
import { Icon, IconName, IconSize, Text } from '../../../component-library';
import {
IconColor,
TextVariant,
TextAlign,
FontWeight,
} from '../../../../helpers/constants/design-system';

export default class TransactionConfirmed extends PureComponent {
static contextTypes = {
Expand Down Expand Up @@ -35,12 +40,16 @@ export default class TransactionConfirmed extends PureComponent {
color={IconColor.successDefault}
size={IconSize.Xl}
/>
<div className="transaction-confirmed__title">
<Text
variant={TextVariant.headingMd}
fontWeight={FontWeight.Medium}
textAlign={TextAlign.Center}
>
{`${t('confirmed')}!`}
</div>
<div className="transaction-confirmed__description">
</Text>
<Text textAlign={TextAlign.Center}>
{t('initialTransactionConfirmed')}
</div>
</Text>
</div>
</Modal>
);
Expand Down