From 6e86e039eb6466f02accde8709564799f073611c Mon Sep 17 00:00:00 2001 From: Hancheng Zhou Date: Mon, 7 Jun 2021 09:25:53 +0800 Subject: [PATCH] refactor: redpacket history (#2374) --- packages/contracts/CHANGELOG.md | 8 + packages/contracts/abis/HappyRedPacketV1.json | 121 +++++++++ ...pyRedPacket.json => HappyRedPacketV2.json} | 0 packages/contracts/types/HappyRedPacket.d.ts | 49 +++- .../contracts/types/HappyRedPacketV1.d.ts | 105 ++++++++ .../contracts/types/HappyRedPacketV2.d.ts | 97 +++++++ .../maskbook/src/_locales/en/messages.json | 18 +- .../maskbook/src/_locales/ja/messages.json | 14 +- .../maskbook/src/_locales/ko/messages.json | 12 +- .../maskbook/src/_locales/zh/messages.json | 12 +- .../InjectedComponents/PostDialog.tsx | 4 + .../DashboardDialogs/Wallet/History.tsx | 53 ---- .../Wallet/RedPacketDetail.tsx | 107 -------- .../DashboardDialogs/Wallet/index.tsx | 2 - .../options-page/DashboardRouters/Wallets.tsx | 24 -- .../plugins/Ethereum/UI/TransactionDialog.tsx | 23 +- .../src/plugins/ITO/UI/CompositionDialog.tsx | 2 +- .../plugins/ITO/UI/StyledLinearProgress.tsx | 37 ++- .../src/plugins/ITO/assets/formatDate.ts | 10 + .../src/plugins/ITO/hooks/useFillCallback.ts | 5 +- packages/maskbook/src/plugins/ITO/types.ts | 6 +- .../src/plugins/RedPacket/UI/RedPacket.tsx | 52 ++-- .../plugins/RedPacket/UI/RedPacketDialog.tsx | 44 +++- .../plugins/RedPacket/UI/RedPacketForm.tsx | 75 ++++-- .../RedPacket/UI/RedPacketHistoryList.tsx | 62 +++++ .../RedPacket/UI/RedPacketInHistoryList.tsx | 245 ++++++++++++++++++ .../plugins/RedPacket/UI/RedPacketInList.tsx | 75 ------ .../plugins/RedPacket/UI/RedPacketInPost.tsx | 11 +- .../plugins/RedPacket/UI/RedPacketList.tsx | 119 --------- .../src/plugins/RedPacket/apis/index.ts | 142 ++++++++++ .../src/plugins/RedPacket/constants.ts | 26 +- .../contracts/useRedPacketContract.ts | 16 +- .../src/plugins/RedPacket/database.ts | 36 ++- .../RedPacket/hooks/useAvailability.ts | 4 +- .../hooks/useAvailabilityComputed.ts | 10 +- .../RedPacket/hooks/useClaimCallback.ts | 64 +++-- .../RedPacket/hooks/useCreateCallback.ts | 99 ++++--- .../RedPacket/hooks/usePayloadComputed.ts | 92 ------- .../plugins/RedPacket/hooks/useRedPacket.ts | 39 --- .../RedPacket/hooks/useRedPacketHistory.ts | 10 + .../RedPacket/hooks/useRefundCallback.ts | 53 ++-- .../src/plugins/RedPacket/schema.json | 9 +- .../src/plugins/RedPacket/services.ts | 50 ++-- .../maskbook/src/plugins/RedPacket/types.ts | 163 ++++++------ .../src/plugins/Snapshot/apis/index.ts | 2 +- .../src/hooks/useTransactionState.ts | 1 + packages/web3-shared/src/pipes/index.ts | 10 + pnpm-lock.yaml | 14 +- 48 files changed, 1372 insertions(+), 860 deletions(-) create mode 100644 packages/contracts/abis/HappyRedPacketV1.json rename packages/contracts/abis/{HappyRedPacket.json => HappyRedPacketV2.json} (100%) create mode 100644 packages/contracts/types/HappyRedPacketV1.d.ts create mode 100644 packages/contracts/types/HappyRedPacketV2.d.ts delete mode 100644 packages/maskbook/src/extension/options-page/DashboardDialogs/Wallet/History.tsx delete mode 100644 packages/maskbook/src/extension/options-page/DashboardDialogs/Wallet/RedPacketDetail.tsx create mode 100644 packages/maskbook/src/plugins/ITO/assets/formatDate.ts create mode 100644 packages/maskbook/src/plugins/RedPacket/UI/RedPacketHistoryList.tsx create mode 100644 packages/maskbook/src/plugins/RedPacket/UI/RedPacketInHistoryList.tsx delete mode 100644 packages/maskbook/src/plugins/RedPacket/UI/RedPacketInList.tsx delete mode 100644 packages/maskbook/src/plugins/RedPacket/UI/RedPacketList.tsx create mode 100644 packages/maskbook/src/plugins/RedPacket/apis/index.ts delete mode 100644 packages/maskbook/src/plugins/RedPacket/hooks/usePayloadComputed.ts delete mode 100644 packages/maskbook/src/plugins/RedPacket/hooks/useRedPacket.ts create mode 100644 packages/maskbook/src/plugins/RedPacket/hooks/useRedPacketHistory.ts diff --git a/packages/contracts/CHANGELOG.md b/packages/contracts/CHANGELOG.md index 64350cb6c20f..51954034f7b5 100644 --- a/packages/contracts/CHANGELOG.md +++ b/packages/contracts/CHANGELOG.md @@ -50,3 +50,11 @@ Mainnet 0x26760783c12181efa3c435aee4ae686c53bdddbb Ropsten 0x6d84e4863c0530bc0bb4291ef0ff454a40660ca3 Rinkeby 0x575f906db24154977c7361c2319e2b25e897e3b6 ``` + +> May-21-2020 + +```plain +commit 494216e +Mainnet 0x8D8912E1237F9FF3EF661F32743CFB276E052F98 +Ropsten 0x2E37676de88aD97f2BdBAa24d1421b4E3f3a63c8 +``` diff --git a/packages/contracts/abis/HappyRedPacketV1.json b/packages/contracts/abis/HappyRedPacketV1.json new file mode 100644 index 000000000000..a61a18d2a53b --- /dev/null +++ b/packages/contracts/abis/HappyRedPacketV1.json @@ -0,0 +1,121 @@ +[ + { "inputs": [], "stateMutability": "nonpayable", "type": "constructor" }, + { + "anonymous": false, + "inputs": [ + { "indexed": false, "internalType": "bytes32", "name": "id", "type": "bytes32" }, + { "indexed": false, "internalType": "address", "name": "claimer", "type": "address" }, + { "indexed": false, "internalType": "uint256", "name": "claimed_value", "type": "uint256" }, + { "indexed": false, "internalType": "address", "name": "token_address", "type": "address" } + ], + "name": "ClaimSuccess", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { "indexed": false, "internalType": "uint256", "name": "total", "type": "uint256" }, + { "indexed": false, "internalType": "bytes32", "name": "id", "type": "bytes32" }, + { "indexed": false, "internalType": "address", "name": "creator", "type": "address" }, + { "indexed": false, "internalType": "uint256", "name": "creation_time", "type": "uint256" }, + { "indexed": false, "internalType": "address", "name": "token_address", "type": "address" } + ], + "name": "CreationSuccess", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { "indexed": false, "internalType": "bytes32", "name": "id", "type": "bytes32" }, + { "indexed": false, "internalType": "address", "name": "token_address", "type": "address" }, + { "indexed": false, "internalType": "uint256", "name": "remaining_balance", "type": "uint256" } + ], + "name": "RefundSuccess", + "type": "event" + }, + { + "inputs": [{ "internalType": "bytes32", "name": "id", "type": "bytes32" }], + "name": "check_availability", + "outputs": [ + { "internalType": "address", "name": "token_address", "type": "address" }, + { "internalType": "uint256", "name": "balance", "type": "uint256" }, + { "internalType": "uint256", "name": "total", "type": "uint256" }, + { "internalType": "uint256", "name": "claimed", "type": "uint256" }, + { "internalType": "bool", "name": "expired", "type": "bool" }, + { "internalType": "bool", "name": "ifclaimed", "type": "bool" } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [{ "internalType": "bytes32", "name": "id", "type": "bytes32" }], + "name": "check_claimed_list", + "outputs": [{ "internalType": "address[]", "name": "claimer_addrs", "type": "address[]" }], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { "internalType": "bytes32", "name": "id", "type": "bytes32" }, + { "internalType": "string", "name": "password", "type": "string" }, + { "internalType": "address", "name": "_recipient", "type": "address" }, + { "internalType": "bytes32", "name": "validation", "type": "bytes32" } + ], + "name": "claim", + "outputs": [{ "internalType": "uint256", "name": "claimed", "type": "uint256" }], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [], + "name": "contract_creator", + "outputs": [{ "internalType": "address", "name": "", "type": "address" }], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { "internalType": "bytes32", "name": "_hash", "type": "bytes32" }, + { "internalType": "uint8", "name": "_number", "type": "uint8" }, + { "internalType": "bool", "name": "_ifrandom", "type": "bool" }, + { "internalType": "uint256", "name": "_duration", "type": "uint256" }, + { "internalType": "bytes32", "name": "_seed", "type": "bytes32" }, + { "internalType": "string", "name": "_message", "type": "string" }, + { "internalType": "string", "name": "_name", "type": "string" }, + { "internalType": "uint256", "name": "_token_type", "type": "uint256" }, + { "internalType": "address", "name": "_token_addr", "type": "address" }, + { "internalType": "uint256", "name": "_total_tokens", "type": "uint256" } + ], + "name": "create_red_packet", + "outputs": [], + "stateMutability": "payable", + "type": "function" + }, + { + "inputs": [{ "internalType": "bytes32", "name": "id", "type": "bytes32" }], + "name": "refund", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [{ "internalType": "address", "name": "a", "type": "address" }], + "name": "toBytes", + "outputs": [{ "internalType": "bytes", "name": "b", "type": "bytes" }], + "stateMutability": "pure", + "type": "function" + }, + { + "inputs": [ + { "internalType": "uint256", "name": "token_type", "type": "uint256" }, + { "internalType": "address", "name": "token_address", "type": "address" }, + { "internalType": "address", "name": "sender_address", "type": "address" }, + { "internalType": "address", "name": "recipient_address", "type": "address" }, + { "internalType": "uint256", "name": "amount", "type": "uint256" } + ], + "name": "transfer_token", + "outputs": [], + "stateMutability": "payable", + "type": "function" + } +] diff --git a/packages/contracts/abis/HappyRedPacket.json b/packages/contracts/abis/HappyRedPacketV2.json similarity index 100% rename from packages/contracts/abis/HappyRedPacket.json rename to packages/contracts/abis/HappyRedPacketV2.json diff --git a/packages/contracts/types/HappyRedPacket.d.ts b/packages/contracts/types/HappyRedPacket.d.ts index 52fcfda60649..536e406154a6 100644 --- a/packages/contracts/types/HappyRedPacket.d.ts +++ b/packages/contracts/types/HappyRedPacket.d.ts @@ -80,8 +80,6 @@ export interface HappyRedPacket extends BaseContract { _total_tokens: number | string | BN, ): PayableTransactionObject - refund(id: string | number[]): NonPayableTransactionObject - check_availability(id: string | number[]): NonPayableTransactionObject<{ token_address: string balance: string @@ -97,19 +95,44 @@ export interface HappyRedPacket extends BaseContract { 5: string }> - contract_creator(): NonPayableTransactionObject + refund(id: string | number[]): NonPayableTransactionObject } events: { - ClaimSuccess(cb?: Callback): EventEmitter - ClaimSuccess(options?: EventOptions, cb?: Callback): EventEmitter - - CreationSuccess(cb?: Callback): EventEmitter - CreationSuccess(options?: EventOptions, cb?: Callback): EventEmitter - - RefundSuccess(cb?: Callback): EventEmitter - RefundSuccess(options?: EventOptions, cb?: Callback): EventEmitter - - allEvents(options?: EventOptions, cb?: Callback): EventEmitter + ClaimSuccess: ContractEventLog<{ + id: string + claimer: string + claimed_value: string + token_address: string + 0: string + 1: string + 2: string + 3: string + }> + CreationSuccess: ContractEventLog<{ + total: string + id: string + name: string + message: string + creator: string + creation_time: string + token_address: string + 0: string + 1: string + 2: string + 3: string + 4: string + 5: string + 6: string + }> + RefundSuccess: ContractEventLog<{ + id: string + token_address: string + remaining_balance: string + 0: string + 1: string + 2: string + }> + allEvents: (options?: EventOptions, cb?: Callback) => EventEmitter } once(event: 'ClaimSuccess', cb: Callback): void diff --git a/packages/contracts/types/HappyRedPacketV1.d.ts b/packages/contracts/types/HappyRedPacketV1.d.ts new file mode 100644 index 000000000000..25d614c6d468 --- /dev/null +++ b/packages/contracts/types/HappyRedPacketV1.d.ts @@ -0,0 +1,105 @@ +/* Autogenerated file. Do not edit manually. */ +/* tslint:disable */ +/* eslint-disable */ + +import BN from 'bn.js' +import { Contract, ContractOptions } from 'web3-eth-contract' +import { EventLog } from 'web3-core' +import { EventEmitter } from 'events' +import { ContractEvent, Callback, TransactionObject, BlockType } from './types' + +interface EventOptions { + filter?: object + fromBlock?: BlockType + topics?: string[] +} + +export class HappyRedPacketV1 extends Contract { + constructor(jsonInterface: any[], address?: string, options?: ContractOptions) + clone(): HappyRedPacketV1 + methods: { + check_availability(id: string | number[]): TransactionObject<{ + token_address: string + balance: string + total: string + claimed: string + expired: boolean + ifclaimed: boolean + 0: string + 1: string + 2: string + 3: string + 4: boolean + 5: boolean + }> + + check_claimed_list(id: string | number[]): TransactionObject + + claim( + id: string | number[], + password: string, + _recipient: string, + validation: string | number[], + ): TransactionObject + + contract_creator(): TransactionObject + + create_red_packet( + _hash: string | number[], + _number: number | string, + _ifrandom: boolean, + _duration: number | string, + _seed: string | number[], + _message: string, + _name: string, + _token_type: number | string, + _token_addr: string, + _total_tokens: number | string, + ): TransactionObject + + refund(id: string | number[]): TransactionObject + + toBytes(a: string): TransactionObject + + transfer_token( + token_type: number | string, + token_address: string, + sender_address: string, + recipient_address: string, + amount: number | string, + ): TransactionObject + } + events: { + ClaimSuccess: ContractEvent<{ + id: string + claimer: string + claimed_value: string + token_address: string + 0: string + 1: string + 2: string + 3: string + }> + CreationSuccess: ContractEvent<{ + total: string + id: string + creator: string + creation_time: string + token_address: string + 0: string + 1: string + 2: string + 3: string + 4: string + }> + RefundSuccess: ContractEvent<{ + id: string + token_address: string + remaining_balance: string + 0: string + 1: string + 2: string + }> + allEvents: (options?: EventOptions, cb?: Callback) => EventEmitter + } +} diff --git a/packages/contracts/types/HappyRedPacketV2.d.ts b/packages/contracts/types/HappyRedPacketV2.d.ts new file mode 100644 index 000000000000..1999ae3608ae --- /dev/null +++ b/packages/contracts/types/HappyRedPacketV2.d.ts @@ -0,0 +1,97 @@ +/* Autogenerated file. Do not edit manually. */ +/* tslint:disable */ +/* eslint-disable */ + +import BN from 'bn.js' +import { Contract, ContractOptions } from 'web3-eth-contract' +import { EventLog } from 'web3-core' +import { EventEmitter } from 'events' +import { ContractEvent, Callback, TransactionObject, BlockType } from './types' + +interface EventOptions { + filter?: object + fromBlock?: BlockType + topics?: string[] +} + +export class HappyRedPacketV2 extends Contract { + constructor(jsonInterface: any[], address?: string, options?: ContractOptions) + clone(): HappyRedPacketV2 + methods: { + contract_creator(): TransactionObject + + create_red_packet( + _hash: string | number[], + _number: number | string, + _ifrandom: boolean, + _duration: number | string, + _seed: string | number[], + _message: string, + _name: string, + _token_type: number | string, + _token_addr: string, + _total_tokens: number | string, + ): TransactionObject + + claim( + id: string | number[], + password: string, + _recipient: string, + validation: string | number[], + ): TransactionObject + + check_availability(id: string | number[]): TransactionObject<{ + token_address: string + balance: string + total: string + claimed: string + expired: boolean + claimed_amount: string + 0: string + 1: string + 2: string + 3: string + 4: boolean + 5: string + }> + + refund(id: string | number[]): TransactionObject + } + events: { + ClaimSuccess: ContractEvent<{ + id: string + claimer: string + claimed_value: string + token_address: string + 0: string + 1: string + 2: string + 3: string + }> + CreationSuccess: ContractEvent<{ + total: string + id: string + name: string + message: string + creator: string + creation_time: string + token_address: string + 0: string + 1: string + 2: string + 3: string + 4: string + 5: string + 6: string + }> + RefundSuccess: ContractEvent<{ + id: string + token_address: string + remaining_balance: string + 0: string + 1: string + 2: string + }> + allEvents: (options?: EventOptions, cb?: Callback) => EventEmitter + } +} diff --git a/packages/maskbook/src/_locales/en/messages.json b/packages/maskbook/src/_locales/en/messages.json index 616c1cde7a41..507642c76909 100644 --- a/packages/maskbook/src/_locales/en/messages.json +++ b/packages/maskbook/src/_locales/en/messages.json @@ -98,9 +98,6 @@ "eanble_or_disable_plugin": "enable/disable plugin", "feedback": "Feedback", "fingerprint": "Fingerprint", - "activity": "Activity", - "activity_inbound": "Inbound", - "activity_outbound": "Outbound", "buy": "Buy", "buy_now": "Buy Now", "setup_guide_optional": "[Optional]", @@ -341,21 +338,24 @@ "plugin_wallet_settings_collectible_data_source_primary": "Collectible Data Source", "plugin_wallet_settings_collectible_data_source_secondary": "Select the source of collectible data.", "plugin_wallet_name_placeholder": "Enter 1-12 characters", + "plugin_wallet_fail_to_sign": "Failed to sign password.", + "plugin_wallet_cancel_sign": "Signature cancelled.", "plugin_red_packet_display_name": "Plugin: Red Packet", "plugin_red_packet_split_mode": "Split Mode", "plugin_red_packet_average": "Average", "plugin_red_packet_random": "Random", "plugin_red_packet_shares": "Shares", "plugin_red_packet_best_wishes": "Best Wishes!", - "plugin_red_packet_create_new": "Create New", + "plugin_red_packet_create_new": "New", "plugin_red_packet_claim": "Claim", "plugin_red_packet_claiming": "Claiming...", "plugin_red_packet_refund": "Refund", + "plugin_red_packet_empty": "Empty", "plugin_red_packet_refunding": "Refunding", "plugin_red_packet_select_existing": "Select Existing", "plugin_red_packet_share_message": "I just claimed a red packet from @{{sender}} on {{network}} network. Follow @realMaskbook (mask.io) to claim red packets.\n#mask_io #RedPacket\n{{payload}}", "plugin_red_packet_attached_message": "Attached Message", - "plugin_red_packet_from": "From: {{name}}", + "plugin_red_packet_from": "From: @{{name}}", "plugin_red_packet_description_claimed": "You have already claimed.", "plugin_red_packet_description_expired": "The red packet is expired.", "plugin_red_packet_description_refunded": "The red packet has been refunded.", @@ -368,6 +368,12 @@ "plugin_red_packet_amount_per_share": "Amount per Share", "plugin_red_packet_send_symbol": "Send {{symbol}}", "plugin_red_packet_create_with_token": "Creating red packet with {{symbol}}", + "plugin_red_packet_history_duration": "Time: {{startTime}} ~ {{endTime}} (UTC+8)", + "plugin_red_packet_history_total_amount": "Total Amount: {{amount}} {{symbol}}", + "plugin_red_packet_history_total_claimed_amount": "Total: {{claimedAmount}}/{{amount}} {{symbol}}", + "plugin_red_packet_history_claimed": "Claimed: {{claimedShares}}/{{shares}} Share", + "plugin_red_packet_history_split_mode": "Split Mode: {{mode}}", + "plugin_red_packet_history_send": "Send", "plugin_gitcoin_readme": "By using this service, you will also be contributing 5% of your contribution to the Gitcoin grants development fund.", "plugin_gitcoin_readme_fund_link": "https://gitcoin.co/grants/86/gitcoin-sustainability-fund", "plugin_gitcoin_select_a_token": "Select a token", @@ -496,7 +502,7 @@ "plugin_ito_begin_time": "Start Time {{zone}}", "plugin_ito_wait_unlock_time": "Claim in {{unlockTime}}", "plugin_ito_claim": "Claim", - "plugin_ito_claiming": "Claiming", + "plugin_ito_claiming": "Claiming...", "plugin_ito_claim_all": "Claim All", "plugin_ito_claimed": "Claimed", "plugin_ito_qualification_start_time": "Qualification Start Time:", diff --git a/packages/maskbook/src/_locales/ja/messages.json b/packages/maskbook/src/_locales/ja/messages.json index 02191ef57d96..d10540659395 100644 --- a/packages/maskbook/src/_locales/ja/messages.json +++ b/packages/maskbook/src/_locales/ja/messages.json @@ -97,10 +97,7 @@ "error_unknown": "不明のエラー", "eanble_or_disable_plugin": "プラグインを有効/無効化する", "feedback": "フィードバック", - "fingerprint": "フィンガープリント", - "activity": "履歴", - "activity_inbound": "インバウンド", - "activity_outbound": "アウトバウンド", + "fingerprint": "指紋（フィンガープリント）", "buy": "購入する", "buy_now": "今すぐ購入", "setup_guide_optional": "[オプション]", @@ -341,6 +338,8 @@ "plugin_wallet_settings_collectible_data_source_primary": "コレクションデータのソース", "plugin_wallet_settings_collectible_data_source_secondary": "コレクションデータのソースを選択", "plugin_wallet_name_placeholder": "", + "plugin_wallet_fail_to_sign": "", + "plugin_wallet_cancel_sign": "", "plugin_red_packet_display_name": "プラグイン: 投げ銭", "plugin_red_packet_split_mode": "分割モード", "plugin_red_packet_average": "平均", @@ -351,6 +350,7 @@ "plugin_red_packet_claim": "受け取る", "plugin_red_packet_claiming": "", "plugin_red_packet_refund": "無効", + "plugin_red_packet_empty": "", "plugin_red_packet_refunding": "", "plugin_red_packet_select_existing": "既存の投げ銭を選択", "plugin_red_packet_share_message": "", @@ -368,6 +368,12 @@ "plugin_red_packet_amount_per_share": "1株当たりの金額", "plugin_red_packet_send_symbol": "{{symbol}} を送る", "plugin_red_packet_create_with_token": "{{symbol}} で投げ銭を作成する", + "plugin_red_packet_history_duration": "", + "plugin_red_packet_history_total_amount": "", + "plugin_red_packet_history_total_claimed_amount": "", + "plugin_red_packet_history_claimed": "", + "plugin_red_packet_history_split_mode": "", + "plugin_red_packet_history_send": "", "plugin_gitcoin_readme": "このサービスを利用するにあたり、寄付金額の 5% が Gitcoin grants development fund に寄付されます", "plugin_gitcoin_readme_fund_link": "https://gitcoin.co/grants/86/gitcoin-sustainability-fund", "plugin_gitcoin_select_a_token": "トークンを選択する", diff --git a/packages/maskbook/src/_locales/ko/messages.json b/packages/maskbook/src/_locales/ko/messages.json index 7f9f98757b07..118256d5bc9c 100644 --- a/packages/maskbook/src/_locales/ko/messages.json +++ b/packages/maskbook/src/_locales/ko/messages.json @@ -98,9 +98,6 @@ "eanble_or_disable_plugin": "플러그인 사용/사용 안 함", "feedback": "피드백", "fingerprint": "지문", - "activity": "활동", - "activity_inbound": "받기", - "activity_outbound": "보내기", "buy": "매수하기", "buy_now": "바로 매수하기", "setup_guide_optional": "[옵션널]", @@ -341,6 +338,8 @@ "plugin_wallet_settings_collectible_data_source_primary": "수집품 데이터 소스", "plugin_wallet_settings_collectible_data_source_secondary": "수집품 데이터 소스 선택", "plugin_wallet_name_placeholder": "", + "plugin_wallet_fail_to_sign": "", + "plugin_wallet_cancel_sign": "", "plugin_red_packet_display_name": "플러그인: 빨간 백", "plugin_red_packet_split_mode": "분할 모드", "plugin_red_packet_average": "평균", @@ -351,6 +350,7 @@ "plugin_red_packet_claim": "수령", "plugin_red_packet_claiming": "", "plugin_red_packet_refund": "반환", + "plugin_red_packet_empty": "", "plugin_red_packet_refunding": "", "plugin_red_packet_select_existing": "기존 빨간 백 선택", "plugin_red_packet_share_message": "", @@ -368,6 +368,12 @@ "plugin_red_packet_amount_per_share": "공유 총액", "plugin_red_packet_send_symbol": "{{symbol}} 보내기", "plugin_red_packet_create_with_token": "{{symbol}} 으로 빨간 백 만드는 중", + "plugin_red_packet_history_duration": "", + "plugin_red_packet_history_total_amount": "", + "plugin_red_packet_history_total_claimed_amount": "", + "plugin_red_packet_history_claimed": "", + "plugin_red_packet_history_split_mode": "", + "plugin_red_packet_history_send": "", "plugin_gitcoin_readme": "이 서비스를 이용하면 Gitcoin 개발 기금에 당신의 기여금의 5%를 기부할 것이다.", "plugin_gitcoin_readme_fund_link": "https://gitcoin.co/grants/86/gitcoin-sustainability-fund", "plugin_gitcoin_select_a_token": "토큰 선택", diff --git a/packages/maskbook/src/_locales/zh/messages.json b/packages/maskbook/src/_locales/zh/messages.json index bc0daf60d513..a4e645975b9a 100644 --- a/packages/maskbook/src/_locales/zh/messages.json +++ b/packages/maskbook/src/_locales/zh/messages.json @@ -98,9 +98,6 @@ "eanble_or_disable_plugin": "開啟/關閉插件", "feedback": "提供建議", "fingerprint": "指紋", - "activity": "活動", - "activity_inbound": "向内", - "activity_outbound": "向外", "buy": "購買", "buy_now": "立即購買", "setup_guide_optional": "[選填]", @@ -341,6 +338,8 @@ "plugin_wallet_settings_collectible_data_source_primary": "收藏品資料來源", "plugin_wallet_settings_collectible_data_source_secondary": "選擇收藏品資料來源。", "plugin_wallet_name_placeholder": "", + "plugin_wallet_fail_to_sign": "", + "plugin_wallet_cancel_sign": "", "plugin_red_packet_display_name": "插件：紅包", "plugin_red_packet_split_mode": "分割模式", "plugin_red_packet_average": "平均", @@ -351,6 +350,7 @@ "plugin_red_packet_claim": "認領", "plugin_red_packet_claiming": "", "plugin_red_packet_refund": "退款", + "plugin_red_packet_empty": "", "plugin_red_packet_refunding": "", "plugin_red_packet_select_existing": "選擇已存在的", "plugin_red_packet_share_message": "", @@ -368,6 +368,12 @@ "plugin_red_packet_amount_per_share": "每次分享總額", "plugin_red_packet_send_symbol": "送出 {{symbol}}", "plugin_red_packet_create_with_token": "使用 {{symbol}} 建立紅包", + "plugin_red_packet_history_duration": "", + "plugin_red_packet_history_total_amount": "", + "plugin_red_packet_history_total_claimed_amount": "", + "plugin_red_packet_history_claimed": "", + "plugin_red_packet_history_split_mode": "", + "plugin_red_packet_history_send": "", "plugin_gitcoin_readme": "通過使用此服務，您還將向 Gitcoin grants development fund 捐款 5%", "plugin_gitcoin_readme_fund_link": "https://gitcoin.co/grants/86/gitcoin-sustainability-fund", "plugin_gitcoin_select_a_token": "選擇一個代幣", diff --git a/packages/maskbook/src/components/InjectedComponents/PostDialog.tsx b/packages/maskbook/src/components/InjectedComponents/PostDialog.tsx index cbc6cba65879..48962743a971 100644 --- a/packages/maskbook/src/components/InjectedComponents/PostDialog.tsx +++ b/packages/maskbook/src/components/InjectedComponents/PostDialog.tsx @@ -61,6 +61,9 @@ const useStyles = makeStyles({ sup: { paddingLeft: 2, }, + button: { + zIndex: 1, + }, }) export interface PostDialogUIProps extends withClasses { @@ -233,6 +236,7 @@ export function PostDialogUI(props: PostDialogUIProps) { ) : null}