From fff513bd4b9aed4c56ea6231d3fbfa7bf9187b78 Mon Sep 17 00:00:00 2001 From: Simon Kusterer Date: Thu, 16 Mar 2023 08:21:36 +0100 Subject: [PATCH 01/15] Update .env switched back to teia.rocks teztok instance --- .env | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.env b/.env index 55c9537df..54ee51705 100644 --- a/.env +++ b/.env @@ -5,8 +5,8 @@ VITE_TEIA_REPORT='https://lists.teia.art' VITE_LOGOS='https://raw.githubusercontent.com/teia-community/teia-logos/main/dist' -# VITE_TEIA_GRAPHQL_API='https://teztok.teia.rocks/v1/graphql' -VITE_TEIA_GRAPHQL_API='https://teia-api.teztok.com/v1/graphql' +VITE_TEIA_GRAPHQL_API='https://teztok.teia.rocks/v1/graphql' +# VITE_TEIA_GRAPHQL_API='https://teia-api.teztok.com/v1/graphql' VITE_TZKT_API='https://api.tzkt.io' VITE_TZPROFILES_GRAPHQL_API='https://indexer.tzprofiles.com/v1/graphql' From 362c919ab2d701064ce62e1b79b52ac5db8957e4 Mon Sep 17 00:00:00 2001 From: Simon Kusterer Date: Mon, 20 Mar 2023 14:25:19 +0100 Subject: [PATCH 02/15] added objkt.com swaps to token-history (#274) --- src/data/api.ts | 2 +- src/pages/objkt-display/tabs/History.jsx | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/data/api.ts b/src/data/api.ts index ef6c8a9db..28dd001ff 100644 --- a/src/data/api.ts +++ b/src/data/api.ts @@ -144,7 +144,7 @@ query objkt($id: String!) { tags { tag } - events(where: { _or: [{ implements: {_eq: "SALE"} }, { type: {_in: ["HEN_MINT", "TEIA_SWAP", "HEN_SWAP", "HEN_SWAP_V2", "VERSUM_SWAP", "FA2_TRANSFER"]} }]}, order_by: [{level: desc}, {opid: desc}]) { + events(where: { _or: [{ implements: {_eq: "SALE"} }, { type: {_in: ["HEN_MINT", "TEIA_SWAP", "HEN_SWAP", "HEN_SWAP_V2", "VERSUM_SWAP", "FA2_TRANSFER", "OBJKT_ASK", "OBJKT_ASK_V2"]} }]}, order_by: [{level: desc}, {opid: desc}]) { timestamp implements ophash diff --git a/src/pages/objkt-display/tabs/History.jsx b/src/pages/objkt-display/tabs/History.jsx index 468aa9fad..9876c5d75 100644 --- a/src/pages/objkt-display/tabs/History.jsx +++ b/src/pages/objkt-display/tabs/History.jsx @@ -144,9 +144,14 @@ export const History = () => { ) } if ( - ['TEIA_SWAP', 'HEN_SWAP', 'HEN_SWAP_V2', 'VERSUM_SWAP'].includes( - e.type - ) + [ + 'OBJKT_ASK', + 'OBJKT_ASK_V2', + 'TEIA_SWAP', + 'HEN_SWAP', + 'HEN_SWAP_V2', + 'VERSUM_SWAP', + ].includes(e.type) ) { return ( { (ev) => (ev.implements === 'SALE' || [ + 'OBJKT_ASK', + 'OBJKT_ASK_V2', 'TEIA_SWAP', 'HEN_SWAP', 'HEN_SWAP_V2', From f489ee90e0bc936768a7a049e92dfd2f2ff67ce0 Mon Sep 17 00:00:00 2001 From: merchantcoppola <97635650+merchantcoppola@users.noreply.github.com> Date: Wed, 29 Mar 2023 14:53:09 +0200 Subject: [PATCH 03/15] :sparkles: update fee explainer (#276) --- src/pages/objkt-display/tabs/Swap.jsx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/pages/objkt-display/tabs/Swap.jsx b/src/pages/objkt-display/tabs/Swap.jsx index 7683850a7..cc4a863f9 100644 --- a/src/pages/objkt-display/tabs/Swap.jsx +++ b/src/pages/objkt-display/tabs/Swap.jsx @@ -176,9 +176,8 @@ export const Swap = () => {

- The Teia marketplace fee is temporarily set to 0%. Please - consider donating to teiaescrow.tez - (tz1Q7fCeswrECCZthfzx2joqkoTdyin8DDg8) for maintenance funding. + The Teia marketplace fee is set to 2.5%. + Fees get directed to the Teia DAO treasury multisig (KT1J9FYz29RBQi1oGLw8uXyACrzXzV1dHuvb)

