From 6433922d158507ca48db53c5c8ddd417a3368af3 Mon Sep 17 00:00:00 2001 From: billy Date: Thu, 30 Dec 2021 18:55:19 +0800 Subject: [PATCH 1/6] fix: kill nftscan temp --- .../Collectible/SNSAdaptor/CollectibleProviderIcon.tsx | 9 --------- .../mask/src/plugins/Collectible/hooks/useAssetOrder.ts | 3 +-- packages/web3-shared/evm/types/index.ts | 1 - 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/packages/mask/src/plugins/Collectible/SNSAdaptor/CollectibleProviderIcon.tsx b/packages/mask/src/plugins/Collectible/SNSAdaptor/CollectibleProviderIcon.tsx index 0b7815f6f68b..64122815a559 100644 --- a/packages/mask/src/plugins/Collectible/SNSAdaptor/CollectibleProviderIcon.tsx +++ b/packages/mask/src/plugins/Collectible/SNSAdaptor/CollectibleProviderIcon.tsx @@ -15,15 +15,8 @@ const useStyles = makeStyles()({ height: 16, verticalAlign: 'bottom', }, - NFTScan: { - width: 16, - height: 16, - verticalAlign: 'bottom', - }, }) -const NFTScanIcon = new URL('../../../resources/NFTScanIcon.png', import.meta.url).toString() - export interface CollectibleProviderIconProps { provider: NonFungibleAssetProvider } @@ -31,8 +24,6 @@ export interface CollectibleProviderIconProps { export function CollectibleProviderIcon(props: CollectibleProviderIconProps) { const { classes } = useStyles() switch (props.provider) { - case NonFungibleAssetProvider.NFTSCAN: - return case NonFungibleAssetProvider.OPENSEA: return case NonFungibleAssetProvider.RARIBLE: diff --git a/packages/mask/src/plugins/Collectible/hooks/useAssetOrder.ts b/packages/mask/src/plugins/Collectible/hooks/useAssetOrder.ts index 1b4f2ca7f4b4..d3737997ce38 100644 --- a/packages/mask/src/plugins/Collectible/hooks/useAssetOrder.ts +++ b/packages/mask/src/plugins/Collectible/hooks/useAssetOrder.ts @@ -30,8 +30,7 @@ export function useAssetOrder(provider: NonFungibleAssetProvider, token?: Collec return desktopOrder case NonFungibleAssetProvider.RARIBLE: return - case NonFungibleAssetProvider.NFTSCAN: - return + default: unreachable(provider) } diff --git a/packages/web3-shared/evm/types/index.ts b/packages/web3-shared/evm/types/index.ts index 98a5802b490b..1dba031e3726 100644 --- a/packages/web3-shared/evm/types/index.ts +++ b/packages/web3-shared/evm/types/index.ts @@ -555,7 +555,6 @@ export enum FungibleAssetProvider { export enum NonFungibleAssetProvider { OPENSEA = 'OpenSea', RARIBLE = 'Rarible', - NFTSCAN = 'NFTScan', } export type UnboxTransactionObject = T extends NonPayableTransactionObject From cc1f1b8445e53e60d0e68f8b3c17727e33aaf61c Mon Sep 17 00:00:00 2001 From: billy Date: Fri, 31 Dec 2021 11:05:06 +0800 Subject: [PATCH 2/6] style: fix some kebab-case css code to camelCase --- .../mask/src/plugins/Collectible/SNSAdaptor/Collectible.tsx | 6 +++--- .../mask/src/plugins/Gitcoin/SNSAdaptor/PreviewCard.tsx | 4 ++-- packages/mask/src/plugins/dHEDGE/UI/PoolViewDeck.tsx | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/mask/src/plugins/Collectible/SNSAdaptor/Collectible.tsx b/packages/mask/src/plugins/Collectible/SNSAdaptor/Collectible.tsx index fd5b10e16a56..1444075a00c8 100644 --- a/packages/mask/src/plugins/Collectible/SNSAdaptor/Collectible.tsx +++ b/packages/mask/src/plugins/Collectible/SNSAdaptor/Collectible.tsx @@ -139,10 +139,10 @@ const useStyles = makeStyles()((theme) => { padding: theme.spacing(8, 0), }, markdown: { - 'text-overflow': 'ellipsis', + textOverflow: 'ellipsis', display: '-webkit-box', - '-webkit-box-orient': 'vertical', - '-webkit-line-clamp': '3', + WebkitBoxOrient: 'vertical', + WebkitLineClamp: '3', }, } }) diff --git a/packages/mask/src/plugins/Gitcoin/SNSAdaptor/PreviewCard.tsx b/packages/mask/src/plugins/Gitcoin/SNSAdaptor/PreviewCard.tsx index abb773fc0778..9e8335acdde1 100644 --- a/packages/mask/src/plugins/Gitcoin/SNSAdaptor/PreviewCard.tsx +++ b/packages/mask/src/plugins/Gitcoin/SNSAdaptor/PreviewCard.tsx @@ -65,8 +65,8 @@ const useStyles = makeStyles()((theme) => ({ overflow: 'hidden', textOverflow: 'ellipsis', display: '-webkit-box', - '-webkit-line-clamp': '4', - '-webkit-box-orient': 'vertical', + WebkitLineClamp: '4', + WebkitBoxOrient: 'vertical', }, })) diff --git a/packages/mask/src/plugins/dHEDGE/UI/PoolViewDeck.tsx b/packages/mask/src/plugins/dHEDGE/UI/PoolViewDeck.tsx index a9aea543d0bc..a8f0ebe367a1 100644 --- a/packages/mask/src/plugins/dHEDGE/UI/PoolViewDeck.tsx +++ b/packages/mask/src/plugins/dHEDGE/UI/PoolViewDeck.tsx @@ -38,8 +38,8 @@ const useStyles = makeStyles()((theme) => ({ overflow: 'hidden', textOverflow: 'ellipsis', display: '-webkit-box', - '-webkit-line-clamp': '4', - '-webkit-box-orient': 'vertical', + WebkitLineClamp: '4', + webkitBoxOrient: 'vertical', }, button: { marginTop: theme.spacing(2), From 948cec6c561a0d884aa66c724be994875a904e72 Mon Sep 17 00:00:00 2001 From: BillyS <52899576+BillySh1@users.noreply.github.com> Date: Fri, 31 Dec 2021 14:04:04 +0800 Subject: [PATCH 3/6] Update packages/mask/src/plugins/Collectible/hooks/useAssetOrder.ts Co-authored-by: guanbinrui <52657989+guanbinrui@users.noreply.github.com> --- packages/mask/src/plugins/Collectible/hooks/useAssetOrder.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/mask/src/plugins/Collectible/hooks/useAssetOrder.ts b/packages/mask/src/plugins/Collectible/hooks/useAssetOrder.ts index d3737997ce38..a535c1cb0ab7 100644 --- a/packages/mask/src/plugins/Collectible/hooks/useAssetOrder.ts +++ b/packages/mask/src/plugins/Collectible/hooks/useAssetOrder.ts @@ -30,7 +30,6 @@ export function useAssetOrder(provider: NonFungibleAssetProvider, token?: Collec return desktopOrder case NonFungibleAssetProvider.RARIBLE: return - default: unreachable(provider) } From 4c3eb88ca3a176bed82f02fd0a7eff5936ee77b1 Mon Sep 17 00:00:00 2001 From: billy Date: Fri, 31 Dec 2021 14:13:06 +0800 Subject: [PATCH 4/6] style: temp revert --- .../Collectible/SNSAdaptor/CollectibleProviderIcon.tsx | 9 +++++++++ .../mask/src/plugins/Collectible/hooks/useAssetOrder.ts | 2 ++ packages/web3-shared/evm/types/index.ts | 1 + 3 files changed, 12 insertions(+) diff --git a/packages/mask/src/plugins/Collectible/SNSAdaptor/CollectibleProviderIcon.tsx b/packages/mask/src/plugins/Collectible/SNSAdaptor/CollectibleProviderIcon.tsx index 64122815a559..0b7815f6f68b 100644 --- a/packages/mask/src/plugins/Collectible/SNSAdaptor/CollectibleProviderIcon.tsx +++ b/packages/mask/src/plugins/Collectible/SNSAdaptor/CollectibleProviderIcon.tsx @@ -15,8 +15,15 @@ const useStyles = makeStyles()({ height: 16, verticalAlign: 'bottom', }, + NFTScan: { + width: 16, + height: 16, + verticalAlign: 'bottom', + }, }) +const NFTScanIcon = new URL('../../../resources/NFTScanIcon.png', import.meta.url).toString() + export interface CollectibleProviderIconProps { provider: NonFungibleAssetProvider } @@ -24,6 +31,8 @@ export interface CollectibleProviderIconProps { export function CollectibleProviderIcon(props: CollectibleProviderIconProps) { const { classes } = useStyles() switch (props.provider) { + case NonFungibleAssetProvider.NFTSCAN: + return case NonFungibleAssetProvider.OPENSEA: return case NonFungibleAssetProvider.RARIBLE: diff --git a/packages/mask/src/plugins/Collectible/hooks/useAssetOrder.ts b/packages/mask/src/plugins/Collectible/hooks/useAssetOrder.ts index a535c1cb0ab7..1b4f2ca7f4b4 100644 --- a/packages/mask/src/plugins/Collectible/hooks/useAssetOrder.ts +++ b/packages/mask/src/plugins/Collectible/hooks/useAssetOrder.ts @@ -30,6 +30,8 @@ export function useAssetOrder(provider: NonFungibleAssetProvider, token?: Collec return desktopOrder case NonFungibleAssetProvider.RARIBLE: return + case NonFungibleAssetProvider.NFTSCAN: + return default: unreachable(provider) } diff --git a/packages/web3-shared/evm/types/index.ts b/packages/web3-shared/evm/types/index.ts index 1dba031e3726..98a5802b490b 100644 --- a/packages/web3-shared/evm/types/index.ts +++ b/packages/web3-shared/evm/types/index.ts @@ -555,6 +555,7 @@ export enum FungibleAssetProvider { export enum NonFungibleAssetProvider { OPENSEA = 'OpenSea', RARIBLE = 'Rarible', + NFTSCAN = 'NFTScan', } export type UnboxTransactionObject = T extends NonPayableTransactionObject From d43565f4d69049428b00a671c8744be3e888eace Mon Sep 17 00:00:00 2001 From: billy Date: Fri, 31 Dec 2021 14:53:49 +0800 Subject: [PATCH 5/6] fix: kill nftscan in plugin collectible --- .../Collectible/SNSAdaptor/Collectible.tsx | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/packages/mask/src/plugins/Collectible/SNSAdaptor/Collectible.tsx b/packages/mask/src/plugins/Collectible/SNSAdaptor/Collectible.tsx index 1444075a00c8..f3b770500a4f 100644 --- a/packages/mask/src/plugins/Collectible/SNSAdaptor/Collectible.tsx +++ b/packages/mask/src/plugins/Collectible/SNSAdaptor/Collectible.tsx @@ -33,7 +33,7 @@ import { CollectibleTab } from '../types' import { MaskTextIcon } from '../../../resources/MaskIcon' import { resolveAssetLinkOnOpenSea, resolveCollectibleProviderName } from '../pipes' import { ActionBar } from './ActionBar' -import { NonFungibleAssetProvider, useChainId } from '@masknet/web3-shared-evm' +import { useChainId } from '@masknet/web3-shared-evm' import { getEnumAsArray } from '@dimensiondev/kit' import { FootnoteMenu, FootnoteMenuOption } from '../../Trader/SNSAdaptor/trader/FootnoteMenu' import { LoadingAnimation } from '@masknet/shared' @@ -149,6 +149,11 @@ const useStyles = makeStyles()((theme) => { export interface CollectibleProps {} +enum ShownProviderOptions { + OPENSEA = 'OpenSea', + RARIBLE = 'Rarible', +} + export function Collectible(props: CollectibleProps) { const { t } = useI18N() const { classes } = useStyles() @@ -156,16 +161,16 @@ export function Collectible(props: CollectibleProps) { const { asset, provider, tabIndex, setTabIndex } = CollectibleState.useContainer() //#region sync with settings - const collectibleProviderOptions = getEnumAsArray(NonFungibleAssetProvider) + const collectibleProviderOptions = getEnumAsArray(ShownProviderOptions) const onDataProviderChange = useCallback((option: FootnoteMenuOption) => { - currentNonFungibleAssetProviderSettings.value = option.value as NonFungibleAssetProvider + currentNonFungibleAssetProviderSettings.value = option.value as ShownProviderOptions }, []) //#endregion //#region provider switcher const CollectibleProviderSwitcher = useSettingsSwitcher( currentNonFungibleAssetProviderSettings, - getEnumAsArray(NonFungibleAssetProvider).map((x) => x.value), + getEnumAsArray(ShownProviderOptions).map((x) => x.value), resolveCollectibleProviderName, ) //#endregion @@ -337,7 +342,7 @@ export function Collectible(props: CollectibleProps) { )} - {provider === NonFungibleAssetProvider.OPENSEA ? : null} + {provider === ShownProviderOptions.OPENSEA ? : null} ) } From b4656f178332b0b77ed4076f8b5eeb58873871be Mon Sep 17 00:00:00 2001 From: billy Date: Fri, 31 Dec 2021 15:19:48 +0800 Subject: [PATCH 6/6] fix: temp revert --- .../Collectible/SNSAdaptor/Collectible.tsx | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/packages/mask/src/plugins/Collectible/SNSAdaptor/Collectible.tsx b/packages/mask/src/plugins/Collectible/SNSAdaptor/Collectible.tsx index f3b770500a4f..1444075a00c8 100644 --- a/packages/mask/src/plugins/Collectible/SNSAdaptor/Collectible.tsx +++ b/packages/mask/src/plugins/Collectible/SNSAdaptor/Collectible.tsx @@ -33,7 +33,7 @@ import { CollectibleTab } from '../types' import { MaskTextIcon } from '../../../resources/MaskIcon' import { resolveAssetLinkOnOpenSea, resolveCollectibleProviderName } from '../pipes' import { ActionBar } from './ActionBar' -import { useChainId } from '@masknet/web3-shared-evm' +import { NonFungibleAssetProvider, useChainId } from '@masknet/web3-shared-evm' import { getEnumAsArray } from '@dimensiondev/kit' import { FootnoteMenu, FootnoteMenuOption } from '../../Trader/SNSAdaptor/trader/FootnoteMenu' import { LoadingAnimation } from '@masknet/shared' @@ -149,11 +149,6 @@ const useStyles = makeStyles()((theme) => { export interface CollectibleProps {} -enum ShownProviderOptions { - OPENSEA = 'OpenSea', - RARIBLE = 'Rarible', -} - export function Collectible(props: CollectibleProps) { const { t } = useI18N() const { classes } = useStyles() @@ -161,16 +156,16 @@ export function Collectible(props: CollectibleProps) { const { asset, provider, tabIndex, setTabIndex } = CollectibleState.useContainer() //#region sync with settings - const collectibleProviderOptions = getEnumAsArray(ShownProviderOptions) + const collectibleProviderOptions = getEnumAsArray(NonFungibleAssetProvider) const onDataProviderChange = useCallback((option: FootnoteMenuOption) => { - currentNonFungibleAssetProviderSettings.value = option.value as ShownProviderOptions + currentNonFungibleAssetProviderSettings.value = option.value as NonFungibleAssetProvider }, []) //#endregion //#region provider switcher const CollectibleProviderSwitcher = useSettingsSwitcher( currentNonFungibleAssetProviderSettings, - getEnumAsArray(ShownProviderOptions).map((x) => x.value), + getEnumAsArray(NonFungibleAssetProvider).map((x) => x.value), resolveCollectibleProviderName, ) //#endregion @@ -342,7 +337,7 @@ export function Collectible(props: CollectibleProps) { )} - {provider === ShownProviderOptions.OPENSEA ? : null} + {provider === NonFungibleAssetProvider.OPENSEA ? : null} ) }