Skip to content
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.

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

fix: support issuerName #1253

Merged
merged 1 commit into from
Aug 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions src/apis/ecosystem.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ export const l2beatOrigin = "https://l2beat.com"
export const ecosystemTVLUrl = l2beatOrigin + "/api/tvl/scroll.json"
export const ecosystemActivityUrl = l2beatOrigin + "/api/activity/scroll.json"

export const fetchEcosystemProtocolLogo = (name, ext) => `${ecosystemListLogoUrl}${name}${ext}`
export const fetchEcosystemProtocolByNameURL = name => `${ecosystemListUrl}?name=${name}`

// cross origin
// export const l2beatOrigin = "https://api.l2beat.com"
// export const ecosystemTVLUrl = l2beatOrigin + "/api/tvl/aggregate?projectSlugs=scroll"
Expand Down
10 changes: 8 additions & 2 deletions src/pages/canvas/Dashboard/BadgeDetailDialog/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { useRainbowContext } from "@/contexts/RainbowProvider"
import useCheckViewport from "@/hooks/useCheckViewport"
import useSnackbar from "@/hooks/useSnackbar"
import Dialog from "@/pages/canvas/components/Dialog"
import { checkBadgeUpgradable, fetchNotionBadgeByAddr, mintBadge } from "@/services/canvasService"
import { checkBadgeUpgradable, fetchIssuer, fetchNotionBadgeByAddr, mintBadge } from "@/services/canvasService"
import useCanvasStore, { BadgeDetailDialogType, BadgesDialogType } from "@/stores/canvasStore"
import { generateShareTwitterURL, ipfsToBrowserURL, requireEnv, sentryDebug } from "@/utils"

Expand Down Expand Up @@ -85,7 +85,13 @@ const BadgeDetailDialog = () => {
queryKey: ["notionBadge", selectedBadge.badgeContract],
queryFn: async () => {
const badge = await fetchNotionBadgeByAddr(selectedBadge.badgeContract)
return badge.issuer ?? {}
if (badge.issuer) {
return badge.issuer
} else if (selectedBadge.issuerName) {
const issuer = await fetchIssuer(selectedBadge.issuerName)
return issuer
}
return {}
},
initialData: {},
})
Expand Down
19 changes: 13 additions & 6 deletions src/pages/canvas/badge/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { useRainbowContext } from "@/contexts/RainbowProvider"
import useSnackbar from "@/hooks/useSnackbar"
import {
checkBadgeUpgradable,
fetchIssuer,
fetchNotionBadgeByAddr,
fillBadgeDetailWithPayload,
queryBadgeDetailById,
Expand Down Expand Up @@ -85,8 +86,14 @@ const BadgeDetailPage = () => {

const { badgeContract, description, ...badgeMetadata } = await fillBadgeDetailWithPayload(publicProvider, { id, data })

const notionBadge = await fetchNotionBadgeByAddr(badgeContract)
console.log(notionBadge, "notionBadge")
let badgeWidthIssuer = await fetchNotionBadgeByAddr(badgeContract)
if (!badgeWidthIssuer.issuer) {
const issuer = await fetchIssuer(badgeMetadata.issuerName)
badgeWidthIssuer = {
issuer,
thirdParty: true,
}
}

const name = await fetchProfileUsername(publicProvider, recipient)
let upgradable = false
Expand All @@ -101,12 +108,12 @@ const BadgeDetailPage = () => {
ownerLogo: getSmallAvatarURL(recipient),
mintedOn: formatDate(time * 1000),
badgeContract,
issuer: notionBadge.issuer,
description: isOriginsNFTBadge(notionBadge.badgeContract) ? notionBadge.description : description,
issuer: badgeWidthIssuer.issuer,
description: isOriginsNFTBadge(badgeContract) ? badgeWidthIssuer.description : description,
upgradable,
thirdParty: notionBadge.thirdParty,
thirdParty: badgeWidthIssuer.thirdParty,
}
if (isOriginsNFTBadge(notionBadge.badgeContract)) {
if (isOriginsNFTBadge(badgeContract)) {
const rarityNum = badgeMetadata.attributes.find(item => item.trait_type === "Rarity").value
badgeDetail.rarity = NFT_RARITY_MAP[rarityNum]
}
Expand Down
4 changes: 2 additions & 2 deletions src/pages/ecosystem/Protocols/ProtocolList/ProtocolCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { makeStyles } from "tss-react/mui"

import { Box, Button, Stack, SvgIcon, Typography } from "@mui/material"

import { ecosystemListLogoUrl } from "@/apis/ecosystem"
import { fetchEcosystemProtocolLogo } from "@/apis/ecosystem"
import { ReactComponent as ArrowSvg } from "@/assets/svgs/ecosystem/arrow.svg"
import { ReactComponent as TwitterSvg } from "@/assets/svgs/ecosystem/twitter.svg"
import LinesEllipsis from "@/components/LinesEllipsis"
Expand Down Expand Up @@ -155,7 +155,7 @@ const ProtocolCard = props => {
gridArea: "logo",
}}
>
<Img alt={name} src={`${ecosystemListLogoUrl}${name}${ext}`} placeholder={hash} width={isMobile ? 48 : 88} height={isMobile ? 48 : 88}></Img>
<Img alt={name} src={fetchEcosystemProtocolLogo(name, ext)} placeholder={hash} width={isMobile ? 48 : 88} height={isMobile ? 48 : 88}></Img>
</Stack>
<Stack direction="row" alignItems="center" gap="0.8rem" className={classes.name}>
<Typography sx={{ fontSize: ["2rem", "2.4rem"], lineHeight: ["2.8rem", "3.2rem"], fontWeight: 600 }}>{name}</Typography>
Expand Down
23 changes: 21 additions & 2 deletions src/services/canvasService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { AbiCoder, ethers } from "ethers"

import { checkBadgeEligibilityURL, claimBadgeURL } from "@/apis/canvas"
import { fetchBadgeByAddrURL } from "@/apis/canvas-badge"
import { fetchEcosystemProtocolByNameURL, fetchEcosystemProtocolLogo } from "@/apis/ecosystem"
import AttestProxyABI from "@/assets/abis/CanvasAttestProxy.json"
import BadgeABI from "@/assets/abis/CanvasBadge.json"
import ProfileABI from "@/assets/abis/CanvasProfile.json"
Expand Down Expand Up @@ -124,8 +125,7 @@ const getBadgeMetadata = async (provider, badgeContractAddress, badgeUID = ether
const metadata = await scrollRequest(badgeTokenBrowserURL, { timeout: 5e3 })
return metadata
} catch (error) {
// console.log("Failed to get badge image URI:", error)
return ""
return {}
}
}

Expand Down Expand Up @@ -503,6 +503,25 @@ const fetchNotionBadgeByAddr = async addr => {
}
}

export const fetchIssuer = async issuerName => {
try {
const { data } = await scrollRequest(fetchEcosystemProtocolByNameURL(issuerName))
if (!data.length) {
return {}
}
const [{ name: issuerFullName, ext, website }] = data
const issuerLogo = fetchEcosystemProtocolLogo(issuerFullName, ext)
const issuer = {
name: issuerFullName,
logo: issuerLogo,
origin: website,
}
return issuer
} catch (error) {
return {}
}
}

const testAsyncFunc = value => {
return new Promise(resolve => {
setTimeout(() => {
Expand Down