From 346b249a5e06d750fc9391d2f8e0316d0394c551 Mon Sep 17 00:00:00 2001 From: zhouhanseng Date: Sun, 17 Apr 2022 18:45:11 +0800 Subject: [PATCH 1/3] chore: lucky drop schema --- .../RedPacket/SNSAdaptor/RedPacketInHistoryList.tsx | 7 ++++++- packages/mask/src/plugins/RedPacket/schema.json | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketInHistoryList.tsx b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketInHistoryList.tsx index 3a5495fe28ca..df7cfeaff2ac 100644 --- a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketInHistoryList.tsx +++ b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketInHistoryList.tsx @@ -18,6 +18,8 @@ import { FungibleTokenDetailed, useFungibleTokenDetailed, useTokenConstants, + ERC20TokenDetailed, + NativeTokenDetailed, } from '@masknet/web3-shared-evm' import { dateTimeFormat } from '../../ITO/assets/formatDate' import ActionButton from '../../../extension/options-page/DashboardComponents/ActionButton' @@ -208,7 +210,10 @@ export function RedPacketInHistoryList(props: RedPacketInHistoryListProps) { tokenAddress ?? '', ) - const historyToken = (history as RedPacketJSONPayload).token ?? tokenDetailed + const historyToken = + (history as RedPacketJSONPayload).token ?? + tokenDetailed ?? + ({ address: history.token_address } as ERC20TokenDetailed | NativeTokenDetailed) // #region remote controlled transaction dialog const { setDialog: setTransactionDialog } = useRemoteControlledDialog( diff --git a/packages/mask/src/plugins/RedPacket/schema.json b/packages/mask/src/plugins/RedPacket/schema.json index 0f7f193c1f70..50d264cbc15c 100644 --- a/packages/mask/src/plugins/RedPacket/schema.json +++ b/packages/mask/src/plugins/RedPacket/schema.json @@ -87,7 +87,7 @@ "title": "symbol" } }, - "required": ["address", "decimals", "name", "symbol"], + "required": ["address"], "title": "token" } }, From 23be8ee8749f7096e0da433804741800e1ae1b46 Mon Sep 17 00:00:00 2001 From: zhouhanseng Date: Sun, 17 Apr 2022 19:04:20 +0800 Subject: [PATCH 2/3] chore: lucky drop schema --- .../src/plugins/RedPacket/SNSAdaptor/RedPacket/index.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacket/index.tsx b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacket/index.tsx index 814db696b16e..128cf7321ebf 100644 --- a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacket/index.tsx +++ b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacket/index.tsx @@ -63,7 +63,10 @@ export function RedPacket(props: RedPacketProps) { : EthereumTokenType.ERC20), payload.token?.address ?? payload.token_address ?? '', ) - const token = payload.token ?? tokenDetailed + const token = + payload.token && ['chainId', 'decimal', 'symbol'].every((k) => k in (payload.token ?? {})) + ? payload.token + : tokenDetailed // #endregion const { canFetch, canClaim, canRefund, listOfStatus } = availabilityComputed From b7532947793a5ab548c67d7be0d0baa6ede25092 Mon Sep 17 00:00:00 2001 From: zhouhanseng Date: Mon, 18 Apr 2022 09:30:51 +0800 Subject: [PATCH 3/3] chore: reply code review --- .../mask/src/plugins/RedPacket/SNSAdaptor/RedPacket/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacket/index.tsx b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacket/index.tsx index 128cf7321ebf..bf01e18c4647 100644 --- a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacket/index.tsx +++ b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacket/index.tsx @@ -64,7 +64,7 @@ export function RedPacket(props: RedPacketProps) { payload.token?.address ?? payload.token_address ?? '', ) const token = - payload.token && ['chainId', 'decimal', 'symbol'].every((k) => k in (payload.token ?? {})) + payload.token && ['chainId', 'decimal', 'symbol'].every((k) => Reflect.has(payload.token ?? {}, k)) ? payload.token : tokenDetailed // #endregion