From 3ae29b79cc650a0d20dc6d7b963a45022c849ab0 Mon Sep 17 00:00:00 2001
From: zhouhanseng <z308114274@gmail.com>
Date: Wed, 15 Jun 2022 21:35:40 +0800
Subject: [PATCH 1/5] fix(nft lucky drop): encrypted text

---
 cspell.json                                                   | 1 +
 packages/mask/src/components/CompositionDialog/useSubmit.ts   | 4 ++--
 .../mask/src/plugins/Avatar/Application/NFTAvatarsDialog.tsx  | 2 +-
 .../mask/src/plugins/ITO/SNSAdaptor/CompositionDialog.tsx     | 2 +-
 .../mask/src/plugins/RedPacket/SNSAdaptor/RedPacketDialog.tsx | 2 +-
 .../mask/src/plugins/Referral/SNSAdaptor/ReferralDialog.tsx   | 2 +-
 .../mask/src/plugins/Savings/SNSAdaptor/SavingsDialog.tsx     | 2 +-
 .../mask/src/plugins/Tips/SNSAdaptor/TipsEntranceDialog.tsx   | 2 +-
 packages/shared/src/contexts/components/InjectedDialog.tsx    | 4 ++--
 9 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/cspell.json b/cspell.json
index 0ddac744d862..9333777d2174 100644
--- a/cspell.json
+++ b/cspell.json
@@ -286,6 +286,7 @@
         "ifrandom",
         "iife",
         "inpage",
+        "isonback",
         "koda",
         "kodav",
         "lngs",
diff --git a/packages/mask/src/components/CompositionDialog/useSubmit.ts b/packages/mask/src/components/CompositionDialog/useSubmit.ts
index f386530d76e1..34662fd27352 100644
--- a/packages/mask/src/components/CompositionDialog/useSubmit.ts
+++ b/packages/mask/src/components/CompositionDialog/useSubmit.ts
@@ -5,7 +5,7 @@ import type { Meta } from '@masknet/typed-message'
 import { useCallback } from 'react'
 import Services from '../../extension/service'
 import { ITO_MetadataReader } from '../../plugins/ITO/SNSAdaptor/helpers'
-import { RedPacketMetadataReader } from '../../plugins/RedPacket/SNSAdaptor/helpers'
+import { RedPacketMetadataReader, RedPacketNftMetadataReader } from '../../plugins/RedPacket/SNSAdaptor/helpers'
 import { activatedSocialNetworkUI, globalUIState } from '../../social-network'
 import { isFacebook } from '../../social-network-adaptor/facebook.com/base'
 import { isTwitter } from '../../social-network-adaptor/twitter.com/base'
