Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
39bd123
add ability to change network and use custom rpc on each one
zielvna Aug 28, 2024
9a0cc5e
add ability to switch between networks
zielvna Aug 29, 2024
a7b1da6
fix build
zielvna Aug 29, 2024
8c30227
fix default rpc when changing networks
zielvna Aug 30, 2024
40c0b86
prevent app from refreshing on rpc address change
zielvna Aug 30, 2024
4f248d6
add faucet to mainnet
zielvna Aug 30, 2024
6c4870c
add faucet and rpc to mobile menu on mainnet and make initial tokens …
zielvna Aug 30, 2024
89730b0
remove unnecessary use effect
zielvna Aug 30, 2024
fd766b4
change rpcs names
zielvna Sep 2, 2024
123b245
remove unused variables
zielvna Sep 2, 2024
430927d
Merge branch 'master' into mainnet-support
zielvna Sep 2, 2024
b95c005
fix build
zielvna Sep 2, 2024
1598b7a
fix calculate amount in with slippage function
zielvna Sep 2, 2024
1583f3b
Merge pull request #288 from invariant-labs/mainnet-support
zielvna Sep 3, 2024
ff6f244
remove unnecessary saga
zielvna Sep 5, 2024
d92618a
refactor handle get current plot ticks saga
zielvna Sep 5, 2024
8fb51d1
refactor handle get positions list page
zielvna Sep 5, 2024
c8f91a6
refactor fetch balances
zielvna Sep 5, 2024
f0546cb
fix swap page saga calls
zielvna Sep 5, 2024
57a4d14
refactor fetch tokens
zielvna Sep 5, 2024
dc81662
fix new position saga calls
zielvna Sep 5, 2024
feddc65
fix position details saga calls
zielvna Sep 6, 2024
554d312
fix wallet reconnect
zielvna Sep 6, 2024
169e907
allow user to type uppercase in search position input
zielvna Sep 6, 2024
e1d0219
fix token price data in deposit selector
zielvna Sep 6, 2024
517bf10
Merge branch 'dev' into refactor-position-page-sagas
zielvna Sep 6, 2024
a128b45
fix ticks not refreshing after swap
zielvna Sep 9, 2024
d01b4c2
fix position list being glitched after refresh if one of the position…
zielvna Sep 9, 2024
39a0d6d
update wallet sagas
zielvna Sep 9, 2024
739d45c
fix build
zielvna Sep 9, 2024
1e63678
refactor wallet sagas
zielvna Sep 9, 2024
60bff87
remove duplicated icon names
p6te Sep 10, 2024
fe7ed57
Merge pull request #293 from invariant-labs/fix-duplicated-file-names
p6te Sep 10, 2024
1cb6f32
fix chart glitching after pool creation
zielvna Sep 10, 2024
55a0746
add little delay to init saga before wallet connect
zielvna Sep 10, 2024
b7be31c
fix build
zielvna Sep 10, 2024
c46faef
add delay only when reconnecting
zielvna Sep 11, 2024
f59b0d0
Merge pull request #294 from invariant-labs/fix-wallet-reconnect
zielvna Sep 11, 2024
38a220d
add stats page
zielvna Sep 12, 2024
6c05c44
fix build
zielvna Sep 12, 2024
fe6dd11
bump sdk version
zielvna Sep 12, 2024
890f556
fix mainnet stats
zielvna Sep 12, 2024
1f00165
add prices to common tokens
zielvna Sep 12, 2024
1dec1a9
fix build
zielvna Sep 12, 2024
5d7daf4
Merge pull request #290 from invariant-labs/refactor-position-page-sagas
zielvna Sep 13, 2024
004eb9b
refactor stats
zielvna Sep 13, 2024
9e1c49a
Merge pull request #296 from invariant-labs/add-stats-page
zielvna Sep 13, 2024
d0ae21e
feat: add tooltip to close position button for fee information; adjus…
kuba80-02 Sep 13, 2024
acb7f83
Update src/components/PositionDetails/SinglePositionInfo/SinglePositi…
kuba80-02 Sep 15, 2024
6fca5d4
Merge pull request #298 from invariant-labs/close-position-fee-info-t…
kuba80-02 Sep 15, 2024
2283bc7
chore: disabled Stats page and mainnet
kuba80-02 Sep 16, 2024
4370551
Merge pull request #299 from invariant-labs/dev-deploy-base
kuba80-02 Sep 16, 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
8 changes: 4 additions & 4 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"dependencies": {
"@emotion/react": "^11.11.4",
"@emotion/styled": "^11.11.5",
"@invariant-labs/a0-sdk": "^0.2.17",
"@invariant-labs/a0-sdk": "^0.2.20",
"@mui/icons-material": "^5.15.15",
"@mui/material": "^5.15.15",
"@nightlylabs/wallet-selector-polkadot": "^0.2.5",
Expand Down
4 changes: 3 additions & 1 deletion src/components/Header/Header.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ export const Primary: Story = {
name: Chain.AlephZero,
address: 'https://azero.invariant.app/swap'
},
onChainSelect: fn()
onChainSelect: fn(),
network: Network.Testnet,
defaultMainnetRPC: 'https://rpc.moonbeam.network'
}
}
74 changes: 53 additions & 21 deletions src/components/Header/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import { Network } from '@invariant-labs/a0-sdk'
import SelectChainButton from './HeaderButton/SelectChainButton'
import { ISelectChain } from '@store/consts/types'
import SelectChain from '@components/Modals/SelectChain/SelectChain'
import SelectMainnetRPC from '@components/Modals/SelectMainnetRPC/SelectMainnetRPC'

