chore: pick commits (#10735)

DimensionDev · Sep 7, 2023 · b4c5120 · b4c5120
1 parent c23c0fb
commit b4c5120
Show file tree

Hide file tree

Showing 169 changed files with 269 additions and 11,683 deletions.
diff --git a/.i18n-codegen.json b/.i18n-codegen.json
@@ -493,18 +493,6 @@
                 "emitTS": true
             }
         },
-        {
-            "input": "./packages/plugins/ITO/src/locales/en-US.json",
-            "output": "./packages/plugins/ITO/src/locales/i18n_generated",
-            "parser": { "type": "i18next", "contextSeparator": "$", "pluralSeparator": "_" },
-            "generator": {
-                "type": "i18next/react-hooks",
-                "hooks": "useI18N",
-                "namespace": "com.maskbook.ito",
-                "trans": "Translate",
-                "emitTS": true
-            }
-        },
         {
             "input": "./packages/plugins/Savings/src/locales/en-US.json",
             "output": "./packages/plugins/Savings/src/locales/i18n_generated",

diff --git a/cspell.json b/cspell.json
@@ -465,10 +465,6 @@
             "filename": "packages/web3-shared/evm/assets/**/*.json",
             "ignoreWords": ["görli"]
         },
-        {
-            "filename": "packages/mask/src/plugins/ITO/assets/regions.json",
-            "enabled": false
-        },
         {
             "filename": "**/qya-AA.json",
             "enabled": false

diff --git a/packages/app/README.md b/packages/app/README.md
diff --git a/packages/app/package.json b/packages/app/package.json
@@ -46,7 +46,6 @@
         "@masknet/plugin-go-plus-security": "workspace:^",
         "@masknet/plugin-handle": "workspace:^",
         "@masknet/plugin-infra": "workspace:^",
-        "@masknet/plugin-ito": "workspace:^",
         "@masknet/plugin-maskbox": "workspace:^",
         "@masknet/plugin-nextid": "workspace:^",
         "@masknet/plugin-pets": "workspace:^",

diff --git a/packages/app/src/background-worker/register.ts b/packages/app/src/background-worker/register.ts
@@ -5,7 +5,6 @@ import '@masknet/plugin-artblocks/register'
 import '@masknet/plugin-snapshot/register'
 import '@masknet/plugin-cyberconnect/register'
 import '@masknet/plugin-vcent/register'
-import '@masknet/plugin-ito/register'
 import '@masknet/plugin-redpacket/register'
 import '@masknet/plugin-file-service/register'
 import '@masknet/plugin-maskbox/register'

diff --git a/packages/app/src/plugin-host/register.ts b/packages/app/src/plugin-host/register.ts
@@ -9,7 +9,6 @@ import '@masknet/plugin-snapshot/register'
 import '@masknet/plugin-cyberconnect/register'
 import '@masknet/plugin-vcent/register'
 import '@masknet/plugin-handle/register'
-import '@masknet/plugin-ito/register'
 import '@masknet/plugin-redpacket/register'
 import '@masknet/plugin-file-service/register'
 import '@masknet/plugin-maskbox/register'

diff --git a/packages/icons/general/ITO.svg b/packages/icons/general/ITO.svg
diff --git a/packages/icons/general/ITOLabel.svg b/packages/icons/general/ITOLabel.svg
diff --git a/packages/icons/icon-generated-as-jsx.js b/packages/icons/icon-generated-as-jsx.js
@@ -1920,16 +1920,6 @@ export const InteractionCircle = /*#__PURE__*/ __createIcon('InteractionCircle',
         s: true,
     },
 ])
