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

fix position list pagination bugs #571

Merged
merged 11 commits into from
Jan 31, 2024
Merged

fix position list pagination bugs #571

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b18326f
Merge pull request #555 from invariant-labs/dev
wojciech-cichocki Jan 4, 2024
9631635
Merge pull request #560 from invariant-labs/staging
wojciech-cichocki Jan 4, 2024
a16e9a5
Merge pull request #563 from invariant-labs/dev
wojciech-cichocki Jan 15, 2024
5c4ef3f
Merge pull request #564 from invariant-labs/staging
wojciech-cichocki Jan 15, 2024
c9121e8
Merge pull request #567 from invariant-labs/dev
wojciech-cichocki Jan 19, 2024
1c9448e
Merge pull request #568 from invariant-labs/staging
wojciech-cichocki Jan 19, 2024
cf18ae1
Merge pull request #569 from invariant-labs/dev
wojciech-cichocki Jan 24, 2024
a6d3cfb
Merge pull request #570 from invariant-labs/staging
wojciech-cichocki Jan 24, 2024
e4d6625
fix position list pagination bugs
zielvna Jan 26, 2024
0c2db99
make pagination reset to page 1 when position list is empty
zielvna Jan 29, 2024
2aa1b95
fix pagination when removing position
zielvna Jan 30, 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
4 changes: 4 additions & 0 deletions src/components/PositionsList/PositionsList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,10 @@ export const PositionsList: React.FC<IProp> = ({
setPage(initialPage)
}, [])

useEffect(() => {
handleChangePagination(initialPage)
}, [initialPage])

return (
<Grid container direction='column' className={classes.root}>
<Grid
Expand Down
8 changes: 7 additions & 1 deletion src/containers/WrappedPositionsList/WrappedPositionsList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
} from '@selectors/positions'
import { status } from '@selectors/solanaWallet'
import { openWalletSelectorModal } from '@web3/selector'
import React, { useState } from 'react'
import React, { useEffect, useState } from 'react'
import { useDispatch, useSelector } from 'react-redux'
import { useHistory } from 'react-router-dom'

Expand All @@ -34,6 +34,12 @@ export const WrappedPositionsList: React.FC = () => {
dispatch(actions.setLastPage(page))
}

useEffect(() => {
if (lastPage > Math.ceil(list.length / 5)) {
zielvna marked this conversation as resolved.
Show resolved Hide resolved
setLastPage(Math.ceil(list.length / 5))
}
}, [list])

return (
<PositionsList
initialPage={lastPage}
Expand Down
Loading