From e4d59b398c42dfb06a65cab099edf6189888cd4b Mon Sep 17 00:00:00 2001 From: Mel Massadian Date: Wed, 29 Mar 2023 17:01:35 +0200 Subject: [PATCH 04/15] =?UTF-8?q?fix:=20=F0=9F=93=9D=20fees=20in=20about?= =?UTF-8?q?=20+=20restricted=20cancel=20swap=20(#277)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/listings/index.tsx | 37 ++++++++++++------------------- src/lang/en/about.md | 2 +- src/pages/objkt-display/index.tsx | 4 ---- 3 files changed, 15 insertions(+), 28 deletions(-) diff --git a/src/components/listings/index.tsx b/src/components/listings/index.tsx index 7321b7866..b3fb48cdd 100644 --- a/src/components/listings/index.tsx +++ b/src/components/listings/index.tsx @@ -14,20 +14,14 @@ import { useUserStore } from '@context/userStore' function ListingRow({ nft, listing, - // restricted, - // proxyAddress, onCollectClick, reswapPrices, setReswapPrices, - // reswap, - // cancel, - // address, proxyAdminAddress, rowId, }: { nft: NFT listing: Listing - restricted: boolean proxyAddress: string onCollectClick: (listing: Listing) => void reswapPrices: { [key: string]: number } @@ -41,7 +35,6 @@ function ListingRow({ rowId: string }) { const { walletBlockMap } = useSettings() - // const [show, closeModal] = useModalStore((st) => [st.show, st.close]) const [address, proxyAddress] = useUserStore((st) => [ st.address, st.proxyAddress, @@ -55,8 +48,8 @@ function ListingRow({ console.debug('isOwnSwap', isOwnSwap) const restricted = useMemo(() => { - return nft.restricted - }, [nft.restricted]) + return nft.restricted || walletBlockMap.get(listing.seller_address) === 1 + }, [nft.restricted, walletBlockMap, listing.seller_address]) return (
@@ -69,9 +62,7 @@ function ListingRow({
- {(restricted || walletBlockMap.get(listing.seller_address) === 1) && ( - - )} + {restricted && } {!restricted && walletBlockMap.get(listing.seller_address) !== 1 && @@ -86,6 +77,7 @@ function ListingRow({ )} {isOwnSwap && + !restricted && (listing.type.startsWith('TEIA') || listing.type.startsWith('HEN')) && ( <> @@ -125,19 +117,18 @@ function ListingRow({ > reswap - - )} + {isOwnSwap && ( + + )}
) diff --git a/src/lang/en/about.md b/src/lang/en/about.md index 4fb0a0df0..29c073d4a 100644 --- a/src/lang/en/about.md +++ b/src/lang/en/about.md @@ -48,7 +48,7 @@ The Teia Marketplace Interface and marketplace contract are [code forks](https:/ **Marketplace Contract Admin:** [KT1PKBTVmdxfgkFvSeNUQacYiEFsPBw16B4P](https://tzkt.io/KT1PKBTVmdxfgkFvSeNUQacYiEFsPBw16B4P/operations/) - [multisig contract](https://multisign.onrender.com/) developed and owned by the Teia Community -The [marketplace fees](https://github.com/teia-community/teia-docs/wiki/Marketplace-Fees) are temporarily set to 0%. +The [marketplace fees](https://github.com/teia-community/teia-docs/wiki/Marketplace-Fees) are set to 2.5%. --- diff --git a/src/pages/objkt-display/index.tsx b/src/pages/objkt-display/index.tsx index a36a9b5b6..365b0d4ed 100644 --- a/src/pages/objkt-display/index.tsx +++ b/src/pages/objkt-display/index.tsx @@ -106,10 +106,6 @@ export const ObjktDisplay = () => { objkt.restricted = walletBlockMap.get(objkt.artist_address) === 1 objkt.underReview = underReviewMap.get(objkt.artist_address) === 1 - objkt.listings = objkt.listings.filter( - ({ seller_address }: { seller_address: string }) => - walletBlockMap.get(seller_address) !== 1 - ) return objkt } From 21e10721636256225a3e41c638eda92cd2c0210d Mon Sep 17 00:00:00 2001 From: Mel Massadian Date: Sat, 1 Apr 2023 02:57:11 +0200 Subject: [PATCH 05/15] =?UTF-8?q?feat:=20=E2=9C=A8=20start=20april=20(#279?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: ✨ start april * feat: ✨ simplified Static brings another set of issues in some areas Notably: - can block ui areas like closing the menu - can be very wide and so the content out of view for instance on a long history page * fix: ✨ touches - Avoid small rotations (<0.3deg) - Remove reload from settings text (reload no needded) * fix: ✨ feeds Avoid skewing, it was especially problematic on mobile... --- src/App.jsx | 3 +- src/atoms/input/Checkbox.jsx | 2 +- src/atoms/layout/page/index.tsx | 2 +- src/atoms/token-collection/index.jsx | 6 ++-- src/components/header/main_menu/MainMenu.jsx | 4 +-- .../header/main_menu/index.module.scss | 3 +- src/components/responsive-masonry/index.jsx | 2 +- src/context/localSettingsStore.ts | 4 +++ src/hooks/use-fool.js | 30 +++++++++++++++++++ src/pages/config/Settings.jsx | 13 ++++++++ src/styles/main.scss | 1 + 11 files changed, 59 insertions(+), 11 deletions(-) create mode 100644 src/hooks/use-fool.js diff --git a/src/App.jsx b/src/App.jsx index a0c33bbc3..ee3303b6b 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -4,10 +4,11 @@ import { Loading as Preloading } from '@atoms/loading' import { AnimatePresence } from 'framer-motion' import { Debug } from '@atoms/debug' import { Header } from '@components/header' +import useFool from '@hooks/use-fool' const App = () => { const { isLoading } = useSettings() - + useFool() if (isLoading) { return } diff --git a/src/atoms/input/Checkbox.jsx b/src/atoms/input/Checkbox.jsx index db72e04c6..3e0ebc0b0 100644 --- a/src/atoms/input/Checkbox.jsx +++ b/src/atoms/input/Checkbox.jsx @@ -51,7 +51,7 @@ const Checkbox = forwardRef( }) return ( -