-export const ITO = /*#__PURE__*/ __createIcon('ITO', [
-    {
-        u: () => new URL('./general/ITO.svg', import.meta.url),
-    },
-])
-export const ITOLabel = /*#__PURE__*/ __createIcon('ITOLabel', [
-    {
-        u: () => new URL('./general/ITOLabel.svg', import.meta.url),
-    },
-])
 export const Japan = /*#__PURE__*/ __createIcon('Japan', [
     {
         u: () => new URL('./general/Japan.svg', import.meta.url),

diff --git a/packages/icons/icon-generated-as-url.js b/packages/icons/icon-generated-as-url.js
@@ -203,8 +203,6 @@ export function info_dark_url() { return new URL("./general/Info.dark.svg", impo
 export function info_light_url() { return new URL("./general/Info.light.svg", import.meta.url) }
 export function interaction_url() { return new URL("./general/Interaction.svg", import.meta.url) }
 export function interaction_circle_url() { return new URL("./general/InteractionCircle.svg", import.meta.url) }
-export function ito_url() { return new URL("./general/ITO.svg", import.meta.url) }
-export function ito_label_url() { return new URL("./general/ITOLabel.svg", import.meta.url) }
 export function japan_url() { return new URL("./general/Japan.svg", import.meta.url) }
 export function jpy_url() { return new URL("./general/JPY.svg", import.meta.url) }
 export function key_square_url() { return new URL("./general/KeySquare.svg", import.meta.url) }

diff --git a/packages/mask/background/services/helper/i18n-cache-query-list.ts b/packages/mask/background/services/helper/i18n-cache-query-list.ts
@@ -38,7 +38,6 @@ export default {
     'plugins/Collectible/src/locales/%locale%.json': 'com.maskbook.collectibles',
     'plugins/ArtBlocks/src/locales/%locale%.json': 'io.artblocks',
     'plugins/External/src/locales/%locale%.json': 'io.mask.external',
-    'plugins/ITO/src/locales/%locale%.json': 'com.maskbook.ito',
     'plugins/Savings/src/locales/%locale%.json': 'com.savings',
     'plugins/Snapshot/src/locales/%locale%.json': 'org.snapshot',
     'plugins/ProfileCard/src/locales/%locale%.json': 'io.mask.web3-profile-card',

diff --git a/packages/mask/dashboard/locales/en-US.json b/packages/mask/dashboard/locales/en-US.json
@@ -349,8 +349,6 @@
     "settings_alert_merge_success": "You have successfully merged your cloud backup to the local data.",
     "labs_file_service": "File Service",
     "labs_file_service_desc": "Decentralized file storage, permanently. Upload and share files to your Mask friends on top of Arweave Network.",
-    "labs_markets": "ITO",
-    "labs_markets_desc": "Launch decentralized asset freely and participate in token launch directly on Twitter.",
     "labs_red_packet": "Lucky Drop",
     "labs_red_packet_desc": "Gift crypto or NFTs to any users, first come, first served.",
     "labs_swap": "Swap",

diff --git a/packages/mask/dashboard/locales/ja-JP.json b/packages/mask/dashboard/locales/ja-JP.json
@@ -349,8 +349,6 @@
     "settings_alert_merge_success": "クラウドバックアップをローカルデータに統合できました。",
     "labs_file_service": "ファイルサービス",
     "labs_file_service_desc": "ユーザー向け分散ファイルストレージです。",
-    "labs_markets": "マーケット",
-    "labs_markets_desc": "クリプトの友人にデジタル資産を販売します。",
     "labs_red_packet": "幸運ドロップ",
     "labs_red_packet_desc": "あなたの幸運を暗号化された幸運の小包としてあなたの友人に送信します。",
     "labs_swap": "スワップ",

diff --git a/packages/mask/dashboard/locales/ko-KR.json b/packages/mask/dashboard/locales/ko-KR.json
@@ -319,8 +319,6 @@
     "settings_alert_merge_success": "클라우드 백업과 로컬 데이터를 이미 합병되었습니다.",
     "labs_file_service": "파일 서비스",
     "labs_file_service_desc": "탈중앙화 파일 저장",
-    "labs_markets": "마켓",
-    "labs_markets_desc": "암호 친구에게 디지털 자산을 보내기",
     "labs_red_packet": "레드 패킷",
     "labs_red_packet_desc": "축복을 암호화된 레드 패킷으로 포장하고 친구들에게 보내세요.",
     "labs_swap": "스왑",

diff --git a/packages/mask/dashboard/locales/qya-AA.json b/packages/mask/dashboard/locales/qya-AA.json
@@ -349,8 +349,6 @@
     "settings_alert_merge_success": "crwdns7901:0crwdne7901:0",
     "labs_file_service": "crwdns1885:0crwdne1885:0",
     "labs_file_service_desc": "crwdns1887:0crwdne1887:0",
-    "labs_markets": "crwdns1889:0crwdne1889:0",
-    "labs_markets_desc": "crwdns1891:0crwdne1891:0",
     "labs_red_packet": "crwdns1893:0crwdne1893:0",
     "labs_red_packet_desc": "crwdns1895:0crwdne1895:0",
     "labs_swap": "crwdns1897:0crwdne1897:0",

diff --git a/packages/mask/dashboard/locales/zh-CN.json b/packages/mask/dashboard/locales/zh-CN.json
@@ -347,8 +347,6 @@
     "settings_alert_merge_success": "您已成功地将云端备份合并到本地数据。",
     "labs_file_service": "文件服务",
     "labs_file_service_desc": "为用户提供去中心化文档存储功能。",
-    "labs_markets": "ITO",
-    "labs_markets_desc": "将数字资产出售给您的加密世界朋友。",
     "labs_red_packet": "红包",
     "labs_red_packet_desc": "使用加密红包向您的朋友送上最好的祝福。",
     "labs_swap": "兑换",

diff --git a/packages/mask/dashboard/locales/zh-TW.json b/packages/mask/dashboard/locales/zh-TW.json
@@ -297,8 +297,6 @@
     "settings_alert_merge_success": "您已經成功您的雲端備份合併到本地資料。",
     "labs_file_service": "文件服務",
     "labs_file_service_desc": "上傳及分享文件以享受永久去中心化存儲服務",
-    "labs_markets": "首次代幣發行",
-    "labs_markets_desc": "在推特自由發售虛擬資產&直接參與代幣發行",
     "labs_red_packet": "紅包",
     "labs_swap": "兌換",
     "labs_snapshot": "快照",

diff --git a/packages/mask/dashboard/pages/CreateMaskWallet/AddDeriveWallet/index.tsx b/packages/mask/dashboard/pages/CreateMaskWallet/AddDeriveWallet/index.tsx
@@ -114,9 +114,7 @@ const AddDeriveWallet = memo(function AddDeriveWallet() {
     }, [walletChunks, wallets])
 
     const [{ loading: confirmLoading }, onConfirm] = useAsyncFn(async () => {
-        if (!mnemonic) return
-
-        if (!pathIndexes.length) return
+        if (!mnemonic || !pathIndexes.length) return
 
         const result = await handlePasswordAndWallets(password, isReset)
         if (!result) return

diff --git a/packages/mask/dashboard/pages/Personas/components/PostHistory/PostHistoryRow.tsx b/packages/mask/dashboard/pages/Personas/components/PostHistory/PostHistoryRow.tsx
@@ -65,16 +65,6 @@ const SUPPORT_PLUGIN: Record<
         icon: <Icons.NFTRedPacket />,
         messageParse: (body: { message: string }) => body.message,
     },
-    'com.maskbook.ito:1': {
-        pluginID: PluginID.ITO,
-        icon: <Icons.ITO />,
-        messageParse: (body: any) => body.message.split(MSG_DELIMITER)[1],
-    },
-    'com.maskbook.ito:2': {
-        pluginID: PluginID.ITO,
-        icon: <Icons.ITO />,
-        messageParse: (body: any) => body.message.split(MSG_DELIMITER)[1],
-    },
 }
 
 interface PostHistoryRowProps {

diff --git a/packages/mask/dashboard/pages/PrivacyPolicy/en.html b/packages/mask/dashboard/pages/PrivacyPolicy/en.html
@@ -280,12 +280,12 @@ <h6>3. Service Content</h6>
                 </li>
                 <li>
                     <p>
-                        Blockchain contract interactions such as transfer, receiving, lucky drops, Swap, ITO, etc. You
-                        can use Mask Network's services such as transfer, receiving, lucky drops and Swap to manage
-                        digital assets, that is, use private keys for electronic signatures and to modify related
-                        blockchain ledger. Transfer means that the payer uses the payee's blockchain address to conduct
-                        transfer operations. The actual transfer and receiving operations occur in the relevant
-                        blockchain systems (not Mask Network).
+                        Blockchain contract interactions such as transfer, receiving, lucky drops, Swap, etc. You can
+                        use Mask Network's services such as transfer, receiving, lucky drops and Swap to manage digital
+                        assets, that is, use private keys for electronic signatures and to modify related blockchain
+                        ledger. Transfer means that the payer uses the payee's blockchain address to conduct transfer
+                        operations. The actual transfer and receiving operations occur in the relevant blockchain
+                        systems (not Mask Network).
                     </p>
                 </li>
                 <li>

diff --git a/packages/mask/dashboard/pages/Wallets/components/TransactionIcon/index.tsx b/packages/mask/dashboard/pages/Wallets/components/TransactionIcon/index.tsx
@@ -85,8 +85,6 @@ export const TransactionIconUI = memo<TransactionIconUIProps>(({ isFailed, isRed
             case HistoryAPI.TransactionType.CREATE_LUCKY_DROP:
             case HistoryAPI.TransactionType.CREATE_RED_PACKET:
                 return <Icons.RedPacket className={classes.icon} />
-            case HistoryAPI.TransactionType.FILL_POOL:
-                return <Icons.ITO color={MaskColorVar.warning} className={classes.icon} />
             default:
                 return <Icons.Interaction color={MaskColorVar.warning} className={classes.icon} />
         }

diff --git a/packages/mask/package.json b/packages/mask/package.json
@@ -47,7 +47,6 @@
     "@masknet/plugin-go-plus-security": "workspace:^",
     "@masknet/plugin-handle": "workspace:^",
     "@masknet/plugin-infra": "workspace:^",
-    "@masknet/plugin-ito": "workspace:^",
     "@masknet/plugin-maskbox": "workspace:^",
     "@masknet/plugin-nextid": "workspace:^",
     "@masknet/plugin-pets": "workspace:^",