[Release] Hotfix 2.24.0 => 2.24.1 (patch) (#11297)

Author: guanbinrui

Diff for: package.json

@@ -8,7 +8,7 @@
     "yarn": ">=999.0.0",
     "npm": ">=999.0.0"
   },
-  "version": "2.24.0",
+  "version": "2.24.1",
   "private": true,
   "license": "AGPL-3.0-or-later",
   "scripts": {

Diff for: packages/mask/content-script/site-adaptors/twitter.com/locales/en-US.json

@@ -1,3 +1,3 @@
 {
-    "additional_post_box__encrypted_post_pre": "This tweet is encrypted with #mask_io (@realMaskNetwork). 📪🔑\n\n🎭 🎭🎭 Tired of plaintext? Try to send encrypted messages to your friends. Install {{encrypted}} to send your first encrypted tweet."
+    "additional_post_box__encrypted_post_pre": "This tweet is encrypted with #mask_io (@realMaskNetwork). 📪🔑\n\n🎭 🎭🎭 Tired of plaintext? Try to send encrypted messages to your friends. Install {{- encrypted}} to send your first encrypted tweet."
 }

Diff for: packages/mask/content-script/site-adaptors/twitter.com/locales/ko-KR.json

@@ -1,3 +1,3 @@
 {
-    "additional_post_box__encrypted_post_pre": "이 트윗은 이미 #mask_io (@realMaskNetwork)로 암호화되었습니다. 📪🔑\n🎭 🎭🎭 {{encrypted}} 설치하여 친구에게 암호화 트윗을 보내 보세요!"
+    "additional_post_box__encrypted_post_pre": "이 트윗은 이미 #mask_io (@realMaskNetwork)로 암호화되었습니다. 📪🔑\n🎭 🎭🎭 {{- encrypted}} 설치하여 친구에게 암호화 트윗을 보내 보세요!"
 }

Diff for: packages/mask/content-script/site-adaptors/twitter.com/locales/zh-CN.json

@@ -1,3 +1,3 @@
 {
-    "additional_post_box__encrypted_post_pre": "此推特使用 #mask_io (@realMaskNetwork) 加密。 📪🔑\n\n🎭 🎭🎭 厌烦了纯文本？尝试向你的朋友发送加密消息。安装 {{encrypted}} 以发送你第一个加密推文。"
+    "additional_post_box__encrypted_post_pre": "此推特使用 #mask_io (@realMaskNetwork) 加密。 📪🔑\n\n🎭 🎭🎭 厌烦了纯文本？尝试向你的朋友发送加密消息。安装 {{- encrypted}} 以发送你第一个加密推文。"
 }

Diff for: packages/mask/content-script/site-adaptors/twitter.com/utils/postBox.ts

@@ -9,7 +9,7 @@ export function getEditorContent() {
 }
 
 export function isCompose() {
-    return globalThis.location.pathname.includes('compose')
+    return globalThis.location.pathname === '/compose/tweet'
 }
 
 export function hasFocus(x: LiveSelector<HTMLElement, true>) {

Diff for: packages/mask/content-script/site-adaptors/twitter.com/utils/selector.ts

@@ -309,8 +309,8 @@ export function searchRetweetAvatarSelector() {
 }
 
 export function searchReplyToolbarSelector() {
-    return querySelector<E>('div[data-testid="primaryColumn"] div[data-testid="toolBar"]').querySelector<E>(
-        '[role="presentation"]:has(> div[data-testid="geoButton"])',
+    return querySelector<E>(
+        'div[data-testid="primaryColumn"] div[data-testid="toolBar"] [role="presentation"]:has(> div[data-testid="geoButton"])',
     )
 }
 

Diff for: packages/mask/popups/components/ConnectedWallet/index.tsx

@@ -140,7 +140,9 @@ export const ConnectedWallet = memo(function ConnectedWallet() {
                 MaskMessages.events.ownProofChanged.sendToAll()
                 showSnackbar(t.popups_wallet_disconnect_success())
             } catch {
-                showSnackbar(t.popups_wallet_disconnect_failed())
+                showSnackbar(t.popups_wallet_disconnect_failed(), {
+                    variant: 'error',
+                })
             }
         },
         [currentPersona],

Diff for: packages/mask/popups/pages/Personas/Home/UI.tsx

@@ -1,19 +1,11 @@
 import { Icons } from '@masknet/icons'
 import { PopupHomeTabType, useParamTab } from '@masknet/shared'
-import {
-    LockStatus,
-    PopupModalRoutes,
-    PopupRoutes,
-    currentMaskWalletLockStatusSettings,
-    type EnhanceableSite,
-    type ProfileAccount,
-} from '@masknet/shared-base'
+import { PopupModalRoutes, PopupRoutes, type EnhanceableSite, type ProfileAccount } from '@masknet/shared-base'
 import { MaskTabList, makeStyles } from '@masknet/theme'
 import { TabContext, TabPanel } from '@mui/lab'
 import { Box, Tab, Typography, useTheme } from '@mui/material'
-import { memo, useCallback } from 'react'
+import { memo } from 'react'
 import { useNavigate } from 'react-router-dom'
-import urlcat from 'urlcat'
 import { useMaskSharedTrans } from '../../../../shared-ui/index.js'
 import { ConnectedWallet } from '../../../components/ConnectedWallet/index.js'
 import { PersonaAvatar } from '../../../components/PersonaAvatar/index.js'
@@ -199,7 +191,6 @@ export const PersonaHomeUI = memo<PersonaHomeUIProps>(
         onAccountClick,
         bindingWallets,
         hasProofs,
-        hasPaymentPassword,
     }) => {
         const theme = useTheme()
         const t = useMaskSharedTrans()
@@ -209,20 +200,6 @@ export const PersonaHomeUI = memo<PersonaHomeUIProps>(
 
         const [currentTab, onChange] = useParamTab<PopupHomeTabType>(PopupHomeTabType.SocialAccounts)
 
-        const onChangeTab = useCallback(
-            (event: object, value: PopupHomeTabType) => {
-                if (
-                    currentMaskWalletLockStatusSettings.value === LockStatus.LOCKED &&
-                    value === PopupHomeTabType.ConnectedWallets &&
-                    hasPaymentPassword
-                ) {
-                    navigate(urlcat(PopupRoutes.Wallet, { from: PopupRoutes.Personas, goBack: true, popup: true }))
-                    return
-                }
-                onChange(event, value)
-            },
-            [hasPaymentPassword],
-        )
         return (
             <div className={classes.container}>
                 {!isEmpty ?
@@ -263,7 +240,7 @@ export const PersonaHomeUI = memo<PersonaHomeUIProps>(
                             </Box>
 
                             <MaskTabList
-                                onChange={onChangeTab}
+                                onChange={onChange}
                                 aria-label="persona-tabs"
                                 classes={{ root: classes.tabs, grouped: classes.groupedButton }}>
                                 <Tab label={t.popups_social_account()} value={PopupHomeTabType.SocialAccounts} />

Diff for: packages/mask/shared-ui/locales/en-US.json

@@ -103,9 +103,9 @@
     "persona_load_failed": "Load failed",
     "additional_post_box__encrypted_post_pre": "Decrypt this post with #mask_io! $t(promote) {{- encrypted}}",
     "additional_post_box__encrypted_post_pre_red_packet_sns_official_account": "$t(promote_red_packet) Follow @{{account}} for Web3 updates and insights. \n\n🧧🧧🧧 Try sending Lucky Drop to your friends with Mask.io. \n\n{{- encrypted}}",
-    "additional_post_box__encrypted_post_pre_red_packet": "$t(promote_red_packet) \n\n🧧🧧🧧 Try sending Lucky Drop to your friends with Mask.io. \n\n{{encrypted}}",
-    "additional_post_box__encrypted_post_pre_file_service_sns_official_account": "$t(promote_file_service)\n {{encrypted}}",
-    "additional_post_box__encrypted_post_pre_file_service": "$t(promote_file_service) {{encrypted}}",
+    "additional_post_box__encrypted_post_pre_red_packet": "$t(promote_red_packet) \n\n🧧🧧🧧 Try sending Lucky Drop to your friends with Mask.io. \n\n{{- encrypted}}",
+    "additional_post_box__encrypted_post_pre_file_service_sns_official_account": "$t(promote_file_service)\n {{- encrypted}}",
+    "additional_post_box__encrypted_post_pre_file_service": "$t(promote_file_service) {{- encrypted}}",
     "additional_post_box__steganography_post_pre": "This image is encrypted with #mask_io. \n{{random}}\n\nInstall Mask.io to send your first encrypted tweet.",
     "auto_paste_failed_dialog_title": "Paste manually",
     "auto_paste_failed_dialog_content": "Please copy the following text and image (if there is any) and publish it.",

Diff for: packages/mask/shared-ui/locales/ja-JP.json

@@ -101,11 +101,11 @@
     "application_display_tab_plug_app-unlisted-placeholder": "設定のアイコンをクリックして、アプリボードに表示します。",
     "application_settings_tab_plug_app-unlisted-placeholder": "アプリのアイコンをクリックして、アプリボードに表示します。",
     "persona_load_failed": "読み込み失敗",
-    "additional_post_box__encrypted_post_pre": "#mask_io で復号しましょう！ {{encrypted}}",
-    "additional_post_box__encrypted_post_pre_red_packet_sns_official_account": "こんにちは、#mask_io @{{account}} でラッキードロップを獲得しましょう。 \n\n$t(promote_red_packet)\n {{encrypted}}",
-    "additional_post_box__encrypted_post_pre_red_packet": "こんにちは、#mask_io @{{account}} でラッキードロップを獲得しましょう。 \n\n$t(promote_red_packet)\n {{encrypted}}",
-    "additional_post_box__encrypted_post_pre_file_service_sns_official_account": "$t(promote_file_service)\n {{encrypted}}",
-    "additional_post_box__encrypted_post_pre_file_service": "$t(promote_file_service) {{encrypted}}",
+    "additional_post_box__encrypted_post_pre": "#mask_io で復号しましょう！ {{- encrypted}}",
+    "additional_post_box__encrypted_post_pre_red_packet_sns_official_account": "こんにちは、#mask_io @{{account}} でラッキードロップを獲得しましょう。 \n\n$t(promote_red_packet)\n {{- encrypted}}",
+    "additional_post_box__encrypted_post_pre_red_packet": "こんにちは、#mask_io @{{account}} でラッキードロップを獲得しましょう。 \n\n$t(promote_red_packet)\n {{- encrypted}}",
+    "additional_post_box__encrypted_post_pre_file_service_sns_official_account": "$t(promote_file_service)\n {{- encrypted}}",
+    "additional_post_box__encrypted_post_pre_file_service": "$t(promote_file_service) {{- encrypted}}",
     "additional_post_box__steganography_post_pre": "この投稿は #mask_io によって暗号化されています。 📪🔑 mask.io をインストールして復号しましょう！ ([I:b]) {{random}}",
     "auto_paste_failed_dialog_title": "手動でペーストする",
     "auto_paste_failed_dialog_content": "以下の文字列と画像（存在すれば）をコピーし、公開しましょう。",

Diff for: packages/mask/shared-ui/locales/ko-KR.json

@@ -91,11 +91,11 @@
     "application_display_tab_plug_app-unlisted-placeholder": "설정 아이콘을 클릭하여 앱 보드에 나열합니다.",
     "application_settings_tab_plug_app-unlisted-placeholder": "애프리케이션 아이콘을 클릭하여 앱 보드에 나열합니다.",
     "persona_load_failed": "로딩 실패",
-    "additional_post_box__encrypted_post_pre": "#mask_io로 이 게시물을 해독하기. {{encrypted}}",
-    "additional_post_box__encrypted_post_pre_red_packet_sns_official_account": "#mask_io로 행운 드랍을 수령해 보세요. @{{account}} \n\n$t(promote_red_packet)\n {{encrypted}}",
-    "additional_post_box__encrypted_post_pre_red_packet": "#mask_io {{encrypted}} 덧붙이고 레드 패킷을 수령하세요.",
-    "additional_post_box__encrypted_post_pre_file_service_sns_official_account": "$t(promote_file_service)\n {{encrypted}}",
-    "additional_post_box__encrypted_post_pre_file_service": "$t(promote_file_service) {{encrypted}}",
+    "additional_post_box__encrypted_post_pre": "#mask_io로 이 게시물을 해독하기. {{- encrypted}}",
+    "additional_post_box__encrypted_post_pre_red_packet_sns_official_account": "#mask_io로 행운 드랍을 수령해 보세요. @{{account}} \n\n$t(promote_red_packet)\n {{- encrypted}}",
+    "additional_post_box__encrypted_post_pre_red_packet": "#mask_io {{- encrypted}} 덧붙이고 레드 패킷을 수령하세요.",
+    "additional_post_box__encrypted_post_pre_file_service_sns_official_account": "$t(promote_file_service)\n {{- encrypted}}",
+    "additional_post_box__encrypted_post_pre_file_service": "$t(promote_file_service) {{- encrypted}}",
     "additional_post_box__steganography_post_pre": "암호화된 이미지입니다. 📪🔑 mask.io 설치하고 해독하세요. {{random}}",
     "auto_paste_failed_dialog_title": "수동으로 붙여넣기",
     "auto_paste_failed_dialog_content": "아래의 문자와 이미지(있으면)를 복사하고 공유하세요",

Diff for: packages/mask/shared-ui/locales/zh-CN.json

@@ -101,11 +101,11 @@
     "application_display_tab_plug_app-unlisted-placeholder": "点击设置图标进入设置页面，在应用面板上设置显示应用。",
     "application_settings_tab_plug_app-unlisted-placeholder": "点击应用图标将会在应用列表中显示。",
     "persona_load_failed": "加载失败",
-    "additional_post_box__encrypted_post_pre": "安装 #mask_io 解密此贴文 ！ {{encrypted}}",
-    "additional_post_box__encrypted_post_pre_red_packet_sns_official_account": "使用 #mask_io 来领取这个红包！@{{account}} \n\n$t(promote_red_packet)\n {{encrypted}}",
-    "additional_post_box__encrypted_post_pre_red_packet": "使用 #mask_io 来认领这个红包！@{{encrypted}}",
-    "additional_post_box__encrypted_post_pre_file_service_sns_official_account": "$t(promote_file_service)\n {{encrypted}}",
-    "additional_post_box__encrypted_post_pre_file_service": "$t(promote_file_service) {{encrypted}}",
+    "additional_post_box__encrypted_post_pre": "安装 #mask_io 解密此贴文 ！ {{- encrypted}}",
+    "additional_post_box__encrypted_post_pre_red_packet_sns_official_account": "使用 #mask_io 来领取这个红包！@{{account}} \n\n$t(promote_red_packet)\n {{- encrypted}}",
+    "additional_post_box__encrypted_post_pre_red_packet": "使用 #mask_io 来认领这个红包！{{- encrypted}}",
+    "additional_post_box__encrypted_post_pre_file_service_sns_official_account": "$t(promote_file_service)\n {{- encrypted}}",
+    "additional_post_box__encrypted_post_pre_file_service": "$t(promote_file_service) {{- encrypted}}",
     "additional_post_box__steganography_post_pre": "此图片使用#mask_io加密。📪🔑 安装mask.io解密它。 {{random}}",
     "auto_paste_failed_dialog_title": "手动粘贴",
     "auto_paste_failed_dialog_content": "请复制下面的文本和图片(如果有的话)再进行发布。",

Diff for: packages/mask/shared-ui/locales/zh-TW.json

@@ -18,8 +18,8 @@
     "redirect_alert": "如果你的瀏覽器沒有跳轉， <terms>請點擊此處</terms>.",
     "add_nft_contract_search_hint": "檢索NFT合約名稱或地址",
     "applications": "應用",
-    "additional_post_box__encrypted_post_pre": "使用 #mask_io 解密這篇貼文！ {{encrypted}}",
-    "additional_post_box__encrypted_post_pre_red_packet": "用 #mask_io 開啟紅包 {{encrypted}}",
+    "additional_post_box__encrypted_post_pre": "使用 #mask_io 解密這篇貼文！ {{- encrypted}}",
+    "additional_post_box__encrypted_post_pre_red_packet": "用 #mask_io 開啟紅包 {{- encrypted}}",
     "additional_post_box__steganography_post_pre": "這張圖片是使用 #mask_io 加密。 📪🔑 安裝 mask.io 解密。 {{random}}",
     "auto_paste_failed_dialog_title": "手動貼上",
     "auto_paste_failed_dialog_content": "請複製下方文章或圖片 (如果有的話) 然後發佈它",

Diff for: packages/plugins/FriendTech/src/SiteAdaptor/index.tsx

@@ -1,14 +1,9 @@
 import { Icons } from '@masknet/icons'
 import type { Plugin } from '@masknet/plugin-infra'
-import { PluginTransFieldRender } from '@masknet/plugin-infra/content-script'
-import { ApplicationEntry } from '@masknet/shared'
 import { PluginID } from '@masknet/shared-base'
-import { Telemetry } from '@masknet/web3-telemetry'
-import { EventID, EventType } from '@masknet/web3-telemetry/types'
 import { Trans } from 'react-i18next'
 import { base } from '../base.js'
 import { FriendTechInjection } from './FriendTechInjection.js'
-import { openDialog } from './emitter.js'
 import { FriendTechNameWidget } from './FriendTechNameWidget.js'
 
 const site: Plugin.SiteAdaptor.Definition = {
@@ -23,22 +18,6 @@ const site: Plugin.SiteAdaptor.Definition = {
             const iconFilterColor = 'rgba(1, 186, 250, 0.20)'
             return {
                 ApplicationEntryID: base.ID,
-                RenderEntryComponent(EntryComponentProps) {
-                    return (
-                        <ApplicationEntry
-                            title={<PluginTransFieldRender field={name} pluginID={base.ID} />}
-                            {...EntryComponentProps}
-                            icon={icon}
-                            iconFilterColor={iconFilterColor}
-                            onClick={() => {
-                                EntryComponentProps.onClick ? EntryComponentProps.onClick?.(openDialog) : openDialog()
-                                Telemetry.captureEvent(EventType.Access, EventID.EntryAppFileOpen)
-                            }}
-                        />
-                    )
-                },
-                appBoardSortingDefaultPriority: 1,
-                marketListSortingPriority: 3,
                 icon,
                 category: 'dapp',
                 description: <Trans ns={PluginID.FriendTech} i18nKey="description" />,

Diff for: packages/plugins/Gitcoin/src/SiteAdaptor/index.tsx

@@ -1,13 +1,15 @@
 import { Trans } from 'react-i18next'
 import { Icons } from '@masknet/icons'
-import { type Plugin, usePluginWrapper } from '@masknet/plugin-infra/content-script'
-import { PluginID } from '@masknet/shared-base'
+import { type Plugin, usePluginWrapper, usePostInfoDetails } from '@masknet/plugin-infra/content-script'
+import { PluginID, parseURLs } from '@masknet/shared-base'
 import { MaskLightTheme } from '@masknet/theme'
 import { ThemeProvider } from '@mui/material'
 import { base } from '../base.js'
 import { PLUGIN_META_KEY, PLUGIN_NAME } from '../constants.js'
 import { PreviewCard } from './PreviewCard.js'
 import { Modals } from './modals/index.js'
+import { extractTextFromTypedMessage } from '@masknet/typed-message'
+import { useMemo } from 'react'
 
 const isGitcoin = (x: string): boolean => /^https:\/\/gitcoin.co\/grants\/\d+/.test(x)
 
@@ -27,7 +29,26 @@ const site: Plugin.SiteAdaptor.Definition = {
     GlobalInjection() {
         return <Modals />
     },
+    DecryptedInspector(props) {
+        const link = useMemo(() => {
+            const x = extractTextFromTypedMessage(props.message)
+            if (x.isNone()) return null
+            return parseURLs(x.value).find(isGitcoin)
+        }, [props.message])
+        const id = link?.match(/\d+/)?.[0]
+        if (!id) return null
+        return <Renderer id={id} />
+    },
     CompositionDialogMetadataBadgeRender: new Map([[PLUGIN_META_KEY, () => PLUGIN_NAME]]),
+    PostInspector() {
+        const links = usePostInfoDetails.mentionedLinks()
+
+        const link = links.find(isGitcoin)
+        const id = link?.match(/\d+/)?.[0]
+
+        if (!id) return null
+        return <Renderer id={id} />
+    },
     ApplicationEntries: [
         {
             hiddenInList: true,

Diff for: packages/plugins/Gitcoin/src/base.ts

@@ -19,6 +19,6 @@ export const base: Plugin.Shared.Definition = {
         host_permissions: ['https://gitcoin.co/'],
     },
     inMinimalModeByDefault: true,
-    contribution: {},
+    contribution: { postContent: new Set([/https:\/\/gitcoin.co\/grants\/\d+/]) },
     i18n: languages,
 }