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.

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

Update staging #282

Merged
merged 8 commits into from
Aug 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 21 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ import SnackbarProvider from '@components/Snackbar'
import { theme } from '@static/theme'
import { ThemeProvider } from '@mui/material/styles'
import Notifier from '@containers/Notifier'
import { filterConsoleMessages, messagesToHide } from './hideErrors'

filterConsoleMessages(messagesToHide)

function App() {
return (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ interface IProps {
isBalanceLoading: boolean
showMaxButton: boolean
showBlur: boolean
hiddenUnknownTokens: boolean
}

export const AmountInput: React.FC<IProps> = ({
Expand All @@ -60,7 +61,8 @@ export const AmountInput: React.FC<IProps> = ({
priceLoading = false,
isBalanceLoading,
showMaxButton = true,
showBlur
showBlur,
hiddenUnknownTokens
}) => {
const hideBalance = balance === '- -' || !balance || hideBalances
const { classes } = useStyles({ walletDisconnected: hideBalance })
Expand Down Expand Up @@ -121,6 +123,7 @@ export const AmountInput: React.FC<IProps> = ({
commonTokens={commonTokens}
initialHideUnknownTokensValue={initialHideUnknownTokensValue}
onHideUnknownTokensChange={onHideUnknownTokensChange}
hiddenUnknownTokens={hiddenUnknownTokens}
/>
{showBlur ? (
<div className={classes.blur}></div>
Expand Down
3 changes: 2 additions & 1 deletion src/components/Inputs/Select/Select.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ export const Primary: Story = {
initialHideUnknownTokensValue: false,
tokens: tokens,
onHideUnknownTokensChange: fn(),
centered: false
centered: false,
hiddenUnknownTokens: false
}
}
5 changes: 4 additions & 1 deletion src/components/Inputs/Select/Select.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export interface ISelectModal {
commonTokens: string[]
initialHideUnknownTokensValue: boolean
onHideUnknownTokensChange: (val: boolean) => void
hiddenUnknownTokens: boolean
}

export const Select: React.FC<ISelectModal> = ({
Expand All @@ -35,7 +36,8 @@ export const Select: React.FC<ISelectModal> = ({
sliceName = false,
commonTokens,
initialHideUnknownTokensValue,
onHideUnknownTokensChange
onHideUnknownTokensChange,
hiddenUnknownTokens
}) => {
const { classes } = useStyles()
const [anchorEl, setAnchorEl] = React.useState<HTMLButtonElement | null>(null)
Expand Down Expand Up @@ -99,6 +101,7 @@ export const Select: React.FC<ISelectModal> = ({
commonTokens={commonTokens}
initialHideUnknownTokensValue={initialHideUnknownTokensValue}
onHideUnknownTokensChange={onHideUnknownTokensChange}
hiddenUnknownTokens={hiddenUnknownTokens}
/>
</>
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ export const Primary: Story = {
handleAddToken: fn(),
initialHideUnknownTokensValue: false,
onHideUnknownTokensChange: fn(),
tokens: tokens
tokens: tokens,
hiddenUnknownTokens: false
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ export interface ISelectTokenModal {
handleAddToken: (address: string) => void
initialHideUnknownTokensValue: boolean
onHideUnknownTokensChange: (val: boolean) => void
hiddenUnknownTokens: boolean
}

interface IScroll {
Expand Down Expand Up @@ -66,7 +67,8 @@ export const SelectTokenModal: React.FC<ISelectTokenModal> = ({
hideBalances = false,
handleAddToken,
initialHideUnknownTokensValue,
onHideUnknownTokensChange
onHideUnknownTokensChange,
hiddenUnknownTokens
}) => {
const { classes } = useStyles()
const isXs = useMediaQuery(theme.breakpoints.down('sm'))
Expand All @@ -78,6 +80,10 @@ export const SelectTokenModal: React.FC<ISelectTokenModal> = ({
const outerRef = useRef<HTMLElement>(null)
const inputRef = useRef<HTMLInputElement>(null)

useEffect(() => {
setHideUnknown(hiddenUnknownTokens)
}, [hiddenUnknownTokens])

const commonTokensList = useMemo(() => {
const commonTokensList: SwapToken[] = []

Expand Down
1 change: 0 additions & 1 deletion src/components/Modals/Slippage/Slippage.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ type Story = StoryObj<typeof meta>
export const Primary: Story = {
args: {
anchorEl: null,
defaultSlippage: '0,5',
handleClose: fn(),
initialSlippage: '0,5',
setSlippage: fn(),
Expand Down
35 changes: 13 additions & 22 deletions src/components/Modals/Slippage/Slippage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ interface Props {
setSlippage: (slippage: string) => void
handleClose: () => void
anchorEl: HTMLButtonElement | null
defaultSlippage: string
initialSlippage: string
infoText?: string
headerText?: string
Expand All @@ -19,7 +18,6 @@ const Slippage: React.FC<Props> = ({
setSlippage,
handleClose,
anchorEl,
defaultSlippage,
initialSlippage,
infoText,
headerText
Expand Down Expand Up @@ -128,7 +126,10 @@ const Slippage: React.FC<Props> = ({
className={classNames(classes.slippagePercentageButton, {
[classes.slippagePercentageButtonActive]: index === tierIndex
})}
onClick={() => setTieredSlippage(index)}>
onClick={() => {
setTieredSlippage(index)
handleClose()
}}>
{tier}%
</Button>
))}
Expand All @@ -137,40 +138,30 @@ const Slippage: React.FC<Props> = ({
<Input
disableUnderline
placeholder='0.00'
className={classes.detailsInfoForm}
className={classNames(
classes.detailsInfoForm,
tierIndex === -1 && classes.activeForm
)}
type={'text'}
value={slippTolerance}
onChange={e => {
allowOnlyDigitsAndTrimUnnecessaryZeros(e)
checkSlippage(e)
setTierIndex(-1)
}}
ref={inputRef}
onBlur={() => {
setSlippTolerance(Number(slippTolerance).toFixed(2))
setSlippage(String(Number(slippTolerance).toFixed(2)))
}}
startAdornment='Custom'
endAdornment={
<>
%
<button
className={classes.detailsInfoBtn}
onClick={() => {
const tierIndex = slippageTiers.findIndex(
tier => String(Number(tier).toFixed(2)) === defaultSlippage
)
setTierIndex(tierIndex)

if (tierIndex !== -1) {
setSlippTolerance('')
} else {
setSlippTolerance(defaultSlippage)
}

setSlippage(defaultSlippage)
setSlippTolerance(Number(slippTolerance).toFixed(2))
setSlippage(String(Number(slippTolerance).toFixed(2)))
setTierIndex(-1)
handleClose()
}}>
Auto
Save
</button>
</>
}
Expand Down
3 changes: 3 additions & 0 deletions src/components/Modals/Slippage/style.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@ export const useStyles = makeStyles()(() => {
outline: 'none'
}
},
activeForm: {
outline: `1px solid ${colors.invariant.light}`
},
innerInput: {
paddingBlock: 0,
textAlign: 'right'
Expand Down
14 changes: 12 additions & 2 deletions src/components/NewPosition/DepositSelector/DepositSelector.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,8 @@ export const DepositSelector: React.FC<IDepositSelector> = ({
const [tokenA, setTokenA] = useState<string | null>(null)
const [tokenB, setTokenB] = useState<string | null>(null)

const [hideUnknownTokens, setHideUnknownTokens] = useState<boolean>(initialHideUnknownTokensValue)

const [isLoaded, setIsLoaded] = useState<boolean>(false)

useEffect(() => {
Expand Down Expand Up @@ -225,7 +227,11 @@ export const DepositSelector: React.FC<IDepositSelector> = ({
sliceName
commonTokens={commonTokens}
initialHideUnknownTokensValue={initialHideUnknownTokensValue}
onHideUnknownTokensChange={onHideUnknownTokensChange}
onHideUnknownTokensChange={e => {
onHideUnknownTokensChange(e)
setHideUnknownTokens(e)
}}
hiddenUnknownTokens={hideUnknownTokens}
/>
</Grid>

Expand Down Expand Up @@ -266,7 +272,11 @@ export const DepositSelector: React.FC<IDepositSelector> = ({
sliceName
commonTokens={commonTokens}
initialHideUnknownTokensValue={initialHideUnknownTokensValue}
onHideUnknownTokensChange={onHideUnknownTokensChange}
onHideUnknownTokensChange={e => {
onHideUnknownTokensChange(e)
setHideUnknownTokens(e)
}}
hiddenUnknownTokens={hideUnknownTokens}
/>
</Grid>
</Grid>
Expand Down
8 changes: 1 addition & 7 deletions src/components/NewPosition/NewPosition.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,7 @@ import { PERCENTAGE_DENOMINATOR } from '@invariant-labs/a0-sdk/target/consts'
import { Box, Button, Grid, Hidden, Typography } from '@mui/material'
import backIcon from '@static/svg/back-arrow.svg'
import settingIcon from '@static/svg/settings.svg'
import {
ALL_FEE_TIERS_DATA,
DEFAULT_NEW_POSITION_SLIPPAGE,
PositionTokenBlock,
REFRESHER_INTERVAL
} from '@store/consts/static'
import { ALL_FEE_TIERS_DATA, PositionTokenBlock, REFRESHER_INTERVAL } from '@store/consts/static'
import {
calcPriceBySqrtPrice,
calculateConcentrationRange,
Expand Down Expand Up @@ -545,7 +540,6 @@ export const NewPosition: React.FC<INewPosition> = ({
setSlippage={setSlippage}
handleClose={handleCloseSettings}
anchorEl={anchorEl}
defaultSlippage={DEFAULT_NEW_POSITION_SLIPPAGE}
initialSlippage={initialSlippage}
infoText='Slippage tolerance is a pricing difference between the price at the confirmation time and the actual price of the transaction users are willing to accept when initializing position.'
headerText='Position Settings'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,9 @@ const SinglePositionInfo: React.FC<IProp> = ({
alt={xToY ? tokenY.name : tokenX.name}
/>
<Grid className={classes.namesGrid}>
<Typography className={classes.name}>{xToY ? tokenX.name : tokenY.name}</Typography>
<Typography id='pause' className={classes.name}>
-
<Typography className={classes.name}>
{xToY ? tokenX.name : tokenY.name} - {xToY ? tokenY.name : tokenX.name}
</Typography>
<Typography className={classes.name}>{xToY ? tokenY.name : tokenX.name}</Typography>
</Grid>
<Grid className={classes.rangeGrid}>
<Tooltip
Expand Down
22 changes: 12 additions & 10 deletions src/components/PositionDetails/SinglePositionInfo/style.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ export const useStyles = makeStyles()((theme: Theme) => ({
},
arrowIcon: {
width: 32,
marginRight: 8,
marginLeft: 8,
marginRight: 4,
marginLeft: 4,
height: 32,
borderRadius: '100%',
padding: 4,
Expand Down Expand Up @@ -56,7 +56,7 @@ export const useStyles = makeStyles()((theme: Theme) => ({
rangeGrid: {
display: 'flex',
flexDirection: 'row',
paddingRight: 10
paddingRight: 4
},
header: {
display: 'flex',
Expand All @@ -77,10 +77,11 @@ export const useStyles = makeStyles()((theme: Theme) => ({
}
},
feeText: {
marginLeft: 12,
minWidth: 90,
marginLeft: 8,
paddingInline: 6,
minWidth: 66,

[theme.breakpoints.down('sm')]: {
[theme.breakpoints.down('md')]: {
minWidth: 84
}
},
Expand All @@ -93,7 +94,7 @@ export const useStyles = makeStyles()((theme: Theme) => ({
flexDirection: 'row',
justifyContent: 'center',
alignItems: 'center',
paddingLeft: 8,
paddingLeft: 4,
'& #pause': {
padding: ' 0px 3px'
},
Expand All @@ -105,8 +106,8 @@ export const useStyles = makeStyles()((theme: Theme) => ({
name: {
...typography.heading3,
color: colors.invariant.text,
lineHeight: '28px',

textWrap: 'nowrap',
fontSize: 22,
[theme.breakpoints.down('sm')]: {
...typography.heading4
}
Expand Down Expand Up @@ -251,11 +252,12 @@ export const useStyles = makeStyles()((theme: Theme) => ({
color: colors.invariant.dark,
background: colors.invariant.greenLinearGradientOpacity,
height: 36,
width: 116,
width: 110,
textTransform: 'none',
transition: '300ms',
paddingInline: 0,
borderRadius: 12,
textWrap: 'nowrap',
...typography.body1,

'&:hover': {
Expand Down
Loading
Loading