Skip to content

[Issue-202] Add support Ordinal with Video/Text format #204

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
saltict merged 8 commits into from
Jun 26, 2024
Merged

[Issue-202] Add support Ordinal with Video/Text format #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
88076fd
[Issue-202] Add support Ordinal with Video/Text format
frenkie-ng Jun 24, 2024
49b26d2
Merge remote-tracking branch 'origin/openbit-dev' into koni/dev/issue…
frenkie-ng Jun 25, 2024
f471ded
Merge remote-tracking branch 'origin/openbit-dev' into koni/dev/issue…
frenkie-ng Jun 26, 2024
51c0617
[Issue-202] merge openbit-dev into issue-202 and resolved conflicts
frenkie-ng Jun 26, 2024
6c5c5ed
[Issue-202] add condition display in NFT details screen
frenkie-ng Jun 26, 2024
f8dadeb
Merge remote-tracking branch 'origin/openbit-dev' into koni/dev/issue…
frenkie-ng Jun 26, 2024
440f702
[Issue-202] Add support video for ordinals
frenkie-ng Jun 26, 2024
da7c08e
Update fallback image for NFT
Jun 26, 2024
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
6 changes: 5 additions & 1 deletion packages/extension-base/src/koni/api/nft/inscription/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,14 @@ export class InscriptionApi extends BaseNftApi {
}

private parseInsUrl (id: string, type: string) {
if (type.startsWith('audio/') || type.startsWith('text/html') || type.startsWith('image/svg') || type.startsWith('video/') || type.startsWith('model/gltf')) {
if (type.startsWith('audio/') || type.startsWith('text/html') || type.startsWith('image/svg') || type.startsWith('model/gltf')) {
return this.createIframePreviewUrl(id);
}

if (type.startsWith('video/')) {
return `https://ordinals.com/content/${id}`;
}

if (type.startsWith('text/')) {
return undefined;
}
Expand Down
7 changes: 4 additions & 3 deletions packages/extension-koni-ui/src/Popup/Home/Nfts/NftItemDetail.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ function Component ({ className = '' }: Props): React.ReactElement<Props> {

const show3DModel = SHOW_3D_MODELS_CHAIN.includes(nftItem.chain);
const ordinalNftItem = nftItem.description && isValidJson(nftItem.description) && JSON.parse(nftItem.description) as OrdinalRemarkData;
const isInscription = useMemo(() => {
const isBRC20Inscription = useMemo(() => {
if (ordinalNftItem && 'p' in ordinalNftItem && 'op' in ordinalNftItem && 'tick' in ordinalNftItem && 'amt' in ordinalNftItem) {
return true;
}
Expand All @@ -162,15 +162,16 @@ function Component ({ className = '' }: Props): React.ReactElement<Props> {
>
<div className={'nft_item_detail__container'}>
<div className={'nft_item_detail__nft_image'}>
{isInscription && nftItem.description && (
{isBRC20Inscription && nftItem.description && (
<InscriptionImage
alone={true}
properties={JSON.parse(nftItem.description) as OrdinalRemarkData}
/>
)}
{!isInscription && (
{!isBRC20Inscription && (
<Image
className={CN({ clickable: nftItem.externalUrl })}
fallbackSrc={DefaultLogosMap.default_placeholder}
height={358}
modelViewerProps={show3DModel ? { ...DEFAULT_MODEL_VIEWER_PROPS, ...CAMERA_CONTROLS_MODEL_VIEWER_PROPS } : undefined}
onClick={onImageClick}
Expand Down
4 changes: 2 additions & 2 deletions packages/extension-koni-ui/src/Popup/Home/Nfts/component/NftGalleryWrapper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ interface Props extends ThemeProps {
have3dViewer?: boolean;
}

function Component ({ className = '', fallbackImage, handleOnClick, have3dViewer, image, itemCount, routingParams, title }: Props): React.ReactElement<Props> {
function Component ({ className = '', fallbackImage, handleOnClick, image, itemCount, routingParams, title }: Props): React.ReactElement<Props> {
const { extendToken } = useTheme() as Theme;

const [showImage, setShowImage] = useState(true);
Expand Down Expand Up @@ -98,7 +98,7 @@ function Component ({ className = '', fallbackImage, handleOnClick, have3dViewer
visibleByDefault={true}
/>
);
}, [showImage, showVideo, extendToken.defaultImagePlaceholder, handleImageError, loadingPlaceholder, getCollectionImage, handleVideoError]);
}, [extendToken.defaultImagePlaceholder, getCollectionImage, handleImageError, handleVideoError, loadingPlaceholder, showImage, showVideo]);

return (
<NftItem_
Expand Down