Skip to content

fix: lucky drop schema #6093

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
guanbinrui merged 3 commits into from
Apr 18, 2022
Merged

fix: lucky drop schema #6093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
346b249
chore: lucky drop schema
hanszhoou Apr 17, 2022
23be8ee
chore: lucky drop schema
hanszhoou Apr 17, 2022
b753294
chore: reply code review
hanszhoou Apr 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacket/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) => Reflect.has(payload.token ?? {}, k))
? payload.token
: tokenDetailed
// #endregion

const { canFetch, canClaim, canRefund, listOfStatus } = availabilityComputed
Expand Down
7 changes: 6 additions & 1 deletion packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketInHistoryList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion packages/mask/src/plugins/RedPacket/schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
"title": "symbol"
}
},
"required": ["address", "decimals", "name", "symbol"],

@hanszhoou hanszhoou Apr 17, 2022

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"decimals", "name", "symbol" can be fetched later, since sheer size of payload would cause encoded image not work.

"required": ["address"],
"title": "token"
}
},
Expand Down