diff --git a/src/components/account/index.tsx b/src/components/account/index.tsx
index 6cb7ce536..54eeba2a8 100644
--- a/src/components/account/index.tsx
+++ b/src/components/account/index.tsx
@@ -100,11 +100,11 @@ const Account = () => {
onClick={openConnectModal}
>
+ Connect Wallet
+
+
Connect
-
-
-
)
}
diff --git a/src/components/chain-selector/ChainSelector.tsx b/src/components/chain-selector/ChainSelector.tsx
index c468d7cb2..4f3e457ae 100644
--- a/src/components/chain-selector/ChainSelector.tsx
+++ b/src/components/chain-selector/ChainSelector.tsx
@@ -2,6 +2,7 @@ import Button from 'components/button'
import Base from 'components/icons/logos/Base'
import Ethereum from 'components/icons/logos/Ethereum'
import Popup from 'components/popup'
+import { transition } from 'theme'
import { useAtom, useAtomValue } from 'jotai'
import { useState } from 'react'
import { Check, ChevronDown, ChevronUp } from 'react-feather'
@@ -38,7 +39,7 @@ const ChainList = ({ onSelect }: { onSelect(chain: number): void }) => {
maxHeight: 320,
overflow: 'auto',
backgroundColor: 'background',
- borderRadius: '13px',
+ borderRadius: '12px',
}}
>
{CHAIN_LIST.map((chain) => {
@@ -47,34 +48,42 @@ const ChainList = ({ onSelect }: { onSelect(chain: number): void }) => {
return (
onSelect(chain.id)}
key={chain.id}
>
-
-
+
{chain.label}
+
+
+
)
})}
-
+
+
+
)
}
@@ -107,7 +116,7 @@ const ChainSelector = (props: BoxProps) => {
onDismiss={() => setVisible(false)}
content={}
containerProps={{
- sx: { border: '2px solid', borderColor: 'primary' },
+ sx: { border: '2px solid', borderColor: 'darkBorder' },
}}
>
) => (
fill="none"
{...props}
>
-
+
)
diff --git a/src/components/icons/logos/Ethereum.tsx b/src/components/icons/logos/Ethereum.tsx
index 33eb7df85..f1430118f 100644
--- a/src/components/icons/logos/Ethereum.tsx
+++ b/src/components/icons/logos/Ethereum.tsx
@@ -9,24 +9,42 @@ const Ethereum = (props: SVGProps) => (
imageRendering="optimizeQuality"
shapeRendering="geometricPrecision"
textRendering="geometricPrecision"
- viewBox="0 0 784.37 1277.39"
+ viewBox="0 0 20 20"
width="1em"
height="1em"
{...props}
>
-
+
-
+
+
+
+
+
-
-
-
)
diff --git a/src/components/info-box/index.tsx b/src/components/info-box/index.tsx
index c78b85284..1d89ae569 100644
--- a/src/components/info-box/index.tsx
+++ b/src/components/info-box/index.tsx
@@ -57,7 +57,7 @@ export const InfoHeading = ({ title, subtitle, help, ...props }: Props) => (
sx={{
justifyContent: 'space-between',
alignItems: 'start',
- minWidth: [0, 390],
+ minWidth: ['auto', 390],
maxWidth: '100%',
flexDirection: ['column', 'row'],
}}
diff --git a/src/components/layout/header/AppHeader.tsx b/src/components/layout/header/AppHeader.tsx
index 11d188194..56520385f 100644
--- a/src/components/layout/header/AppHeader.tsx
+++ b/src/components/layout/header/AppHeader.tsx
@@ -89,12 +89,19 @@ const AppHeader = () => (
-
+
{/*
*/}
-
+
+
)
diff --git a/src/components/popup/index.tsx b/src/components/popup/index.tsx
index 7043c40c6..fd3cd86c7 100644
--- a/src/components/popup/index.tsx
+++ b/src/components/popup/index.tsx
@@ -10,8 +10,8 @@ const Popup = ({ content, containerProps = {}, ...props }: PopoverProps) => {
{...containerProps}
sx={{
backgroundCcolor: 'contentBackground',
- border: '1px solid',
- borderColor: 'invertedText',
+ border: '2px solid',
+ borderColor: 'darkBorder',
borderRadius: '14px',
boxShadow: '0px 10px 25px rgba(0, 0, 0, 0.2)',
...(containerProps.sx || {}),
diff --git a/src/components/rtoken-selector/SelectedToken.tsx b/src/components/rtoken-selector/SelectedToken.tsx
index c890c5b9a..0675abdf8 100644
--- a/src/components/rtoken-selector/SelectedToken.tsx
+++ b/src/components/rtoken-selector/SelectedToken.tsx
@@ -36,10 +36,29 @@ const SelectedToken = () => {
if (!selectedAddress) {
return (
-
-
+
+
+
+
Select RToken
+
+ RTokens
+
)
}
diff --git a/src/components/rtoken-selector/TokenList.tsx b/src/components/rtoken-selector/TokenList.tsx
index 351235e35..741fcb011 100644
--- a/src/components/rtoken-selector/TokenList.tsx
+++ b/src/components/rtoken-selector/TokenList.tsx
@@ -17,7 +17,8 @@ const ActionItem = styled(Flex)`
cursor: pointer;
&:hover {
- background-color: #6d3210;
+ background-color: var(--theme-ui-colors-contentBackground);
+ border-left: 2px solid var(--theme-ui-colors-primary);
}
`
@@ -40,10 +41,10 @@ const TokenList = memo(
@@ -52,27 +53,29 @@ const TokenList = memo(
onClick={onHome}
>
-
+
Dashboard
{!!Object.values(tokens).length && (
)}
{Object.values(tokens).map(({ address, logo, symbol, chainId }) => (
- {
-
- if (currentChainId !== chainId && switchNetwork) {
- switchNetwork(chainId!)
- }
- onSelect(address)
- }}>
+ {
+ if (currentChainId !== chainId && switchNetwork) {
+ switchNetwork(chainId!)
+ }
+ onSelect(address)
+ }}
+ >
(
sx={{
display: 'flex',
flexDirection: 'row',
- width: "100%",
- justifyContent: "space-between"
+ width: '100%',
+ justifyContent: 'space-between',
}}
>
-
+
{symbol}
-
+
{chainId === 1 && }
{chainId === 8453 && }
diff --git a/src/theme.ts b/src/theme.ts
index 594558fd1..c40806a25 100644
--- a/src/theme.ts
+++ b/src/theme.ts
@@ -84,7 +84,7 @@ export const colors = {
contentLightBackground: 'rgba(249, 248, 244, 0.5)',
primary: '#000000',
success: '#11BB8D',
- accentAction: '#6D3210',
+ accentAction: '#973700',
accentBG: 'contentBackground',
secondary: '#E8E8E8',
rBlue: '#2150A9',
@@ -113,7 +113,7 @@ export const colors = {
primary: '#6D3210',
secondary: '#33261f',
disabled: '#231f1f',
- accentAction: '#6D3210',
+ accentAction: '#973700',
accentBG: '#1A0D05',
border: '#1A1A1A',
darkBorder: '#241c19',
@@ -374,10 +374,11 @@ export const theme: Theme = {
},
accentAction: {
...baseButton,
- backgroundColor: 'accentBG',
- color: 'accentAction',
- border: '2px solid',
+ backgroundColor: 'transparent',
+ border: '1px solid',
borderColor: 'accentAction',
+ color: 'accentAction',
+
'&:hover': {
backgroundColor: 'accentAction',
color: 'white',
diff --git a/src/views/bridge/components/BridgeFaq.tsx b/src/views/bridge/components/BridgeFaq.tsx
index 3b30a9d36..fe0b29b88 100644
--- a/src/views/bridge/components/BridgeFaq.tsx
+++ b/src/views/bridge/components/BridgeFaq.tsx
@@ -21,7 +21,7 @@ const BridgeFaq = (props: BoxProps) => (
diff --git a/src/views/bridge/components/BridgeHeader.tsx b/src/views/bridge/components/BridgeHeader.tsx
index 16aa41f73..201daa05d 100644
--- a/src/views/bridge/components/BridgeHeader.tsx
+++ b/src/views/bridge/components/BridgeHeader.tsx
@@ -35,7 +35,7 @@ const BridgeHeader = () => {
)
}
@@ -287,7 +295,7 @@ const Main = () => {
px={3}
mx={'auto'}
sx={{
- display: 'flex',
+ display: ['none', 'flex'],
textAlign: 'center',
flexDirection: ['column', 'row'],
justifyContent: 'space-between',
@@ -311,7 +319,7 @@ const Main = () => {
-
+