Skip to content

Commit

Permalink
Fix Stories and FilterSearch
Browse files Browse the repository at this point in the history
  • Loading branch information
@kuba80-02
kuba80-02 committed Mar 3, 2025
1 parent 5cac75a commit 577f837
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 165 deletions.
4 changes: 2 additions & 2 deletions src/components/FilterSearch/FilterSearch.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ import { swapTokens } from '@store/selectors/solanaWallet'
import icons from '@static/icons'
import { tokensStatsWithTokensDetails } from '@store/selectors/stats'
import ListboxComponent from './Helpers/ListBoxComponent'
import { BN } from '@coral-xyz/anchor'
import { getTokenPrice, printBN } from '@utils/utils'
import { PublicKey } from '@solana/web3.js'
import { BN } from '@project-serum/anchor'

type Breakpoint = 'md' | 'sm'

Expand Down Expand Up @@ -108,7 +108,7 @@ export const FilterSearch: React.FC<IFilterSearch> = memo(
})
const results = await Promise.all(pricePromises)
const newPrices: Record<string, number> = {}
results.forEach(({ tokenAddress, price }) => {
results.forEach(({ tokenAddress, price: { price } }) => {
if (price !== undefined) {
newPrices[tokenAddress] = price
}
Expand Down
36 changes: 2 additions & 34 deletions src/components/PositionsList/PositionItem/PositionItem.stories.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import { NetworkType } from '@store/consts/static'

import type { Meta, StoryObj } from '@storybook/react'
import { Keypair } from '@solana/web3.js'
import { BN } from '@coral-xyz/anchor'
import { PositionItemMobile } from './variants/PositionMobileCard/PositionItemMobile'
import { fn } from '@storybook/test'
import { BN } from '@project-serum/anchor'

const meta = {
title: 'Components/PositionItem',
Expand Down Expand Up @@ -44,36 +44,6 @@ export const Primary: Story = {
liquidity: new BN(0)
},
valueY: 2137.4,
liquidity: new BN(0),
poolAddress: Keypair.generate().publicKey,

poolData: {
address: Keypair.generate().publicKey,
bump: 0,
currentTickIndex: 0,
fee: new BN(0),
feeGrowthGlobalX: new BN(0),
feeProtocolTokenX: new BN(0),
feeProtocolTokenY: new BN(0),
feeReceiver: Keypair.generate().publicKey,
lastTimestamp: new BN(0),
oracleAddress: Keypair.generate().publicKey,
oracleInitialized: true,
liquidity: new BN(0),
poolIndex: 0,
positionIterator: new BN(0),
protocolFee: new BN(0),
secondsPerLiquidityGlobal: new BN(0),
sqrtPrice: new BN(0),
startTimestamp: new BN(0),
tickmap: Keypair.generate().publicKey,
tickSpacing: 0,
tokenX: Keypair.generate().publicKey,
tokenY: Keypair.generate().publicKey,
tokenXReserve: Keypair.generate().publicKey,
tokenYReserve: Keypair.generate().publicKey,
feeGrowthGlobalY: new BN(0)
},

id: '0',
address: '',
Expand All @@ -82,9 +52,7 @@ export const Primary: Story = {
currentPrice: 10000,
network: NetworkType.Testnet,
isFullRange: false,
isLocked: false,
handleClaimFee: fn(),
handleClosePosition: fn(),
handleLockPosition: fn()
handleClosePosition: fn()
}
}
135 changes: 6 additions & 129 deletions src/components/PositionsList/PositionsList.stories.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import { BrowserRouter } from 'react-router-dom'
import { PositionsList } from './PositionsList'
import { NetworkType } from '@store/consts/static'
import { Keypair } from '@solana/web3.js'
import { BN } from '@coral-xyz/anchor'
import { IPositionItem } from './types'
import { fn } from '@storybook/test'
import { BN } from '@project-serum/anchor'

const meta = {
title: 'Components/PositionsList',
Expand Down Expand Up @@ -51,42 +51,12 @@ const data: IPositionItem[] = [
'https://raw.githubusercontent.com/solana-labs/token-list/main/assets/mainnet/EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v/logo.png',
min: 2149.6,
max: 149.6,
liquidity: 453.5,
poolAddress: Keypair.generate().publicKey,
poolData: {
address: Keypair.generate().publicKey,
bump: 0,
currentTickIndex: 0,
fee: new BN(0),
feeGrowthGlobalX: new BN(0),
feeProtocolTokenX: new BN(0),
feeProtocolTokenY: new BN(0),
feeReceiver: Keypair.generate().publicKey,
lastTimestamp: new BN(0),
oracleAddress: Keypair.generate().publicKey,
oracleInitialized: true,
liquidity: new BN(0),
poolIndex: 0,
positionIterator: new BN(0),
protocolFee: new BN(0),
secondsPerLiquidityGlobal: new BN(0),
sqrtPrice: new BN(0),
startTimestamp: new BN(0),
tickmap: Keypair.generate().publicKey,
tickSpacing: 0,
tokenX: Keypair.generate().publicKey,
tokenY: Keypair.generate().publicKey,
tokenXReserve: Keypair.generate().publicKey,
tokenYReserve: Keypair.generate().publicKey,
feeGrowthGlobalY: new BN(0)
},
fee: 0.05,
tokenXLiq: 5000,
tokenYLiq: 300.2,
valueX: 10000.45,
valueY: 21370.4,
id: '1',
isLocked: false
id: '1'
},
{
address: 'So11111111111111111111111111111111111111112',
Expand Down Expand Up @@ -121,37 +91,7 @@ const data: IPositionItem[] = [
tokenYLiq: 300.2,
valueX: 10000.45,
valueY: 21370.4,
id: '2',
isLocked: false,
liquidity: new BN(0),
poolAddress: Keypair.generate().publicKey,
poolData: {
address: Keypair.generate().publicKey,
bump: 0,
currentTickIndex: 0,
fee: new BN(0),
feeGrowthGlobalX: new BN(0),
feeProtocolTokenX: new BN(0),
feeProtocolTokenY: new BN(0),
feeReceiver: Keypair.generate().publicKey,
lastTimestamp: new BN(0),
oracleAddress: Keypair.generate().publicKey,
oracleInitialized: true,
liquidity: new BN(0),
poolIndex: 0,
positionIterator: new BN(0),
protocolFee: new BN(0),
secondsPerLiquidityGlobal: new BN(0),
sqrtPrice: new BN(0),
startTimestamp: new BN(0),
tickmap: Keypair.generate().publicKey,
tickSpacing: 0,
tokenX: Keypair.generate().publicKey,
tokenY: Keypair.generate().publicKey,
tokenXReserve: Keypair.generate().publicKey,
tokenYReserve: Keypair.generate().publicKey,
feeGrowthGlobalY: new BN(0)
}
id: '2'
},
{
address: 'So11111111111111111111111111111111111111112',
Expand Down Expand Up @@ -186,37 +126,7 @@ const data: IPositionItem[] = [
tokenYLiq: 300.2,
valueX: 10000.45,
valueY: 21370.4,
id: '3',
isLocked: false,
liquidity: new BN(0),
poolAddress: Keypair.generate().publicKey,
poolData: {
address: Keypair.generate().publicKey,
bump: 0,
currentTickIndex: 0,
fee: new BN(0),
feeGrowthGlobalX: new BN(0),
feeProtocolTokenX: new BN(0),
feeProtocolTokenY: new BN(0),
feeReceiver: Keypair.generate().publicKey,
lastTimestamp: new BN(0),
oracleAddress: Keypair.generate().publicKey,
oracleInitialized: true,
liquidity: new BN(0),
poolIndex: 0,
positionIterator: new BN(0),
protocolFee: new BN(0),
secondsPerLiquidityGlobal: new BN(0),
sqrtPrice: new BN(0),
startTimestamp: new BN(0),
tickmap: Keypair.generate().publicKey,
tickSpacing: 0,
tokenX: Keypair.generate().publicKey,
tokenY: Keypair.generate().publicKey,
tokenXReserve: Keypair.generate().publicKey,
tokenYReserve: Keypair.generate().publicKey,
feeGrowthGlobalY: new BN(0)
}
id: '3'
},
{
address: 'So11111111111111111111111111111111111111112',
Expand Down Expand Up @@ -251,37 +161,7 @@ const data: IPositionItem[] = [
tokenYLiq: 300.2,
valueX: 10000.45,
valueY: 21370.4,
id: '4',
isLocked: false,
liquidity: new BN(0),
poolAddress: Keypair.generate().publicKey,
poolData: {
address: Keypair.generate().publicKey,
bump: 0,
currentTickIndex: 0,
fee: new BN(0),
feeGrowthGlobalX: new BN(0),
feeProtocolTokenX: new BN(0),
feeProtocolTokenY: new BN(0),
feeReceiver: Keypair.generate().publicKey,
lastTimestamp: new BN(0),
oracleAddress: Keypair.generate().publicKey,
oracleInitialized: true,
liquidity: new BN(0),
poolIndex: 0,
positionIterator: new BN(0),
protocolFee: new BN(0),
secondsPerLiquidityGlobal: new BN(0),
sqrtPrice: new BN(0),
startTimestamp: new BN(0),
tickmap: Keypair.generate().publicKey,
tickSpacing: 0,
tokenX: Keypair.generate().publicKey,
tokenY: Keypair.generate().publicKey,
tokenXReserve: Keypair.generate().publicKey,
tokenYReserve: Keypair.generate().publicKey,
feeGrowthGlobalY: new BN(0)
}
id: '4'
}
]

Expand All @@ -292,7 +172,6 @@ const handleClick = () => {
export const Primary: Story = {
args: {
data,
lockedData: data,
onAddPositionClick: handleClick,
itemsPerPage: 5,
noConnectedBlockerProps: {
Expand All @@ -303,10 +182,8 @@ export const Primary: Story = {
initialPage: 1,
setLastPage: () => {},
length: 0,
lockedLength: 0,
noInitialPositions: false,
handleClaimFee: fn(),
handleClosePosition: fn(),
handleLockPosition: fn()
handleClosePosition: fn()
}
}

0 comments on commit 577f837

Please sign in to comment.