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

Part of #18714: Replacing deprecated constants #20003

Merged
merged 5 commits into from
Jul 19, 2023
+42 −16
Merged

Part of #18714: Replacing deprecated constants #20003

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4d1abc0
replacing deprecated constants
dhruvv173 Jul 13, 2023
f0d6c0e
updating Box in player.js
dhruvv173 Jul 13, 2023
60cc94f
created story for Player.js
dhruvv173 Jul 14, 2023
7d7e718
Merge branch 'develop' into master1
dhruvv173 Jul 14, 2023
07c6a44
Merge branch 'develop' into master1
dhruvv173 Jul 18, 2023
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
11 changes: 5 additions & 6 deletions ui/components/app/qr-hardware-popover/qr-hardware-sign-request/player.js
View file
Open in desktop
dhruvv173 marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,15 @@ import React, { useEffect, useMemo, useState } from 'react';
import QRCode from 'qrcode.react';
import { UR, UREncoder } from '@ngraveio/bc-ur';
import PropTypes from 'prop-types';
import Box from '../../../ui/box';
import { useI18nContext } from '../../../../hooks/useI18nContext';
import {
AlignItems,
DISPLAY,
FLEX_DIRECTION,
Display,
FlexDirection,
TextAlign,
} from '../../../../helpers/constants/design-system';
import { PageContainerFooter } from '../../../ui/page-container';
import { Text } from '../../../component-library';
import { Text, Box } from '../../../component-library';

const Player = ({ type, cbor, cancelQRHardwareSignRequest, toRead }) => {
const t = useI18nContext();
Expand Down Expand Up @@ -39,9 +38,9 @@ const Player = ({ type, cbor, cancelQRHardwareSignRequest, toRead }) => {
<Box
paddingTop={4}
paddingBottom={4}
display={DISPLAY.FLEX}
display={Display.Flex}
alignItems={AlignItems.center}
flexDirection={FLEX_DIRECTION.COLUMN}
flexDirection={FlexDirection.Column}
>
<div
style={{
Expand Down
7 changes: 3 additions & 4 deletions ui/components/app/signature-request-siwe/signature-request-siwe-icon/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
import React from 'react';
import {
DISPLAY,
Display,
AlignItems,
Color,
JustifyContent,
} from '../../../../helpers/constants/design-system';
import Box from '../../../ui/box';
import { Icon, IconName } from '../../../component-library';
import { Icon, IconName, Box } from '../../../component-library';

const SignatureRequestSIWEIcon = () => {
return (
<Box
className="signature-request-siwe-icon"
display={DISPLAY.INLINE_FLEX}
display={Display.InlineFlex}
alignItems={AlignItems.center}
backgroundColor={Color.errorDefault}
justifyContent={JustifyContent.center}
Expand Down
4 changes: 2 additions & 2 deletions ui/components/app/signature-request-siwe/signature-request-siwe-tag/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import {
TextVariant,
Size,
DISPLAY,
Display,
AlignItems,
BackgroundColor,
TextColor,
Expand All @@ -16,7 +16,7 @@ const SignatureRequestSIWETag = ({ text }) => {
<Box
className="signature-request-siwe-tag"
marginRight={1}
display={DISPLAY.INLINE_FLEX}
display={Display.InlineFlex}
alignItems={AlignItems.center}
backgroundColor={BackgroundColor.errorDefault}
borderRadius={Size.XL}
Expand Down
7 changes: 3 additions & 4 deletions ui/components/app/tab-bar/tab-bar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@ import React from 'react';
import PropTypes from 'prop-types';
import classnames from 'classnames';

import { Icon, IconName, IconSize } from '../../component-library';
import Box from '../../ui/box';
import { Icon, IconName, IconSize, Box } from '../../component-library';
import {
BorderRadius,
Color,
DISPLAY,
Display,
} from '../../../helpers/constants/design-system';

const TabBar = (props) => {
Expand All @@ -33,7 +32,7 @@ const TabBar = (props) => {
className="tab-bar__tab__selected-indicator"
borderRadius={BorderRadius.pill}
backgroundColor={Color.primaryDefault}
display={[DISPLAY.NONE, DISPLAY.BLOCK]}
display={[Display.None, Display.Block]}
/>
)}
<div className="tab-bar__tab__content">
Expand Down