fix: replace existing icons after merge from mein
This commit is contained in:
parent
1ef443f87e
commit
502241fb63
|
@ -1,14 +1,13 @@
|
||||||
import { Tag } from '@status-im/components'
|
import { Tag } from '@status-im/components'
|
||||||
import { XStack } from 'tamagui'
|
import { XStack } from 'tamagui'
|
||||||
import PairIcon from '../Icons/PairIcon'
|
|
||||||
import CreateIcon from '../Icons/CreateIcon'
|
|
||||||
import './TagContainer.css'
|
import './TagContainer.css'
|
||||||
|
import { AddSmallIcon, SwapIcon } from '@status-im/icons'
|
||||||
|
|
||||||
const TagContainer = () => {
|
const TagContainer = () => {
|
||||||
return (
|
return (
|
||||||
<XStack space={'$2'} alignItems="center" className="tag-container">
|
<XStack space={'$2'} alignItems="center" className="tag-container">
|
||||||
<Tag icon={PairIcon} label="Pair" size={32} />
|
<Tag icon={SwapIcon} label="Pair" size={32} />
|
||||||
<Tag selected icon={CreateIcon} label="Create" size={32} />
|
<Tag selected icon={AddSmallIcon} label="Create" size={32} />
|
||||||
</XStack>
|
</XStack>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,9 +13,8 @@ import { useSelector } from 'react-redux'
|
||||||
import { RootState } from '../../redux/store'
|
import { RootState } from '../../redux/store'
|
||||||
|
|
||||||
const DeviceHealthCheck = () => {
|
const DeviceHealthCheck = () => {
|
||||||
|
|
||||||
const deviceHealthState = useSelector((state: RootState) => state.deviceHealth)
|
const deviceHealthState = useSelector((state: RootState) => state.deviceHealth)
|
||||||
console.log(deviceHealthState)
|
|
||||||
return (
|
return (
|
||||||
<PageWrapperShadow rightImageSrc="/background-images/eye-background.png">
|
<PageWrapperShadow rightImageSrc="/background-images/eye-background.png">
|
||||||
<YStack
|
<YStack
|
||||||
|
|
|
@ -5,18 +5,16 @@ import { Button, Checkbox, Tag, Text } from '@status-im/components'
|
||||||
import PageWrapperShadow from '../../components/PageWrappers/PageWrapperShadow'
|
import PageWrapperShadow from '../../components/PageWrappers/PageWrapperShadow'
|
||||||
import SyncStatus from './SyncStatus'
|
import SyncStatus from './SyncStatus'
|
||||||
import NimbusLogo from '../../components/Logos/NimbusLogo'
|
import NimbusLogo from '../../components/Logos/NimbusLogo'
|
||||||
import PairIcon from '../../components/Icons/PairIcon'
|
|
||||||
import CreateIcon from '../../components/Icons/CreateIcon'
|
|
||||||
import NodeIcon from '../../components/Icons/NodeIcon'
|
|
||||||
import Titles from '../../components/General/Titles'
|
import Titles from '../../components/General/Titles'
|
||||||
import PairedSuccessfully from './PairedSuccessfully'
|
import PairedSuccessfully from './PairedSuccessfully'
|
||||||
import { CreateAvatar } from './CreateAvatar'
|
import CreateAvatar from './CreateAvatar'
|
||||||
import GenerateId from './GenerateId'
|
import GenerateId from './GenerateId'
|
||||||
|
import { AddSmallIcon, NodeIcon, SwapIcon } from '@status-im/icons'
|
||||||
|
|
||||||
const PairDevice = () => {
|
const PairDevice = () => {
|
||||||
const [autoChecked, setAutoChecked] = useState(false)
|
const [autoChecked, setAutoChecked] = useState(false)
|
||||||
const [isAwaitingPairing, setIsAwaitingPairing] = useState(false)
|
const [isAwaitingPairing, setIsAwaitingPairing] = useState(false)
|
||||||
const isPaired = false
|
const isPaired = true
|
||||||
const isPairing = true
|
const isPairing = true
|
||||||
|
|
||||||
const changeSetIsAwaitingPairing = (result: boolean) => {
|
const changeSetIsAwaitingPairing = (result: boolean) => {
|
||||||
|
@ -34,8 +32,8 @@ const PairDevice = () => {
|
||||||
<XStack style={{ justifyContent: 'space-between' }}>
|
<XStack style={{ justifyContent: 'space-between' }}>
|
||||||
<NimbusLogo />
|
<NimbusLogo />
|
||||||
<XStack space={'$2'} style={{ alignItems: 'center' }}>
|
<XStack space={'$2'} style={{ alignItems: 'center' }}>
|
||||||
<Tag icon={PairIcon} label="Pair" size={32} selected />
|
<Tag icon={SwapIcon} label="Pair" size={32} selected />
|
||||||
<Tag icon={CreateIcon} label="Create" size={32} />
|
<Tag icon={AddSmallIcon} label="Create" size={32} />
|
||||||
</XStack>
|
</XStack>
|
||||||
</XStack>
|
</XStack>
|
||||||
<Titles title="Pair Device" subtitle="Pair your device to the Nimbus Node Manager" />
|
<Titles title="Pair Device" subtitle="Pair your device to the Nimbus Node Manager" />
|
||||||
|
@ -66,7 +64,7 @@ const PairDevice = () => {
|
||||||
{isPaired && <CreateAvatar></CreateAvatar>}
|
{isPaired && <CreateAvatar></CreateAvatar>}
|
||||||
<Separator borderColor={'#e3e3e3'} />
|
<Separator borderColor={'#e3e3e3'} />
|
||||||
<XStack>
|
<XStack>
|
||||||
<Button icon={<NodeIcon />} disabled={!isPaired}>
|
<Button icon={<NodeIcon size={20} />} disabled={!isPaired}>
|
||||||
Continue
|
Continue
|
||||||
</Button>
|
</Button>
|
||||||
</XStack>
|
</XStack>
|
||||||
|
|
Loading…
Reference in New Issue