From a8bcdbf26abefb8fba7912e56592401cd785c95a Mon Sep 17 00:00:00 2001 From: billy Date: Thu, 7 Apr 2022 15:58:57 +0800 Subject: [PATCH 1/6] fix: unlock btn height not same --- .../mask/src/plugins/Trader/SNSAdaptor/trader/TradeForm.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/mask/src/plugins/Trader/SNSAdaptor/trader/TradeForm.tsx b/packages/mask/src/plugins/Trader/SNSAdaptor/trader/TradeForm.tsx index e3dabbb8f731..ed3e4647d2b1 100644 --- a/packages/mask/src/plugins/Trader/SNSAdaptor/trader/TradeForm.tsx +++ b/packages/mask/src/plugins/Trader/SNSAdaptor/trader/TradeForm.tsx @@ -98,9 +98,8 @@ const useStyles = makeStyles<{ isDashboard: boolean; isPopup: boolean }>()((them }, button: { fontSize: 18, - lineHeight: '22px', + lineHeight: 1, fontWeight: 600, - padding: '13px 0', borderRadius: isDashboard ? 8 : 24, height: 'auto', marginTop: '0px !important', From 204a5216d7224955c6ae501f8fd18ff8b7f56691 Mon Sep 17 00:00:00 2001 From: billy Date: Thu, 7 Apr 2022 18:08:34 +0800 Subject: [PATCH 2/6] fix: kill the backdrop && fix the select drop position --- .../src/plugins/RedPacket/SNSAdaptor/RedPacketERC20Form.tsx | 4 ---- .../twitter.com/customization/custom.ts | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketERC20Form.tsx b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketERC20Form.tsx index 6e0673921c71..6b035a25258c 100644 --- a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketERC20Form.tsx +++ b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketERC20Form.tsx @@ -199,10 +199,6 @@ export function RedPacketERC20Form(props: RedPacketFormProps) { setRandom(e.target.value as number) }} MenuProps={{ - anchorOrigin: { - vertical: 'top', - horizontal: 'left', - }, ...props.SelectMenuProps, }}> {t('plugin_red_packet_average')} diff --git a/packages/mask/src/social-network-adaptor/twitter.com/customization/custom.ts b/packages/mask/src/social-network-adaptor/twitter.com/customization/custom.ts index e6cff6cc609a..b58bd0c23df3 100644 --- a/packages/mask/src/social-network-adaptor/twitter.com/customization/custom.ts +++ b/packages/mask/src/social-network-adaptor/twitter.com/customization/custom.ts @@ -259,6 +259,9 @@ export function useThemeTwitterVariant(baseTheme: Theme) { root: { backgroundColor: theme.palette.action.mask, }, + invisible: { + opacity: '0 !important', + }, }, } theme.components.MuiTooltip = { From e0d7e435d9fb7ae096f64f3ee4e3855c53b67970 Mon Sep 17 00:00:00 2001 From: billy Date: Tue, 12 Apr 2022 14:06:32 +0800 Subject: [PATCH 3/6] fix: butn --- .../mask/src/plugins/Trader/SNSAdaptor/trader/TradeForm.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/mask/src/plugins/Trader/SNSAdaptor/trader/TradeForm.tsx b/packages/mask/src/plugins/Trader/SNSAdaptor/trader/TradeForm.tsx index ed3e4647d2b1..d4df171a8a43 100644 --- a/packages/mask/src/plugins/Trader/SNSAdaptor/trader/TradeForm.tsx +++ b/packages/mask/src/plugins/Trader/SNSAdaptor/trader/TradeForm.tsx @@ -98,10 +98,11 @@ const useStyles = makeStyles<{ isDashboard: boolean; isPopup: boolean }>()((them }, button: { fontSize: 18, - lineHeight: 1, + lineHeight: '22px', fontWeight: 600, borderRadius: isDashboard ? 8 : 24, height: 'auto', + padding: '13px 0', marginTop: '0px !important', }, disabledButton: { @@ -504,7 +505,7 @@ export const TradeForm = memo( } render={(disable: boolean) => - isGreatThanSlippageSetting ? ( + !isGreatThanSlippageSetting ? ( Date: Tue, 12 Apr 2022 14:16:49 +0800 Subject: [PATCH 4/6] fix: fix --- .../mask/src/plugins/Trader/SNSAdaptor/trader/TradeForm.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mask/src/plugins/Trader/SNSAdaptor/trader/TradeForm.tsx b/packages/mask/src/plugins/Trader/SNSAdaptor/trader/TradeForm.tsx index d4df171a8a43..a6148d82d25e 100644 --- a/packages/mask/src/plugins/Trader/SNSAdaptor/trader/TradeForm.tsx +++ b/packages/mask/src/plugins/Trader/SNSAdaptor/trader/TradeForm.tsx @@ -505,7 +505,7 @@ export const TradeForm = memo( } render={(disable: boolean) => - !isGreatThanSlippageSetting ? ( + isGreatThanSlippageSetting ? ( Date: Tue, 12 Apr 2022 14:28:42 +0800 Subject: [PATCH 5/6] fix: btn height fix --- packages/mask/src/web3/UI/EthereumERC20TokenApprovedBoundary.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/mask/src/web3/UI/EthereumERC20TokenApprovedBoundary.tsx b/packages/mask/src/web3/UI/EthereumERC20TokenApprovedBoundary.tsx index 2697d0f2795d..b145a12d6fe3 100644 --- a/packages/mask/src/web3/UI/EthereumERC20TokenApprovedBoundary.tsx +++ b/packages/mask/src/web3/UI/EthereumERC20TokenApprovedBoundary.tsx @@ -19,6 +19,7 @@ const useStyles = makeStyles()((theme) => ({ lineHeight: 1, justifyContent: 'center', alignItems: 'center', + padding: '13px 0', }, buttonLabel: { display: 'block', From 244c895653ab6348243ab52a0b73cffeb8d5831b Mon Sep 17 00:00:00 2001 From: billy Date: Tue, 12 Apr 2022 21:47:50 +0800 Subject: [PATCH 6/6] fix: ix --- .../mask/src/plugins/Trader/SNSAdaptor/trader/TradeForm.tsx | 2 +- .../mask/src/web3/UI/EthereumERC20TokenApprovedBoundary.tsx | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/mask/src/plugins/Trader/SNSAdaptor/trader/TradeForm.tsx b/packages/mask/src/plugins/Trader/SNSAdaptor/trader/TradeForm.tsx index a6148d82d25e..da5f75f60b44 100644 --- a/packages/mask/src/plugins/Trader/SNSAdaptor/trader/TradeForm.tsx +++ b/packages/mask/src/plugins/Trader/SNSAdaptor/trader/TradeForm.tsx @@ -500,7 +500,7 @@ export const TradeForm = memo( arrow disableFocusListener disableTouchListener> - + } diff --git a/packages/mask/src/web3/UI/EthereumERC20TokenApprovedBoundary.tsx b/packages/mask/src/web3/UI/EthereumERC20TokenApprovedBoundary.tsx index b145a12d6fe3..d51f7c0909a8 100644 --- a/packages/mask/src/web3/UI/EthereumERC20TokenApprovedBoundary.tsx +++ b/packages/mask/src/web3/UI/EthereumERC20TokenApprovedBoundary.tsx @@ -16,10 +16,11 @@ const useStyles = makeStyles()((theme) => ({ flexDirection: 'column', position: 'relative', marginTop: theme.spacing(1.5), - lineHeight: 1, + lineHeight: '22px', justifyContent: 'center', alignItems: 'center', padding: '13px 0', + fontSize: 18, }, buttonLabel: { display: 'block',