@@ -82,7 +82,7 @@ function decorateEncryptedText(
     const hasOfficialAccount = isTwitter(activatedSocialNetworkUI) || isFacebook(activatedSocialNetworkUI)
     const officialAccount = isTwitter(activatedSocialNetworkUI) ? t('twitter_account') : t('facebook_account')
 
-    if (RedPacketMetadataReader(meta).ok) {
+    if (RedPacketMetadataReader(meta).ok || RedPacketNftMetadataReader(meta).ok) {
         return [
             'eth',
             hasOfficialAccount
diff --git a/packages/mask/src/plugins/Avatar/Application/NFTAvatarsDialog.tsx b/packages/mask/src/plugins/Avatar/Application/NFTAvatarsDialog.tsx
index 392bcf93a8e0..1f46b40ce901 100644
--- a/packages/mask/src/plugins/Avatar/Application/NFTAvatarsDialog.tsx
+++ b/packages/mask/src/plugins/Avatar/Application/NFTAvatarsDialog.tsx
@@ -80,7 +80,7 @@ export function NFTAvatarDialog(props: NFTAvatarsDialogProps) {
                     ? t.application_edit_profile_dialog_title()
                     : t.application_dialog_title()
             }
-            isOnBack={step !== CreateNFTAvatarStep.Persona}
+            isonback={step !== CreateNFTAvatarStep.Persona}
             open={props.open}
             onClose={onBack}>
             <DialogContent className={classes.root}>
diff --git a/packages/mask/src/plugins/ITO/SNSAdaptor/CompositionDialog.tsx b/packages/mask/src/plugins/ITO/SNSAdaptor/CompositionDialog.tsx
index 30186309a94f..068dfdf1be80 100644
--- a/packages/mask/src/plugins/ITO/SNSAdaptor/CompositionDialog.tsx
+++ b/packages/mask/src/plugins/ITO/SNSAdaptor/CompositionDialog.tsx
@@ -235,7 +235,7 @@ export function CompositionDialog(props: CompositionDialogProps) {
         <InjectedDialog
             isOpenFromApplicationBoard={props.isOpenFromApplicationBoard}
             disableBackdropClick
-            isOnBack={step === ITOCreateFormPageStep.ConfirmItoPage}
+            isonback={step === ITOCreateFormPageStep.ConfirmItoPage}
             open={props.open}
             title={t('plugin_ito_display_name')}
             onClose={onClose}>
diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketDialog.tsx b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketDialog.tsx
index 7742e454e451..1dcebb349801 100644
--- a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketDialog.tsx
+++ b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketDialog.tsx
@@ -187,7 +187,7 @@ export default function RedPacketDialog(props: RedPacketDialogProps) {
             open={props.open}
             title={title}
             onClose={isCreateStep ? onClose : () => setStep(CreateRedPacketPageStep.NewRedPacketPage)}
-            isOnBack={!isCreateStep}
+            isonback={step !== CreateRedPacketPageStep.NewRedPacketPage}
             disableTitleBorder>
             <DialogContent className={classes.dialogContent}>
                 {step === CreateRedPacketPageStep.NewRedPacketPage ? (
diff --git a/packages/mask/src/plugins/Referral/SNSAdaptor/ReferralDialog.tsx b/packages/mask/src/plugins/Referral/SNSAdaptor/ReferralDialog.tsx
index 9f0e60ebd172..9ea468cbd957 100644
--- a/packages/mask/src/plugins/Referral/SNSAdaptor/ReferralDialog.tsx
+++ b/packages/mask/src/plugins/Referral/SNSAdaptor/ReferralDialog.tsx
@@ -161,7 +161,7 @@ export function ReferralDialog({ open, onClose }: ReferralDialogProps) {
     return (
         <InjectedDialog
             open={open}
-            isOnBack={currentPage.page !== PagesType.LANDING}
+            isonback={currentPage.page !== PagesType.LANDING}
             onClose={onHandleClose}
             titleBarIconStyle="close"
             title={
diff --git a/packages/mask/src/plugins/Savings/SNSAdaptor/SavingsDialog.tsx b/packages/mask/src/plugins/Savings/SNSAdaptor/SavingsDialog.tsx
index 1de646ea47ae..7163825f08d8 100644
--- a/packages/mask/src/plugins/Savings/SNSAdaptor/SavingsDialog.tsx
+++ b/packages/mask/src/plugins/Savings/SNSAdaptor/SavingsDialog.tsx
@@ -104,7 +104,7 @@ export function SavingsDialog({ open, onClose }: SavingsDialogProps) {
                 <InjectedDialog
                     open={open}
                     title={t('plugin_savings')}
-                    isOnBack={Boolean(selectedProtocol)}
+                    isonback={Boolean(selectedProtocol)}
                     onClose={() => {
                         if (selectedProtocol === null) {
                             onClose?.()
diff --git a/packages/mask/src/plugins/Tips/SNSAdaptor/TipsEntranceDialog.tsx b/packages/mask/src/plugins/Tips/SNSAdaptor/TipsEntranceDialog.tsx
index 745fadfc1eeb..1b329c56df30 100644
--- a/packages/mask/src/plugins/Tips/SNSAdaptor/TipsEntranceDialog.tsx
+++ b/packages/mask/src/plugins/Tips/SNSAdaptor/TipsEntranceDialog.tsx
@@ -248,7 +248,7 @@ export function TipsEntranceDialog({ open, onClose }: TipsEntranceDialogProps) {
         <InjectedDialog
             open={open}
             onClose={clickBack}
-            isOnBack={bodyViewStep !== BodyViewStep.Main}
+            isonback={bodyViewStep !== BodyViewStep.Main}
             title={bodyViewStep}
             titleTail={
                 <WalletButton
diff --git a/packages/shared/src/contexts/components/InjectedDialog.tsx b/packages/shared/src/contexts/components/InjectedDialog.tsx
index 59fea1cde5d1..e0c753b733ae 100644
--- a/packages/shared/src/contexts/components/InjectedDialog.tsx
+++ b/packages/shared/src/contexts/components/InjectedDialog.tsx
@@ -76,7 +76,7 @@ export interface InjectedDialogProps extends Omit<DialogProps, 'onClose' | 'titl
     disableBackdropClick?: boolean
     disableTitleBorder?: boolean
     isOpenFromApplicationBoard?: boolean
-    isOnBack?: boolean
+    isonback?: boolean
     titleBarIconStyle?: 'auto' | 'back' | 'close'
 }
 
@@ -161,7 +161,7 @@ export function InjectedDialog(props: InjectedDialogProps) {
                                 disableRipple
                                 classes={{ root: dialogCloseButton }}
                                 aria-label={t.dialog_dismiss()}
-                                onClick={!props.isOnBack ? closeBothCompositionDialog : onClose}>
+                                onClick={!props.isonback ? closeBothCompositionDialog : onClose}>
                                 <DialogDismissIcon
                                     style={
                                         titleBarIconStyle !== 'close' && shouldReplaceExitWithBack && !isDashboard

From 98d618ae3af832d9ffe6b6e3c54b7e9da97f03a9 Mon Sep 17 00:00:00 2001
From: zhouhanseng <z308114274@gmail.com>
Date: Wed, 15 Jun 2022 22:04:32 +0800
Subject: [PATCH 2/5] chore: change text

---
 .../RedPacket/SNSAdaptor/RedpacketNftConfirmDialog.tsx        | 2 +-
 .../src/state/TransactionFormatter/descriptors/RedPacket.ts   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedpacketNftConfirmDialog.tsx b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedpacketNftConfirmDialog.tsx
index 31851b30c170..2c1289feef3b 100644
--- a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedpacketNftConfirmDialog.tsx
+++ b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedpacketNftConfirmDialog.tsx
@@ -258,7 +258,7 @@ export function RedpacketNftConfirmDialog(props: RedpacketNftConfirmDialogProps)
                             variant="body1"
                             align="right"
                             className={classNames(classes.account, classes.bold, classes.text)}>
-                            ({wallet?.name}) {formatEthereumAddress(account, 4)}
+                            {wallet?.name ? `(${wallet.name})` : ''} {formatEthereumAddress(account, 4)}
                             {isNativeTokenAddress(wallet?.address) ? null : (
                                 <Link
                                     color="textPrimary"
diff --git a/packages/plugins/EVM/src/state/TransactionFormatter/descriptors/RedPacket.ts b/packages/plugins/EVM/src/state/TransactionFormatter/descriptors/RedPacket.ts
index 8484f09ea2be..5f5bc9fec986 100644
--- a/packages/plugins/EVM/src/state/TransactionFormatter/descriptors/RedPacket.ts
+++ b/packages/plugins/EVM/src/state/TransactionFormatter/descriptors/RedPacket.ts
@@ -24,7 +24,7 @@ export class RedPacketDescriptor implements TransactionDescriptor {
 
             return {
                 chainId: context.chainId,
-                title: 'Create Red Packet',
+                title: 'Create Lucky Drop',
                 description: i18NextInstance.t('plugin_red_packet_create_with_token', {
                     amount,
                     symbol: token?.symbol,
@@ -33,7 +33,7 @@ export class RedPacketDescriptor implements TransactionDescriptor {
         } else if (isSameAddress(context.to, RED_PACKET_NFT_ADDRESS)) {
             return {
                 chainId: context.chainId,
-                title: 'Create NFT Red Packet',
+                title: 'Create NFT Lucky Drop',
                 description: i18NextInstance.t('plugin_nft_red_packet_create'),
             }
         }

From 1b6042a9149f9a5ace527c77b670567f69bb4fca Mon Sep 17 00:00:00 2001
From: zhouhanseng <z308114274@gmail.com>
Date: Wed, 15 Jun 2022 23:04:13 +0800
Subject: [PATCH 3/5] fix: do not pass props to dom element

---
 cspell.json                                                | 1 -
 .../src/plugins/Avatar/Application/NFTAvatarsDialog.tsx    | 2 +-
 .../mask/src/plugins/ITO/SNSAdaptor/CompositionDialog.tsx  | 2 +-
 .../src/plugins/RedPacket/SNSAdaptor/RedPacketDialog.tsx   | 2 +-
 .../src/plugins/Referral/SNSAdaptor/ReferralDialog.tsx     | 2 +-
 .../mask/src/plugins/Savings/SNSAdaptor/SavingsDialog.tsx  | 2 +-
 .../src/plugins/Tips/SNSAdaptor/TipsEntranceDialog.tsx     | 2 +-
 packages/shared/src/contexts/components/InjectedDialog.tsx | 7 ++++---
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/cspell.json b/cspell.json
index 9333777d2174..0ddac744d862 100644
--- a/cspell.json
+++ b/cspell.json
@@ -286,7 +286,6 @@
         "ifrandom",
         "iife",
         "inpage",
-        "isonback",
         "koda",
         "kodav",
         "lngs",
diff --git a/packages/mask/src/plugins/Avatar/Application/NFTAvatarsDialog.tsx b/packages/mask/src/plugins/Avatar/Application/NFTAvatarsDialog.tsx
index 1f46b40ce901..392bcf93a8e0 100644
--- a/packages/mask/src/plugins/Avatar/Application/NFTAvatarsDialog.tsx
+++ b/packages/mask/src/plugins/Avatar/Application/NFTAvatarsDialog.tsx
@@ -80,7 +80,7 @@ export function NFTAvatarDialog(props: NFTAvatarsDialogProps) {
                     ? t.application_edit_profile_dialog_title()
                     : t.application_dialog_title()
             }
-            isonback={step !== CreateNFTAvatarStep.Persona}
+            isOnBack={step !== CreateNFTAvatarStep.Persona}
             open={props.open}
             onClose={onBack}>
             <DialogContent className={classes.root}>
diff --git a/packages/mask/src/plugins/ITO/SNSAdaptor/CompositionDialog.tsx b/packages/mask/src/plugins/ITO/SNSAdaptor/CompositionDialog.tsx
index 068dfdf1be80..30186309a94f 100644
--- a/packages/mask/src/plugins/ITO/SNSAdaptor/CompositionDialog.tsx
+++ b/packages/mask/src/plugins/ITO/SNSAdaptor/CompositionDialog.tsx
@@ -235,7 +235,7 @@ export function CompositionDialog(props: CompositionDialogProps) {
         <InjectedDialog
             isOpenFromApplicationBoard={props.isOpenFromApplicationBoard}
             disableBackdropClick
-            isonback={step === ITOCreateFormPageStep.ConfirmItoPage}
+            isOnBack={step === ITOCreateFormPageStep.ConfirmItoPage}
             open={props.open}
             title={t('plugin_ito_display_name')}
             onClose={onClose}>
diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketDialog.tsx b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketDialog.tsx
index 1dcebb349801..e22eba78dd12 100644
--- a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketDialog.tsx
+++ b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketDialog.tsx
@@ -187,7 +187,7 @@ export default function RedPacketDialog(props: RedPacketDialogProps) {
             open={props.open}
             title={title}
             onClose={isCreateStep ? onClose : () => setStep(CreateRedPacketPageStep.NewRedPacketPage)}
-            isonback={step !== CreateRedPacketPageStep.NewRedPacketPage}
+            isOnBack={step !== CreateRedPacketPageStep.NewRedPacketPage}
             disableTitleBorder>
             <DialogContent className={classes.dialogContent}>
                 {step === CreateRedPacketPageStep.NewRedPacketPage ? (
diff --git a/packages/mask/src/plugins/Referral/SNSAdaptor/ReferralDialog.tsx b/packages/mask/src/plugins/Referral/SNSAdaptor/ReferralDialog.tsx
index 9ea468cbd957..9f0e60ebd172 100644
--- a/packages/mask/src/plugins/Referral/SNSAdaptor/ReferralDialog.tsx
+++ b/packages/mask/src/plugins/Referral/SNSAdaptor/ReferralDialog.tsx
@@ -161,7 +161,7 @@ export function ReferralDialog({ open, onClose }: ReferralDialogProps) {
     return (
         <InjectedDialog
             open={open}
-            isonback={currentPage.page !== PagesType.LANDING}
+            isOnBack={currentPage.page !== PagesType.LANDING}
             onClose={onHandleClose}
             titleBarIconStyle="close"
             title={
diff --git a/packages/mask/src/plugins/Savings/SNSAdaptor/SavingsDialog.tsx b/packages/mask/src/plugins/Savings/SNSAdaptor/SavingsDialog.tsx
index 7163825f08d8..1de646ea47ae 100644
--- a/packages/mask/src/plugins/Savings/SNSAdaptor/SavingsDialog.tsx
+++ b/packages/mask/src/plugins/Savings/SNSAdaptor/SavingsDialog.tsx
@@ -104,7 +104,7 @@ export function SavingsDialog({ open, onClose }: SavingsDialogProps) {
                 <InjectedDialog
                     open={open}
                     title={t('plugin_savings')}
-                    isonback={Boolean(selectedProtocol)}
+                    isOnBack={Boolean(selectedProtocol)}
                     onClose={() => {
                         if (selectedProtocol === null) {
                             onClose?.()
diff --git a/packages/mask/src/plugins/Tips/SNSAdaptor/TipsEntranceDialog.tsx b/packages/mask/src/plugins/Tips/SNSAdaptor/TipsEntranceDialog.tsx
index 1b329c56df30..745fadfc1eeb 100644
--- a/packages/mask/src/plugins/Tips/SNSAdaptor/TipsEntranceDialog.tsx
+++ b/packages/mask/src/plugins/Tips/SNSAdaptor/TipsEntranceDialog.tsx
@@ -248,7 +248,7 @@ export function TipsEntranceDialog({ open, onClose }: TipsEntranceDialogProps) {
         <InjectedDialog
             open={open}
             onClose={clickBack}
-            isonback={bodyViewStep !== BodyViewStep.Main}
+            isOnBack={bodyViewStep !== BodyViewStep.Main}
             title={bodyViewStep}
             titleTail={
                 <WalletButton
diff --git a/packages/shared/src/contexts/components/InjectedDialog.tsx b/packages/shared/src/contexts/components/InjectedDialog.tsx
index e0c753b733ae..3c1ecd3c8138 100644
--- a/packages/shared/src/contexts/components/InjectedDialog.tsx
+++ b/packages/shared/src/contexts/components/InjectedDialog.tsx
@@ -1,5 +1,6 @@
 import { EnhanceableSite, isDashboardPage, CrossIsolationMessages } from '@masknet/shared-base'
 import { ErrorBoundary, useValueRef } from '@masknet/shared-base-ui'
+import { omit } from 'lodash-unified'
 import { makeStyles, mergeClasses, useDialogStackActor, usePortalShadowRoot, useStylesExtends } from '@masknet/theme'
 import {
     Dialog,
@@ -76,7 +77,7 @@ export interface InjectedDialogProps extends Omit<DialogProps, 'onClose' | 'titl
     disableBackdropClick?: boolean
     disableTitleBorder?: boolean
     isOpenFromApplicationBoard?: boolean
-    isonback?: boolean
+    isOnBack?: boolean
     titleBarIconStyle?: 'auto' | 'back' | 'close'
 }
 
@@ -145,7 +146,7 @@ export function InjectedDialog(props: InjectedDialogProps) {
                         root: dialogBackdropRoot,
                     },
                 }}
-                {...rest}
+                {...omit(rest, 'isOnBack')}
                 {...extraProps}>
                 <ErrorBoundary>
                     {title ? (
@@ -161,7 +162,7 @@ export function InjectedDialog(props: InjectedDialogProps) {
                                 disableRipple
                                 classes={{ root: dialogCloseButton }}
                                 aria-label={t.dialog_dismiss()}
-                                onClick={!props.isonback ? closeBothCompositionDialog : onClose}>
+                                onClick={!props.isOnBack ? closeBothCompositionDialog : onClose}>
                                 <DialogDismissIcon
                                     style={
                                         titleBarIconStyle !== 'close' && shouldReplaceExitWithBack && !isDashboard

From 5c8532edec034a8cd952c1a5f8efafc67d5a2ca3 Mon Sep 17 00:00:00 2001
From: zhouhanseng <z308114274@gmail.com>
Date: Wed, 15 Jun 2022 23:08:54 +0800
Subject: [PATCH 4/5] fix: do not pass props to dom element

---
 .../twitter.com/injection/ToolboxHint_UI.tsx                 | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/mask/src/social-network-adaptor/twitter.com/injection/ToolboxHint_UI.tsx b/packages/mask/src/social-network-adaptor/twitter.com/injection/ToolboxHint_UI.tsx
index df7e2f0892b0..74af945509d5 100644
--- a/packages/mask/src/social-network-adaptor/twitter.com/injection/ToolboxHint_UI.tsx
+++ b/packages/mask/src/social-network-adaptor/twitter.com/injection/ToolboxHint_UI.tsx
@@ -9,9 +9,8 @@ const Container = styled('div')`
     cursor: pointer;
     padding: 4px 0;
 `
-const ListItem = styled(ListItemButton)<{ itemPadding?: string }>`
+const ListItem = styled(ListItemButton)`
     border-radius: 9999px;
-    padding: 6px ${(props) => props.itemPadding ?? '11px'};
     display: inline-flex;
     &:hover {
         background: rgba(15, 20, 25, 0.1);
@@ -47,7 +46,7 @@ export function ToolboxHintAtTwitter(props: { category: 'wallet' | 'application'
             ListItemIcon={Icon}
             Typography={({ children }) => <Text marginLeft={textMarginLeft ?? '20px'}>{children}</Text>}
             ListItemButton={({ children, onClick }) => (
-                <ListItem itemPadding={itemPadding} onClick={onClick}>
+                <ListItem style={{ padding: `6px ${itemPadding ?? '11px'}` }} onClick={onClick}>
                     {children}
                 </ListItem>
             )}

From 29e86d77ed15d42d104221c4f8dbc1fd340be6db Mon Sep 17 00:00:00 2001
From: zhouhanseng <z308114274@gmail.com>
Date: Wed, 15 Jun 2022 23:15:36 +0800
Subject: [PATCH 5/5] fix: text

---
 .../plugins/RedPacket/SNSAdaptor/RedpacketNftConfirmDialog.tsx  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedpacketNftConfirmDialog.tsx b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedpacketNftConfirmDialog.tsx
index 2c1289feef3b..f41d00a4218c 100644
--- a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedpacketNftConfirmDialog.tsx
+++ b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedpacketNftConfirmDialog.tsx
@@ -258,7 +258,7 @@ export function RedpacketNftConfirmDialog(props: RedpacketNftConfirmDialogProps)
                             variant="body1"
                             align="right"
                             className={classNames(classes.account, classes.bold, classes.text)}>
-                            {wallet?.name ? `(${wallet.name})` : ''} {formatEthereumAddress(account, 4)}
+                            {formatEthereumAddress(account, 4)}
                             {isNativeTokenAddress(wallet?.address) ? null : (
                                 <Link
                                     color="textPrimary"