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

feat: STX NFTs Tab #634

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
82e7922
Add hook to get nft collection data
Imamah-Zafar Oct 31, 2023
119379c
Merge branch 'develop' into imamahzafar/eng-2807-stacks-nft-tab-data-…
teebszet Nov 1, 2023
6b75504
Update stx collectible UI
Imamah-Zafar Nov 1, 2023
e3d9c98
Merge branch 'develop' of https://github.com/secretkeylabs/xverse-web…
Imamah-Zafar Nov 1, 2023
e5e6b4f
Make NFT collage for collections
Imamah-Zafar Nov 1, 2023
311ad19
Merge branch 'imamahzafar/eng-2807-stacks-nft-tab-data-fetching-pagin…
Imamah-Zafar Nov 1, 2023
1ff84e7
Fix on click function
Imamah-Zafar Nov 1, 2023
9c03895
fix import
Imamah-Zafar Nov 1, 2023
f787afb
Merge branch 'develop' into imamahzafar/eng-2807-stacks-nft-tab-data-…
Imamah-Zafar Nov 2, 2023
d7a9d83
Update NFT Collection Page & NFT Detail Page (#633)
Imamah-Zafar Nov 3, 2023
910920b
refactor: use array for cache key
teebszet Nov 3, 2023
7885009
Turn off no-nested-ternary rule globally
Imamah-Zafar Nov 3, 2023
ba61a56
Move nft util functions to a seperate file
Imamah-Zafar Nov 3, 2023
cac3562
fix: remove unnecessary use mutation in nft details
teebszet Nov 6, 2023
fadb17d
fix: add the useResetUserFlow hook to nft collection page
teebszet Nov 6, 2023
622b671
refactor: remove nftData from redux store
teebszet Nov 7, 2023
a5ee0b1
fix: add isLoading state back to nftdetail and route to send with id
teebszet Nov 7, 2023
e653750
fix: react console errors and send nft finishes at dashboard screen
teebszet Nov 7, 2023
7548d71
feat: add sticky tabs to collectibles dashboard
teebszet Nov 7, 2023
6e30912
refactor: separate use nft dashboard to separate file
teebszet Nov 7, 2023
204db2b
fix: bns detail page works
teebszet Nov 7, 2023
92b7d39
chore: use core version with some updates
teebszet Nov 7, 2023
a763c09
fix: make bns names in collection screen not clickable and display name
teebszet Nov 9, 2023
debac02
chore: enable stx test address from localstorage
teebszet Nov 9, 2023
cef10d3
fix: button width for gallery view (#650)
abdulhaseeb4239 Nov 10, 2023
fd4203d
fix: open NFT gamma link (#649)
abdulhaseeb4239 Nov 10, 2023
0d15b3f
fix: show snackbar if NFT metadata is failed to fetch (#648)
abdulhaseeb4239 Nov 13, 2023
2e49ba3
feat: revamp stacks nfts send to screen (#653)
teebszet Nov 13, 2023
ec5d63b
fix: some nft images are still showing the moon loader spinner it sho…
fedeerbes Nov 13, 2023
cc4f75e
Merge remote-tracking branch 'origin/develop' into imamahzafar/eng-28…
teebszet Nov 13, 2023
6826485
fix: NFT detail screen UI (#655)
abdulhaseeb4239 Nov 14, 2023
957f17b
feat: hook items count with correct values (#658)
fedeerbes Nov 14, 2023
cd829c4
fix: column gap on tiles skeleton loader
teebszet Nov 14, 2023
fe49911
chore: update core version
teebszet Nov 14, 2023
09870db
chore: follow i18n next doc about plurals (#661)
fedeerbes Nov 14, 2023
21b362c
fix: extension crashes when closing the broadcast success screen (#662)
teebszet Nov 15, 2023
2709d18
fix: z index on sticky tabs list and modals, popups (#665)
teebszet Nov 16, 2023
70bd9c3
refactor: collectibles fetch (#666)
teebszet Nov 20, 2023
3e3d61a
chore: bump core version with duplicate nft fix
teebszet Nov 20, 2023
7b3fe58
chore: bump core version
teebszet Nov 20, 2023
88e7766
chore: update core version and remove total_nft
teebszet Nov 20, 2023
e046a46
Merge remote-tracking branch 'origin/develop' into imamahzafar/eng-28…
teebszet Nov 21, 2023
c6b23b6
Merge branch 'develop' into imamahzafar/eng-2807-stacks-nft-tab-data-…
teebszet Nov 21, 2023
a9a1728
fix: bns image size and disable click on bns item (#668)
teebszet Nov 21, 2023
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: 5 additions & 19 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,26 +20,20 @@
"sourceType": "module",
"project": "./tsconfig.json"
},
"plugins": [
"react",
"prettier",
"eslint-plugin-no-inline-styles",
"@tanstack/query"
],
"plugins": ["react", "prettier", "eslint-plugin-no-inline-styles", "@tanstack/query"],
"rules": {
"consistent-return": "off",
"import/prefer-default-export": 1,
"no-restricted-imports": [
"warn",
{
"patterns": [
"@secretkeylabs/xverse-core/**/*"
]
"patterns": ["@secretkeylabs/xverse-core/**/*"]
}
],
"no-promise-executor-return": "warn",
"max-len": "off",
"no-inline-styles/no-inline-styles": 2,
"no-nested-ternary": "off",
"no-param-reassign": "off",
"react-hooks/exhaustive-deps": "warn",
"react/jsx-key": "warn",
Expand All @@ -61,16 +55,8 @@
"settings": {
"import/resolver": {
"node": {
"extensions": [
".js",
".jsx",
".ts",
".tsx"
],
"moduleDirectory": [
"node_modules",
"src/"
]
"extensions": [".js", ".jsx", ".ts", ".tsx"],
"moduleDirectory": ["node_modules", "src/"]
}
}
}
Expand Down
144 changes: 50 additions & 94 deletions package-lock.json

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

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"@ledgerhq/hw-transport-webusb": "^6.27.13",
"@phosphor-icons/react": "^2.0.10",
"@react-spring/web": "^9.6.1",
"@secretkeylabs/xverse-core": "2.3.2-a791a1d",
"@secretkeylabs/xverse-core": "3.0.0",
"@stacks/connect": "^6.10.2",
"@stacks/encryption": "4.3.5",
"@stacks/stacks-blockchain-api-types": "6.1.1",
Expand Down Expand Up @@ -46,6 +46,7 @@
"react-dom": "^18.2.0",
"react-hot-toast": "^2.4.0",
"react-i18next": "^11.18.6",
"react-is-visible": "^1.2.0",
"react-modal": "^3.15.1",
"react-number-format": "^5.0.0",
"react-qr-code": "^2.0.8",
Expand Down
8 changes: 4 additions & 4 deletions src/app/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@ import LoadingScreen from '@components/loadingScreen';
import rootStore from '@stores/index';
import { QueryClientProvider } from '@tanstack/react-query';
import { ReactQueryDevtools } from '@tanstack/react-query-devtools';
import { MIX_PANEL_TOKEN } from '@utils/constants';
import { queryClient } from '@utils/query';
import mixpanel from 'mixpanel-browser';
import { useEffect } from 'react';
import { Toaster } from 'react-hot-toast';
import { Provider } from 'react-redux';
import { RouterProvider } from 'react-router-dom';
import { PersistGate } from 'redux-persist/integration/react';
import { ThemeProvider } from 'styled-components';
import '../locales';
import { useEffect } from 'react';
import mixpanel from 'mixpanel-browser';
import { MIX_PANEL_TOKEN } from '@utils/constants';
import Theme from '../theme';
import GlobalStyle from '../theme/global';
import SessionGuard from './components/guards/session';
Expand Down Expand Up @@ -40,7 +40,7 @@ function App(): JSX.Element {
<SessionGuard>
<ThemeProvider theme={Theme}>
<RouterProvider router={router} />
<Toaster position="bottom-center" containerStyle={{ bottom: 80 }} />
<Toaster position="bottom-center" />
</ThemeProvider>
</SessionGuard>
</PersistGate>
Expand Down
5 changes: 2 additions & 3 deletions src/app/components/barLoader/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ export function BetterBarLoader({
height,
className,
}: {
width: number;
height: number;
width: number | string;
height: number | string;
className?: string;
}) {
return (
Expand All @@ -88,7 +88,6 @@ export function BetterBarLoader({
interval={0.1}
width={width}
height={height}
viewBox={`0 0 ${width} ${height}`}
backgroundColor={Theme.colors.elevation3}
foregroundColor={Theme.colors.grey}
className={className}
Expand Down
4 changes: 2 additions & 2 deletions src/app/components/bundleAsset/bundleAsset.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import RareSatAsset from '@components/rareSatAsset/rareSatAsset';
import { Bundle } from '@utils/rareSats';
import styled from 'styled-components';

import RareSatsCollage from './rareSatsCollage';
import CollectibleCollage from '../collectibleCollage/collectibleCollage';

const ImageContainer = styled.div`
display: flex;
Expand All @@ -29,7 +29,7 @@ function BundleAsset({ bundle }: Props) {
return (
<ImageContainer>
{isMoreThanOneItem ? (
<RareSatsCollage items={bundle.items} />
<CollectibleCollage items={bundle.items} />
) : (
<IndividualAssetContainer>
<RareSatAsset item={bundle.items[0]} />
Expand Down
Loading
Loading