export interface IHeader {
address: string
Expand All @@ -35,6 +36,8 @@ export interface IHeader {
onChangeWallet: () => void
activeChain: ISelectChain
onChainSelect: (chain: ISelectChain) => void
network: Network
defaultMainnetRPC: string
}

export const Header: React.FC<IHeader> = ({
Expand All @@ -51,7 +54,9 @@ export const Header: React.FC<IHeader> = ({
onCopyAddress,
onChangeWallet,
activeChain,
onChainSelect
onChainSelect,
network
// defaultMainnetRPC
}) => {
const { classes } = useStyles()
const buttonStyles = useButtonStyles()
Expand Down Expand Up @@ -81,7 +86,15 @@ export const Header: React.FC<IHeader> = ({
{
networkType: Network.Testnet,
rpc: RPC.TEST,
rpcName: 'Aleph Zero'
rpcName: 'Aleph Zero Testnet'
}
]

const mainnetRPCs = [
{
networkType: Network.Mainnet,
rpc: RPC.MAIN,
rpcName: 'Aleph Zero Mainnet'
}
]

Expand Down Expand Up @@ -148,22 +161,23 @@ export const Header: React.FC<IHeader> = ({

<Grid container item className={classes.buttons} wrap='nowrap'>
<Grid container className={classes.leftButtons}>
{typeOfNetwork === Network.Testnet ? (
<Box sx={{ display: { xs: 'none', md: 'block' } }}>
<Button
className={buttonStyles.classes.headerButton}
variant='contained'
sx={{ '& .MuiButton-label': buttonStyles.classes.label }}
onClick={onFaucet}>
Faucet
</Button>
</Box>
) : null}
{typeOfNetwork === Network.Testnet ? (
<Box sx={{ display: { xs: 'none', md: 'block' } }}>
<SelectRPCButton rpc={rpc} networks={testnetRPCs} onSelect={onNetworkSelect} />
</Box>
) : null}
<Box sx={{ display: { xs: 'none', md: 'block' } }}>
<Button
className={buttonStyles.classes.headerButton}
variant='contained'
sx={{ '& .MuiButton-label': buttonStyles.classes.label }}
onClick={onFaucet}>
Faucet
</Button>
</Box>
<Box sx={{ display: { xs: 'none', md: 'block' } }}>
<SelectRPCButton
rpc={rpc}
networks={network === Network.Testnet ? testnetRPCs : mainnetRPCs}
onSelect={onNetworkSelect}
network={network}
/>
</Box>
<Box sx={{ display: { xs: 'none', md: 'block' } }}>
<SelectChainButton
activeChain={activeChain}
Expand All @@ -180,6 +194,12 @@ export const Header: React.FC<IHeader> = ({
rpcName:
testnetRPCs.find(data => data.rpc === defaultTestnetRPC)?.rpcName ?? 'Custom'
}
// {
// networkType: Network.Mainnet,
// rpc: defaultMainnetRPC,
// rpcName:
// mainnetRPCs.find(data => data.rpc === defaultMainnetRPC)?.rpcName ?? 'Custom'
// }
]}
onSelect={onNetworkSelect}
/>
Expand Down Expand Up @@ -231,9 +251,9 @@ export const Header: React.FC<IHeader> = ({
setRoutesModalOpen(false)
unblurContent()
}}
onFaucet={typeOfNetwork === Network.Testnet && isMdDown ? onFaucet : undefined}
onFaucet={isMdDown ? onFaucet : undefined}
onRPC={
typeOfNetwork === Network.Testnet && isMdDown
isMdDown
? () => {
setRoutesModalOpen(false)
setTestnetRpcsOpen(true)
Expand Down Expand Up @@ -261,7 +281,19 @@ export const Header: React.FC<IHeader> = ({
}}
activeRPC={rpc}
/>
) : null}
) : (
<SelectMainnetRPC
networks={mainnetRPCs}
open={testnetRpcsOpen}
anchorEl={routesModalAnchor}
onSelect={onNetworkSelect}
handleClose={() => {
setTestnetRpcsOpen(false)
unblurContent()
}}
activeRPC={rpc}
/>
)}
<SelectChain
chains={CHAINS}
open={chainSelectOpen}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export const Primary: Story = {
rpcName: 'Testnet'
}
],
onSelect: (networkType, rpc) => action('chosen: ' + networkType + ' ' + rpc)()
onSelect: (networkType, rpc) => action('chosen: ' + networkType + ' ' + rpc)(),
network: Network.Testnet
}
}
32 changes: 23 additions & 9 deletions src/components/Header/HeaderButton/SelectRPCButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,21 @@ import { Button } from '@mui/material'
import SelectTestnetRPC from '@components/Modals/SelectTestnetRPC/SelectTestnetRPC'
import KeyboardArrowDownIcon from '@mui/icons-material/KeyboardArrowDown'
import { Network } from '@invariant-labs/a0-sdk'
import SelectMainnetRPC from '@components/Modals/SelectMainnetRPC/SelectMainnetRPC'

export interface IProps {
rpc: string
networks: ISelectNetwork[]
onSelect: (networkType: Network, rpcAddress: string, rpcName?: string) => void
disabled?: boolean
network: Network
}
export const SelectRPCButton: React.FC<IProps> = ({
rpc,
networks,
onSelect,
disabled = false
disabled = false,
network
}) => {
const { classes } = useStyles()
const [anchorEl, setAnchorEl] = React.useState<HTMLButtonElement | null>(null)
Expand Down Expand Up @@ -45,14 +48,25 @@ export const SelectRPCButton: React.FC<IProps> = ({
onClick={handleClick}>
RPC
</Button>
<SelectTestnetRPC
networks={networks}
open={openTestnetRpcs}
anchorEl={anchorEl}
onSelect={onSelect}
handleClose={handleClose}
activeRPC={rpc}
/>
{network === Network.Testnet ? (
<SelectTestnetRPC
networks={networks}
open={openTestnetRpcs}
anchorEl={anchorEl}
onSelect={onSelect}
handleClose={handleClose}
activeRPC={rpc}
/>
) : (
<SelectMainnetRPC
networks={networks}
open={openTestnetRpcs}
anchorEl={anchorEl}
onSelect={onSelect}
handleClose={handleClose}
activeRPC={rpc}
/>
)}
</>
)
}
Expand Down
27 changes: 27 additions & 0 deletions src/components/Modals/SelectMainnetRPC/SelectMainnetRPC.stories.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import type { Meta, StoryObj } from '@storybook/react'
import SelectMainnetRPC from './SelectMainnetRPC'
import { Network } from '@invariant-labs/a0-sdk'

const meta = {
title: 'Modals/SelectRPC',
component: SelectMainnetRPC,
args: {
activeRPC: 'https://mainnet-mock.com',
anchorEl: null,
handleClose: () => {},
networks: [
{
networkType: Network.Mainnet,
rpc: 'https://mainnet-mock.com',
rpcName: 'Mainnet'
}
],
onSelect: () => {},
open: true
}
} satisfies Meta<typeof SelectMainnetRPC>

export default meta
type Story = StoryObj<typeof meta>

export const Primary: Story = {}
Loading
Loading