From 0bd0e802563a23e39a05dff95ec6f518f5657104 Mon Sep 17 00:00:00 2001 From: billy Date: Wed, 15 Jun 2022 17:44:10 +0800 Subject: [PATCH 1/4] fix: crypto ai makeoffer img --- .../Collectible/SNSAdaptor/OpenSea/ActionBar.tsx | 1 + .../plugins/CryptoartAI/SNSAdaptor/ActionBar.tsx | 1 + .../CryptoartAI/SNSAdaptor/MakeOfferDialog.tsx | 15 ++++++++------- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/packages/mask/src/plugins/Collectible/SNSAdaptor/OpenSea/ActionBar.tsx b/packages/mask/src/plugins/Collectible/SNSAdaptor/OpenSea/ActionBar.tsx index cce3789f3c96..e1ad2f9cbe2b 100644 --- a/packages/mask/src/plugins/Collectible/SNSAdaptor/OpenSea/ActionBar.tsx +++ b/packages/mask/src/plugins/Collectible/SNSAdaptor/OpenSea/ActionBar.tsx @@ -17,6 +17,7 @@ const useStyles = makeStyles()((theme) => { return { root: { width: 'calc(100% - 24px)', + gap: 8, }, button: { flex: 1, diff --git a/packages/mask/src/plugins/CryptoartAI/SNSAdaptor/ActionBar.tsx b/packages/mask/src/plugins/CryptoartAI/SNSAdaptor/ActionBar.tsx index aac51bf715a2..9db2a681d3f8 100644 --- a/packages/mask/src/plugins/CryptoartAI/SNSAdaptor/ActionBar.tsx +++ b/packages/mask/src/plugins/CryptoartAI/SNSAdaptor/ActionBar.tsx @@ -12,6 +12,7 @@ const useStyles = makeStyles()((theme) => { return { root: { flex: 1, + gap: 8, }, button: { flex: 1, diff --git a/packages/mask/src/plugins/CryptoartAI/SNSAdaptor/MakeOfferDialog.tsx b/packages/mask/src/plugins/CryptoartAI/SNSAdaptor/MakeOfferDialog.tsx index fec469141dce..d0b1f20a51e2 100644 --- a/packages/mask/src/plugins/CryptoartAI/SNSAdaptor/MakeOfferDialog.tsx +++ b/packages/mask/src/plugins/CryptoartAI/SNSAdaptor/MakeOfferDialog.tsx @@ -1,5 +1,5 @@ import { useEffect, useMemo, useState, useCallback } from 'react' -import { InjectedDialog, useOpenShareTxDialog } from '@masknet/shared' +import { InjectedDialog, NFTCardStyledAssetPlayer, useOpenShareTxDialog } from '@masknet/shared' import { makeStyles } from '@masknet/theme' import { first } from 'lodash-unified' import BigNumber from 'bignumber.js' @@ -155,6 +155,7 @@ export function MakeOfferDialog(props: MakeOfferDialogProps) { }, [amount, balance.value, isVerified, is24Auction]) if (!asset || !asset.value) return null + return ( {assetSource?.ossUrl.match(/\.(mp4|avi|webm)$/i) ? ( - {assetSource?.title} + ) : ( - {assetSource?.title} + {assetSource?.title} )}

From bc5924c2eb406e86b2af333bc8be33ecc7f9f96d Mon Sep 17 00:00:00 2001 From: billy Date: Thu, 16 Jun 2022 00:06:03 +0800 Subject: [PATCH 2/4] fix: auction --- packages/mask/src/plugins/CryptoartAI/SNSAdaptor/ActionBar.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mask/src/plugins/CryptoartAI/SNSAdaptor/ActionBar.tsx b/packages/mask/src/plugins/CryptoartAI/SNSAdaptor/ActionBar.tsx index 9db2a681d3f8..b8fa73c863d4 100644 --- a/packages/mask/src/plugins/CryptoartAI/SNSAdaptor/ActionBar.tsx +++ b/packages/mask/src/plugins/CryptoartAI/SNSAdaptor/ActionBar.tsx @@ -66,7 +66,7 @@ export function ActionBar(props: ActionBarProps) { {!assetSource?.isSoldOut && !assetSource?.is24Auction && (!assetSource?.trade?.latestBid || assetSource?.trade?.latestBid < assetSource?.priceInEth) && - assetSource?.trade?.isCanAuction ? ( + assetSource?.trade?.is_auction ? ( Date: Thu, 16 Jun 2022 00:56:47 +0800 Subject: [PATCH 3/4] fix: num storage --- .../plugins/RedPacket/SNSAdaptor/RedPacketConfirmDialog.tsx | 3 ++- .../plugins/RedPacket/SNSAdaptor/hooks/useCreateCallback.tsx | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketConfirmDialog.tsx b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketConfirmDialog.tsx index db3918f4badb..784e29abb3ad 100644 --- a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketConfirmDialog.tsx +++ b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketConfirmDialog.tsx @@ -126,7 +126,8 @@ export function RedPacketConfirmDialog(props: ConfirmRedPacketFormProps) { payload.current.shares = settings.shares payload.current.password = privateKey payload.current.rpid = CreationSuccess.id - payload.current.total = CreationSuccess.total + payload.current.total = CreationSuccess.total ?? sessionStorage.getItem('red_packet_total') + sessionStorage.removeItem('red_packet_total') payload.current.duration = settings.duration payload.current.creation_time = Number.parseInt(CreationSuccess.creation_time, 10) * 1000 payload.current.token = settings.token diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/hooks/useCreateCallback.tsx b/packages/mask/src/plugins/RedPacket/SNSAdaptor/hooks/useCreateCallback.tsx index b7af97327970..08658a61b767 100644 --- a/packages/mask/src/plugins/RedPacket/SNSAdaptor/hooks/useCreateCallback.tsx +++ b/packages/mask/src/plugins/RedPacket/SNSAdaptor/hooks/useCreateCallback.tsx @@ -115,7 +115,6 @@ export function useCreateCallback(redPacketSettings: RedPacketSettings, version: return useAsyncFn(async () => { const { token } = redPacketSettings const createParams = await getCreateParams() - if (!token || !redPacketContract || !createParams) return const { gas, params, paramsObj, gasError } = createParams @@ -144,6 +143,7 @@ export function useCreateCallback(redPacketSettings: RedPacketSettings, version: config, ) + sessionStorage.setItem('red_packet_total', paramsObj.total) return connection.sendTransaction(tx) }, [account, connection, redPacketContract, redPacketSettings, chainId, getCreateParams]) } From cfc9fd9c879a34603e639422af4ffdf8d1d44d5a Mon Sep 17 00:00:00 2001 From: billy Date: Thu, 16 Jun 2022 01:29:06 +0800 Subject: [PATCH 4/4] fix: todo --- .../plugins/RedPacket/SNSAdaptor/hooks/useCreateCallback.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/hooks/useCreateCallback.tsx b/packages/mask/src/plugins/RedPacket/SNSAdaptor/hooks/useCreateCallback.tsx index 08658a61b767..fe2ac86fccea 100644 --- a/packages/mask/src/plugins/RedPacket/SNSAdaptor/hooks/useCreateCallback.tsx +++ b/packages/mask/src/plugins/RedPacket/SNSAdaptor/hooks/useCreateCallback.tsx @@ -142,7 +142,7 @@ export function useCreateCallback(redPacketSettings: RedPacketSettings, version: redPacketContract.methods.create_red_packet(...params), config, ) - + // TODO: kill this storage and support contract event deocde sessionStorage.setItem('red_packet_total', paramsObj.total) return connection.sendTransaction(tx) }, [account, connection, redPacketContract, redPacketSettings, chainId, getCreateParams])