From 4b8a2eda5e3a7e14a736e1feae125442c7fe3ad2 Mon Sep 17 00:00:00 2001 From: zhouhanseng Date: Wed, 20 Jul 2022 18:25:43 +0800 Subject: [PATCH 1/3] fix(firefox): broken icon && app board ui --- packages/icons/plugins/CrossBridge.png | Bin 0 -> 4203 bytes packages/icons/plugins/CrossBridge.svg | 87 ------------------ packages/icons/plugins/Markets.png | Bin 0 -> 8479 bytes packages/icons/plugins/Markets.svg | 81 ---------------- .../components/shared/ApplicationBoard.tsx | 6 +- .../shared/ApplicationRecommendArea.tsx | 2 + .../mask/src/plugins/ITO/SNSAdaptor/index.tsx | 8 +- .../CrossChainBridge/src/SNSAdaptor/index.tsx | 4 +- 8 files changed, 12 insertions(+), 176 deletions(-) create mode 100644 packages/icons/plugins/CrossBridge.png delete mode 100644 packages/icons/plugins/CrossBridge.svg create mode 100644 packages/icons/plugins/Markets.png delete mode 100644 packages/icons/plugins/Markets.svg diff --git a/packages/icons/plugins/CrossBridge.png b/packages/icons/plugins/CrossBridge.png new file mode 100644 index 0000000000000000000000000000000000000000..099b0a8224727fc935542198538cc6615e20489b GIT binary patch literal 4203 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 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packages/icons/plugins/Markets.png b/packages/icons/plugins/Markets.png new file mode 100644 index 0000000000000000000000000000000000000000..c020ef8b039607b18bdee43d4c36f6433a596797 GIT binary patch literal 8479 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 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packages/mask/src/components/shared/ApplicationBoard.tsx b/packages/mask/src/components/shared/ApplicationBoard.tsx index e74769c348ab..bbd742f5ae9e 100644 --- a/packages/mask/src/components/shared/ApplicationBoard.tsx +++ b/packages/mask/src/components/shared/ApplicationBoard.tsx @@ -23,7 +23,7 @@ const useStyles = makeStyles<{ shouldScroll: boolean; isCarouselReady: boolean } const smallQuery = `@media (max-width: ${theme.breakpoints.values.sm}px)` return { applicationWrapper: { - padding: theme.spacing(1, 0.25, 1, 1), + padding: theme.spacing(1, process.env.engine === 'firefox' ? 1.5 : 0.25, 1, 1), transform: props.isCarouselReady ? 'translate(-8px, -8px)' : 'translateX(-8px)', display: 'grid', gridTemplateColumns: 'repeat(4, 1fr)', @@ -33,7 +33,9 @@ const useStyles = makeStyles<{ shouldScroll: boolean; isCarouselReady: boolean } gridGap: 10, justifyContent: 'space-between', height: 320, - width: props.shouldScroll ? 583 : 576, + width: props.shouldScroll && process.env.engine !== 'firefox' ? 583 : 570, + scrollbarColor: `${theme.palette.maskColor.secondaryLine} ${theme.palette.maskColor.secondaryLine}`, + scrollbarWidth: 'thin', '::-webkit-scrollbar': { backgroundColor: 'transparent', width: 20, diff --git a/packages/mask/src/components/shared/ApplicationRecommendArea.tsx b/packages/mask/src/components/shared/ApplicationRecommendArea.tsx index 17b5d73eebda..ef4b1db7fa80 100644 --- a/packages/mask/src/components/shared/ApplicationRecommendArea.tsx +++ b/packages/mask/src/components/shared/ApplicationRecommendArea.tsx @@ -8,6 +8,7 @@ const useStyles = makeStyles()(() => { return { recommendFeatureAppListWrapper: { display: 'flex', + scrollbarColor: 'transparent transparent', overflowX: 'scroll', margin: '0 2px 5px', padding: '8px 0px 0', @@ -19,6 +20,7 @@ const useStyles = makeStyles()(() => { position: 'relative', zIndex: 100, overflowX: 'scroll', + scrollbarColor: 'transparent transparent', overscrollBehavior: 'contain', '& .carousel__slider': { padding: '8px 2px 0', diff --git a/packages/mask/src/plugins/ITO/SNSAdaptor/index.tsx b/packages/mask/src/plugins/ITO/SNSAdaptor/index.tsx index 9e6d47b77c49..eca9ab5402cd 100644 --- a/packages/mask/src/plugins/ITO/SNSAdaptor/index.tsx +++ b/packages/mask/src/plugins/ITO/SNSAdaptor/index.tsx @@ -10,7 +10,7 @@ import type { JSON_PayloadComposeMask } from '../types' import { ITO_MetadataReader, payloadIntoMask } from './helpers' import { CompositionDialog } from './CompositionDialog' import { set } from 'lodash-unified' -import { MarketsIcon, MarketsClaimIcon } from '@masknet/icons' +import { Markets, MarketsClaimIcon } from '@masknet/icons' import { ApplicationEntry } from '@masknet/shared' import { CrossIsolationMessages } from '@masknet/shared-base' import { ClaimAllDialog } from './ClaimAllDialog' @@ -54,14 +54,14 @@ const sns: Plugin.SNSAdaptor.Definition = { }, label: ( <> - + ITO ), }, ApplicationEntries: [ (() => { - const icon = + const icon = const name = const iconFilterColor = 'rgba(56, 228, 239, 0.3)' const clickHandler = () => @@ -135,7 +135,7 @@ const sns: Plugin.SNSAdaptor.Definition = { })(), ], wrapperProps: { - icon: , + icon: , backgroundGradient: 'linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.8) 100%), linear-gradient(90deg, rgba(28, 104, 243, 0.2) 0%, rgba(41, 228, 253, 0.2) 100%), #FFFFFF;', }, diff --git a/packages/plugins/CrossChainBridge/src/SNSAdaptor/index.tsx b/packages/plugins/CrossChainBridge/src/SNSAdaptor/index.tsx index bd60fd7d81bd..ca889ac7b709 100644 --- a/packages/plugins/CrossChainBridge/src/SNSAdaptor/index.tsx +++ b/packages/plugins/CrossChainBridge/src/SNSAdaptor/index.tsx @@ -1,6 +1,6 @@ import type { Plugin } from '@masknet/plugin-infra' import { ApplicationEntry } from '@masknet/shared' -import { CrossBridgeIcon } from '@masknet/icons' +import { CrossBridge } from '@masknet/icons' import { PluginI18NFieldRender } from '@masknet/plugin-infra/content-script' import { base } from '../base' import { useState } from 'react' @@ -11,7 +11,7 @@ const sns: Plugin.SNSAdaptor.Definition = { init(signal, context) {}, ApplicationEntries: [ (() => { - const icon = + const icon = const name = { i18nKey: '__plugin_name', fallback: 'Cross-chain' } const iconFilterColor = 'rgba(183, 212, 255, 0.3)' return { From edbe87766ec11820c3dbff97ecd893eee1cd3909 Mon Sep 17 00:00:00 2001 From: zhouhanseng Date: Wed, 20 Jul 2022 18:48:45 +0800 Subject: [PATCH 2/3] chore: rp history dialog fixed height --- .../RedPacket/SNSAdaptor/RedPacketDialog.tsx | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketDialog.tsx b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketDialog.tsx index 01e1cc2d2a3b..b191ee20c68d 100644 --- a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketDialog.tsx +++ b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketDialog.tsx @@ -24,7 +24,7 @@ import { HistoryIcon } from '@masknet/icons' import { RedPacketERC20Form } from './RedPacketERC20Form' import { RedPacketERC721Form } from './RedPacketERC721Form' -const useStyles = makeStyles()((theme) => ({ +const useStyles = makeStyles<{ showHistory: boolean }>()((theme, { showHistory }) => ({ content: { position: 'relative', paddingTop: 50, @@ -71,6 +71,15 @@ const useStyles = makeStyles()((theme) => ({ width: 20, marginRight: 4, }, + injectedDialog: { + ...(showHistory + ? { + '& [role="dialog"]': { + height: '620px !important', + }, + } + : {}), + }, })) enum CreateRedPacketPageStep { @@ -86,7 +95,9 @@ interface RedPacketDialogProps extends withClasses { export default function RedPacketDialog(props: RedPacketDialogProps) { const t = useI18N() - const { cx, classes } = useStyles() + const [showHistory, setShowHistory] = useState(false) + const [step, setStep] = useState(CreateRedPacketPageStep.NewRedPacketPage) + const { cx, classes } = useStyles({ showHistory }) const { attachMetadata, dropMetadata } = useCompositionContext() const state = useState(DialogTabs.create) const [isNFTRedPacketLoaded, setIsNFTRedPacketLoaded] = useState(false) @@ -94,8 +105,6 @@ export default function RedPacketDialog(props: RedPacketDialogProps) { const chainId = useChainId(NetworkPluginID.PLUGIN_EVM) const account = useAccount(NetworkPluginID.PLUGIN_EVM) const [settings, setSettings] = useState() - const [showHistory, setShowHistory] = useState(false) - const [step, setStep] = useState(CreateRedPacketPageStep.NewRedPacketPage) const onClose = useCallback(() => { setStep(CreateRedPacketPageStep.NewRedPacketPage) @@ -163,7 +172,6 @@ export default function RedPacketDialog(props: RedPacketDialogProps) { const isCreateStep = step === CreateRedPacketPageStep.NewRedPacketPage const title = isCreateStep ? t.display_name() : t.details() - const [currentTab, onChange, tabs] = useTabs('tokens', 'collectibles') return ( @@ -185,6 +193,7 @@ export default function RedPacketDialog(props: RedPacketDialogProps) { ) : null } + className={classes.injectedDialog} onClose={() => (showHistory ? setShowHistory(false) : onBack())} isOnBack={showHistory || step !== CreateRedPacketPageStep.NewRedPacketPage} disableTitleBorder> From 4df7cbc29656fb40881fd4de9ce2ec747805cb17 Mon Sep 17 00:00:00 2001 From: zhouhanseng Date: Wed, 20 Jul 2022 19:01:19 +0800 Subject: [PATCH 3/3] chore: add icon --- packages/icons/general/History.dark.svg | 9 +++++++++ .../icons/general/{History.svg => History.light.svg} | 0 .../src/plugins/RedPacket/SNSAdaptor/RedPacketDialog.tsx | 4 ++-- 3 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 packages/icons/general/History.dark.svg rename packages/icons/general/{History.svg => History.light.svg} (100%) diff --git a/packages/icons/general/History.dark.svg b/packages/icons/general/History.dark.svg new file mode 100644 index 000000000000..50073703fac5 --- /dev/null +++ b/packages/icons/general/History.dark.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/packages/icons/general/History.svg b/packages/icons/general/History.light.svg similarity index 100% rename from packages/icons/general/History.svg rename to packages/icons/general/History.light.svg diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketDialog.tsx b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketDialog.tsx index b191ee20c68d..004c76dc1b19 100644 --- a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketDialog.tsx +++ b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketDialog.tsx @@ -20,7 +20,7 @@ import type { RedPacketSettings } from './hooks/useCreateCallback' import { RedPacketConfirmDialog } from './RedPacketConfirmDialog' import { RedPacketPast } from './RedPacketPast' import { TabContext, TabPanel } from '@mui/lab' -import { HistoryIcon } from '@masknet/icons' +import { History } from '@masknet/icons' import { RedPacketERC20Form } from './RedPacketERC20Form' import { RedPacketERC721Form } from './RedPacketERC721Form' @@ -182,7 +182,7 @@ export default function RedPacketDialog(props: RedPacketDialogProps) { title={title} titleTail={ step === CreateRedPacketPageStep.NewRedPacketPage && !showHistory ? ( - setShowHistory((history) => !history)} /> + setShowHistory((history) => !history)} /> ) : null } titleTabs={