Skip to content

Commit 4740bd7

Browse files
marcelinesfelicio
andauthored
update sticky bar for assets and collectibles (#665)
Co-authored-by: Felicio <[email protected]>
1 parent d6665d9 commit 4740bd7

File tree

22 files changed

+421
-220
lines changed

22 files changed

+421
-220
lines changed

.changeset/fair-ties-repeat.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
'@status-im/wallet': patch
3+
'portfolio': patch
4+
'wallet': patch
5+
---
6+
7+
update sticky bar for assets and collectibles

apps/portfolio/src/app/[address]/@detail/assets/[ticker]/_components/network-breakdown.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
'use client'
22

3-
import { CurrencyAmount } from '../../../../../_components/currency-amount'
4-
import { NetworkLogo } from '../../../../../_components/network-logo'
3+
import { CurrencyAmount, NetworkLogo } from '@status-im/wallet/components'
54

65
import type { ApiOutput, NetworkType } from '@status-im/wallet/data'
76

apps/portfolio/src/app/[address]/@detail/assets/[ticker]/page.tsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,19 @@ import { Suspense } from 'react'
22

33
import { Button, Tooltip } from '@status-im/components'
44
import { BuyIcon, ReceiveBlurIcon } from '@status-im/icons/20'
5-
import { StickyHeaderContainer } from '@status-im/wallet/components'
5+
import {
6+
Balance,
7+
CurrencyAmount,
8+
StickyHeaderContainer,
9+
} from '@status-im/wallet/components'
610
import { cx } from 'class-variance-authority'
711
import { notFound } from 'next/navigation'
812
import { MDXRemote } from 'next-mdx-remote/rsc'
913
import { ErrorBoundary } from 'react-error-boundary'
1014

1115
import { getAPIClient } from '../../../../..//data/api'
12-
import { Balance } from '../../../../_components/balance'
1316
import { BuyCryptoDrawer } from '../../../../_components/buy-crypto-drawer'
1417
import { portfolioComponents } from '../../../../_components/content'
15-
import { CurrencyAmount } from '../../../../_components/currency-amount'
1618
import { ReceiveCryptoDrawer } from '../../../../_components/receive-crypto-drawer'
1719
import { TokenAmount } from '../../../../_components/token-amount'
1820
import { Chart } from '../_components/chart'

apps/portfolio/src/app/[address]/@detail/collectibles/[network]/[contract]/[id]/page.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@
33
import { Button } from '@status-im/components'
44
import { ExternalIcon, OptionsIcon, SadIcon } from '@status-im/icons/20'
55
import { OpenseaIcon } from '@status-im/icons/social'
6+
import { CurrencyAmount, NetworkLogo } from '@status-im/wallet/components'
67

78
import { getAPIClient } from '../../../../../../../data/api'
8-
import { CurrencyAmount } from '../../../../../../_components/currency-amount'
9-
import { NetworkLogo } from '../../../../../../_components/network-logo'
109
import { ImageLightbox } from './_components/image-lightbox'
1110
import { InfoCard } from './_components/info-card'
1211

apps/portfolio/src/app/[address]/@list/@balance/default.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
import { Balance } from '@status-im/wallet/components'
2+
13
import { getAPIClient } from '../../../../data/api'
2-
import { Balance } from '../../../_components/balance'
34

45
import type { NetworkType } from '@status-im/wallet/data'
56

apps/portfolio/src/app/[address]/@list/collectibles/_components/collectibles-table.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import { useMemo } from 'react'
55
import { CollectiblesGrid as CollectiblesList } from '@status-im/wallet/components'
66
import { useInfiniteQuery } from '@tanstack/react-query'
77
import { usePathname, useSearchParams } from 'next/navigation'
8-
import { Link } from 'src/app/_components/link'
98

9+
import { Link } from '../../../../_components/link'
1010
import { DEFAULT_SORT } from '../../../../_constants'
1111
import { useSearchAndSort } from '../../../../_hooks/use-search-and-sort'
1212

apps/portfolio/src/app/_components/action-buttons.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@
22

33
import { Input } from '@status-im/components'
44
import { SearchIcon } from '@status-im/icons/20'
5-
import { TabLink } from '@status-im/wallet/components'
5+
import { DropdownSort, TabLink } from '@status-im/wallet/components'
66
import NextLink from 'next/link'
77
import { useParams, usePathname } from 'next/navigation'
88
import { match, P } from 'ts-pattern'
99

1010
import { useSearchAndSort } from '../_hooks/use-search-and-sort'
11-
import { AdminDropdownSort } from './dropdown-sort'
1211

1312
const checkPathnameAndReturnTabValue = (
1413
pathname: string
@@ -67,7 +66,7 @@ const ActionButtons = () => {
6766
clearable={!!inputValue}
6867
aria-label="Search"
6968
/>
70-
<AdminDropdownSort
69+
<DropdownSort
7170
data={sortOptions}
7271
onOrderByChange={onOrderByChange}
7372
orderByColumn={orderByColumn}

apps/portfolio/src/app/_components/currency-amount.tsx

Lines changed: 0 additions & 65 deletions
This file was deleted.

apps/portfolio/src/app/_components/sidenav.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
import { Avatar } from '@status-im/components'
44
import { InsightsIcon } from '@status-im/icons/20'
5+
import { CurrencyAmount } from '@status-im/wallet/components'
56
import { cva, cx } from 'class-variance-authority'
67
import Link from 'next/link'
78
import { usePathname } from 'next/navigation'
89

910
import { Tooltip } from '../_components/tooltip'
1011
import { useMediaQuery } from '../_hooks/use-media-query'
1112
import { AddAddress } from './add-address'
12-
import { CurrencyAmount } from './currency-amount'
1313
import { FeatureEnabled } from './feature-enabled'
1414

1515
import type { CustomisationColorType } from '@status-im/components'

apps/wallet/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
"react-hook-form": "^7.54.2",
5757
"superjson": "^2.2.1",
5858
"trpc-chrome": "^1.0.0",
59+
"ts-pattern": "^5.7.1",
5960
"vite-plugin-node-polyfills": "^0.23.0",
6061
"zod": "^3.23.8"
6162
},

0 commit comments

Comments
 (0)