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: update css for modals #25961

Merged
merged 8 commits into from
Jul 22, 2024
Merged

fix: update css for modals #25961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8251544
fix: update css for modals
sahar-fehri Jul 19, 2024
aba2429
fix: fix lint
sahar-fehri Jul 19, 2024
6537ac0
fix: fix
sahar-fehri Jul 19, 2024
df37dea
Merge branch 'develop' into fix/token-nft-modal-css-update
sahar-fehri Jul 22, 2024
6ee2975
chore: refactoring to revert modal-footer changes and use provided pr…
georgewrmarshall Jul 22, 2024
1f9ce11
fix: fix lint
sahar-fehri Jul 22, 2024
22a5066
fix: review
sahar-fehri Jul 22, 2024
bd03784
fix: fix
sahar-fehri Jul 22, 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
21 changes: 10 additions & 11 deletions ui/components/app/assets/auto-detect-nft/auto-detect-nft-modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React, { useCallback, useContext } from 'react';

import { useDispatch, useSelector } from 'react-redux';

import {
Modal,
ModalContent,
Expand All @@ -10,6 +11,7 @@ import {
Text,
georgewrmarshall marked this conversation as resolved.
Show resolved Hide resolved
ModalBody,
ModalFooter,
ButtonVariant,
} from '../../../component-library';
import { useI18nContext } from '../../../../hooks/useI18nContext';
import {
Expand All @@ -18,7 +20,6 @@ import {
Display,
georgewrmarshall marked this conversation as resolved.
Show resolved Hide resolved
FlexDirection,
JustifyContent,
TextAlign,
TextVariant,
} from '../../../../helpers/constants/design-system';
import {
Expand Down Expand Up @@ -96,13 +97,9 @@ function AutoDetectNftModal({ isOpen, onClose }: AutoDetectNftModalProps) {
>
<img src="/images/wallet-alpha.png" />
</Box>
<Text
variant={TextVariant.bodyMd}
textAlign={TextAlign.Justify}
padding={0}
>
<Text variant={TextVariant.bodyMd}>
georgewrmarshall marked this conversation as resolved.
Show resolved Hide resolved
{t('allowMetaMaskToDetectNFTs')}
<Box textAlign={TextAlign.Justify} paddingLeft={2}>
<Box paddingLeft={2}>
<Text variant={TextVariant.inherit} as="li" paddingTop={2}>
{t('immediateAccessToYourNFTs')}
</Text>
Expand All @@ -117,15 +114,17 @@ function AutoDetectNftModal({ isOpen, onClose }: AutoDetectNftModalProps) {
</ModalBody>
<ModalFooter
onSubmit={() => handleNftAutoDetection(true)}
submitButtonProps={{
children: t('allow'),
block: true,
}}
onCancel={() => handleNftAutoDetection(false)}
cancelButtonProps={{
children: t('notRightNow'),
block: true,
variant: ButtonVariant.Link,
georgewrmarshall marked this conversation as resolved.
Show resolved Hide resolved
}}
submitButtonProps={{
children: t('allow'),
block: true,
}}
containerProps={{ flexDirection: FlexDirection.ColumnReverse }}
georgewrmarshall marked this conversation as resolved.
Show resolved Hide resolved
georgewrmarshall marked this conversation as resolved.
Show resolved Hide resolved
/>
</ModalContent>
</Modal>
Expand Down
12 changes: 5 additions & 7 deletions ui/components/app/assets/auto-detect-token/auto-detect-token-modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
Text,
ModalBody,
ModalFooter,
ButtonVariant,
georgewrmarshall marked this conversation as resolved.
Show resolved Hide resolved
} from '../../../component-library';
import { useI18nContext } from '../../../../hooks/useI18nContext';
import {
Expand All @@ -18,7 +19,6 @@ import {
Display,
georgewrmarshall marked this conversation as resolved.
Show resolved Hide resolved
FlexDirection,
JustifyContent,
TextAlign,
TextVariant,
} from '../../../../helpers/constants/design-system';
import { setUseTokenDetection } from '../../../../store/actions';
Expand Down Expand Up @@ -101,13 +101,9 @@ function AutoDetectTokenModal({
>
<img src="/images/wallet-alpha.png" />
</Box>
<Text
variant={TextVariant.bodyMd}
textAlign={TextAlign.Justify}
padding={0}
>
<Text variant={TextVariant.bodyMd}>
georgewrmarshall marked this conversation as resolved.
Show resolved Hide resolved
{t('allowMetaMaskToDetectTokens')}
georgewrmarshall marked this conversation as resolved.
Show resolved Hide resolved
<Box textAlign={TextAlign.Justify} paddingLeft={2}>
<Box paddingLeft={2}>
georgewrmarshall marked this conversation as resolved.
Show resolved Hide resolved
<Text variant={TextVariant.inherit} as="li" paddingTop={2}>
{t('immediateAccessToYourTokens')}
</Text>
Expand All @@ -132,8 +128,10 @@ function AutoDetectTokenModal({
onCancel={() => handleTokenAutoDetection(false)}
cancelButtonProps={{
children: t('notRightNow'),
variant: ButtonVariant.Link,
georgewrmarshall marked this conversation as resolved.
Show resolved Hide resolved
block: true,
}}
containerProps={{ flexDirection: FlexDirection.ColumnReverse }}
/>
</ModalContent>
</Modal>
Expand Down