- {#if !isCountdownActive()}
-
+
+ ('mint');
+ $: freeMintsLeft = 0;
+ const mintState = getContext('mint');
+
+ //$: isMinting = false
$: isReady = false;
- $: totalMintCount = 0;
+ $: freeMintCount = 0;
$: gasCost = 0;
$: isCalculating = false;
- $: totalMintCount, calculateGasCost();
+ $: freeMintCount, calculateGasCost();
async function calculateGasCost() {
isCalculating = true;
- gasCost = await Token.estimateMintGasCost();
+ gasCost = await Token.estimateMintGasCost({
+ freeMintCount,
+ });
isCalculating = false;
}
@@ -70,10 +71,8 @@
isReady = true;
canMint = await Token.canMint();
- if (!canMint) {
- return;
- }
- totalMintCount = await User.totalWhitelistMintCount();
+
+ freeMintsLeft = await User.totalWhitelistMintCount();
}
connectedSourceChain.subscribe(async () => {
@@ -85,7 +84,7 @@
mintState.set({ ...$mintState, address: zeroAddress });
return;
}
- mintState.set({ ...$mintState, totalMintCount, address: account.address.toLowerCase() as IAddress });
+ mintState.set({ ...$mintState, address: account.address.toLowerCase() as IAddress });
});
async function mint() {
@@ -97,12 +96,12 @@
});
// ensure that the input values are numbers
- totalMintCount = parseInt(totalMintCount.toString());
+ freeMintCount = parseInt(freeMintCount.toString());
- mintState.set({ ...$mintState, totalMintCount: totalMintCount });
+ mintState.set({ ...$mintState, totalMintCount: freeMintCount });
try {
const tokenIds = await Token.mint({
- freeMintCount: totalMintCount,
+ freeMintCount,
onTransaction: (txHash: string) => {
mintState.set({ ...$mintState, txHash });
},
@@ -140,26 +139,31 @@
{/if}
diff --git a/packages/taikoon-ui/src/components/NftSlider/NftSlider.svelte b/packages/taikoon-ui/src/components/NftSlider/NftSlider.svelte
deleted file mode 100644
index ba1c76c9626..00000000000
--- a/packages/taikoon-ui/src/components/NftSlider/NftSlider.svelte
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-{desc.desc}
{/if}
+
+
({ ...o, visible: false }))} />
diff --git a/packages/taikoon-ui/src/components/sections/Footer.section.svelte b/packages/taikoon-ui/src/components/sections/Footer.section.svelte
index e1c367656aa..e1c016681da 100644
--- a/packages/taikoon-ui/src/components/sections/Footer.section.svelte
+++ b/packages/taikoon-ui/src/components/sections/Footer.section.svelte
@@ -10,11 +10,9 @@
import type { IconType } from '../../types';
let windowSize: 'sm' | 'md' | 'lg' = 'md';
- type ISocialLink = 'youtube' | 'twitter' | 'discord' | 'mirror' | 'forum' | 'none';
-
$: socialLinks = $json('content.sections.footer.socials') as {
- name: ISocialLink;
- url: string;
+ label: string;
+ href: string;
icon: IconType;
}[];
@@ -59,14 +57,13 @@
'items-center',
'justify-center',
'bg-background-neutral',
- 'lg:p-5',
+ 'md:p-5',
'p-3',
'gap-3',
'rounded-xl',
'text-content-primary',
'font-medium',
- 'lg:text-2xl',
- 'md:text-base',
+ 'text-2xl',
'font-clash-grotesk',
'border',
'transition-all',
@@ -186,8 +183,6 @@
'text-content-secondary',
'font-normal',
);
-
- $: hoveredIcon = 'none' as ISocialLink;
@@ -196,27 +191,12 @@
{$t('content.sections.footer.joinTaiko')}
{$t('content.mint.text')}
-
+
diff --git a/packages/taikoon-ui/src/components/Mint/classes.ts b/packages/taikoon-ui/src/components/Mint/classes.ts
index 37f15aa319d..c5c58b69f24 100644
--- a/packages/taikoon-ui/src/components/Mint/classes.ts
+++ b/packages/taikoon-ui/src/components/Mint/classes.ts
@@ -28,14 +28,7 @@ export const halfPanel = classNames(
export const leftHalfPanel = classNames(halfPanel, 'aspect-square');
-export const rightHalfPanel = classNames(
- halfPanel,
- 'md:px-12',
-
- 'my-16',
- 'md:my-[0]',
- 'md:max-w-[500px]',
-);
+export const rightHalfPanel = classNames(halfPanel, 'md:px-12', 'md:max-w-[500px]');
export const counterClasses = classNames(
'w-full',
@@ -44,54 +37,14 @@ export const counterClasses = classNames(
'items-center',
'justify-between',
'font-sans',
+ 'font-bold',
'mt-6',
);
export const nftRendererWrapperClasses = 'rounded-3xl overflow-hidden';
export const nftRendererWrapperMobileClasses = 'rounded-3xl my-8 overflow-hidden';
-export const mintTitleClasses = classNames(
- 'text-[45px]/[52px]',
- 'font-semibold',
- 'text-content-primary',
- 'font-clash-grotesk',
- 'tracking-[-1%]',
- 'w-full text-left',
-);
-export const mintContentClasses = classNames(
- 'font-normal',
- 'font-sans',
- 'text-content-secondary',
- 'text-[16px]/[24px]',
-);
-
-export const eligibilityLabelClasses = classNames(
- 'text-content-primary',
- 'text-[16px]/[24px]',
- 'text-normal',
- 'font-sans',
-);
-
-export const eligibilityValueClasses = classNames(
- 'text-content-primary',
- 'text-[16px]/[24px]',
- 'font-bold',
- 'font-sans',
- 'tracking-[0.5%]',
-);
-
-export const currentMintedClasses = classNames(
- 'font-sans',
- 'font-bold',
- 'text-content-primary',
- 'tracking-[0.5%]',
- 'text-[16px]/[24px]',
-);
-export const maxMintedClasses = classNames(
- 'text-content-tertiary',
- 'font-bold',
- 'text-[16px]/[24px]',
- 'tracking-[0.5%]',
-);
+export const mintTitleClasses = classNames('text-5xl', 'font-semibold', 'w-full text-left');
+export const mintContentClasses = 'font-normal font-sans text-content-secondary';
-export const infoRowClasses = classNames('w-full', 'gap-4', 'flex', 'flex-col');
+export const supplyClasses = classNames('text-content-secondary', 'text-h4');
diff --git a/packages/taikoon-ui/src/components/MobileMenu/MobileMenu.svelte b/packages/taikoon-ui/src/components/MobileMenu/MobileMenu.svelte
index 3064f9b3386..815c0aa5993 100644
--- a/packages/taikoon-ui/src/components/MobileMenu/MobileMenu.svelte
+++ b/packages/taikoon-ui/src/components/MobileMenu/MobileMenu.svelte
@@ -7,10 +7,8 @@
import { ThemeButton } from '$components/ThemeButton';
import { classNames } from '$lib/util/classNames';
- import type { IAddress } from '../../types';
-
export let open = false;
- export let address = zeroAddress as IAddress;
+ export let address = zeroAddress;
export let isConnected = false;
const wrapperClasses = classNames(
@@ -58,7 +56,7 @@
-
#{totalSupply}
- / {mintMax}
+ {totalSupply} / {mintMax}
-
+ {$t('content.mint.eligibleLabel')}
- {$mintState.totalMintCount}
-
-
-
+ {#if gasCost > 0}
+
+
+ {/if}
-
diff --git a/packages/taikoon-ui/src/components/NftSlider/classes.ts b/packages/taikoon-ui/src/components/NftSlider/classes.ts
deleted file mode 100644
index 7af245a05b4..00000000000
--- a/packages/taikoon-ui/src/components/NftSlider/classes.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { classNames } from '$lib/util/classNames';
-
-export const wrapperClasses = classNames('relative', 'flex', 'flex-row', 'items-center', 'justify-center');
-
-const iconButtonClasses = classNames('relative', 'z-50');
-
-export const leftIconButtonClasses = classNames(iconButtonClasses, 'left-[29px]');
-
-export const rightIconButtonClasses = classNames(iconButtonClasses, 'left-[-29px]');
-
-export const carouselWrapperClasses = classNames('carousel', 'w-64', 'h-64');
-
-export const carouselItemClasses = classNames('carousel-item', 'relative');
diff --git a/packages/taikoon-ui/src/components/NftSlider/index.ts b/packages/taikoon-ui/src/components/NftSlider/index.ts
deleted file mode 100644
index 5a29500ea5b..00000000000
--- a/packages/taikoon-ui/src/components/NftSlider/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default as NftSlider } from './NftSlider.svelte';
diff --git a/packages/taikoon-ui/src/components/core/Dropdown/Dropdown.svelte b/packages/taikoon-ui/src/components/core/Dropdown/Dropdown.svelte
new file mode 100644
index 00000000000..39f04f38bf6
--- /dev/null
+++ b/packages/taikoon-ui/src/components/core/Dropdown/Dropdown.svelte
@@ -0,0 +1,29 @@
+
+
+
- {#each tokenIds as tokenId, i}
-
-
-
-
- {/each}
- (displayPanel = true)}
+ on:focus={() => (displayPanel = true)}
+ on:mouseleave={() => (displayPanel = false)}
+ role="button"
+ tabindex="0">
+
+
+ {#if displayPanel}
+
diff --git a/packages/taikoon-ui/src/components/core/Dropdown/DropdownPanel.svelte b/packages/taikoon-ui/src/components/core/Dropdown/DropdownPanel.svelte
new file mode 100644
index 00000000000..6dd2ba2bd1b
--- /dev/null
+++ b/packages/taikoon-ui/src/components/core/Dropdown/DropdownPanel.svelte
@@ -0,0 +1,37 @@
+
+
+
+ {#each options as option}
+ {@const Icon = Icons[option.icon]}
+
+
+
diff --git a/packages/taikoon-ui/src/components/core/Dropdown/index.ts b/packages/taikoon-ui/src/components/core/Dropdown/index.ts
new file mode 100644
index 00000000000..00bd5c6d3d0
--- /dev/null
+++ b/packages/taikoon-ui/src/components/core/Dropdown/index.ts
@@ -0,0 +1 @@
+export { default as Dropdown } from './Dropdown.svelte';
diff --git a/packages/taikoon-ui/src/components/core/IconButton/IconButton.svelte b/packages/taikoon-ui/src/components/core/IconButton/IconButton.svelte
index 0a19500ba9a..5216afe9c02 100644
--- a/packages/taikoon-ui/src/components/core/IconButton/IconButton.svelte
+++ b/packages/taikoon-ui/src/components/core/IconButton/IconButton.svelte
@@ -52,15 +52,13 @@
type ? typeMap[type] : null,
'btn-circle',
'border-none',
- // 'w-12',
- // 'h-12',
+ 'w-12',
+ 'h-12',
'flex items-center justify-center',
'p-0',
type === 'neutral' ? 'bg-interactive-tertiary' : null,
type === 'primary' ? 'text-[#F3F3F3]' : null,
- size === 'md' ? 'w-12 h-12' : null,
- size === 'lg' ? 'w-14 h-14' : null,
$$props.class,
);
diff --git a/packages/taikoon-ui/src/components/core/Icons/AngleDownSolid.svelte b/packages/taikoon-ui/src/components/core/Icons/AngleDownSolid.svelte
index df45d5a41b6..2d00d79e9e9 100644
--- a/packages/taikoon-ui/src/components/core/Icons/AngleDownSolid.svelte
+++ b/packages/taikoon-ui/src/components/core/Icons/AngleDownSolid.svelte
@@ -8,14 +8,8 @@
export let color = ctx.color || 'currentColor';
export let withEvents = ctx.withEvents || false;
export let ariaLabel = 'angle down solid';
- export let title = {
- id: `angle-down-solid-title-${Math.random().toString(36).substring(7)}`,
- title: ariaLabel,
- };
- export let desc = {
- id: `angle-down-solid-desc-${Math.random().toString(36).substring(7)}`,
- desc: 'An angle down solid icon',
- };
+ export let title = {};
+ export let desc = {};
let ariaDescribedby = `${title.id || ''} ${desc.id || ''}`;
let hasDescription = false;
$: if (title.id || desc.id) {
diff --git a/packages/taikoon-ui/src/components/core/Icons/AngleLeft.svelte b/packages/taikoon-ui/src/components/core/Icons/AngleLeft.svelte
deleted file mode 100644
index 7a77bd33c46..00000000000
--- a/packages/taikoon-ui/src/components/core/Icons/AngleLeft.svelte
+++ /dev/null
@@ -1,85 +0,0 @@
-
-
-{#if withEvents}
-
-{:else}
-
-{/if}
diff --git a/packages/taikoon-ui/src/components/core/Icons/AngleRight.svelte b/packages/taikoon-ui/src/components/core/Icons/AngleRight.svelte
deleted file mode 100644
index 9d4768b6276..00000000000
--- a/packages/taikoon-ui/src/components/core/Icons/AngleRight.svelte
+++ /dev/null
@@ -1,85 +0,0 @@
-
-
-{#if withEvents}
-
-{:else}
-
-{/if}
diff --git a/packages/taikoon-ui/src/components/core/Icons/ArrowDown.svelte b/packages/taikoon-ui/src/components/core/Icons/ArrowDown.svelte
index b91b95b0256..8b1857d28f4 100644
--- a/packages/taikoon-ui/src/components/core/Icons/ArrowDown.svelte
+++ b/packages/taikoon-ui/src/components/core/Icons/ArrowDown.svelte
@@ -8,14 +8,8 @@
export let color = ctx.color || 'currentColor';
export let withEvents = ctx.withEvents || false;
export let ariaLabel = 'arrow down';
- export let title = {
- id: `arrow-down-title-${Math.random().toString(36).substring(7)}`,
- title: ariaLabel,
- };
- export let desc = {
- id: `arrow-down-desc-${Math.random().toString(36).substring(7)}`,
- desc: 'An arrow down icon',
- };
+ export let title = {};
+ export let desc = {};
let ariaDescribedby = `${title.id || ''} ${desc.id || ''}`;
let hasDescription = false;
$: if (title.id || desc.id) {
diff --git a/packages/taikoon-ui/src/components/core/Icons/ArrowRightFilled.svelte b/packages/taikoon-ui/src/components/core/Icons/ArrowRightFilled.svelte
index b3403095520..2bc92dc387f 100644
--- a/packages/taikoon-ui/src/components/core/Icons/ArrowRightFilled.svelte
+++ b/packages/taikoon-ui/src/components/core/Icons/ArrowRightFilled.svelte
@@ -8,14 +8,8 @@
export let color = ctx.color || 'currentColor';
export let withEvents = ctx.withEvents || false;
export let ariaLabel = 'arrow right filled';
- export let title = {
- id: `arrow-right-filled-title-${Math.random().toString(36).substring(7)}`,
- title: ariaLabel,
- };
- export let desc = {
- id: `arrow-right-filled-desc-${Math.random().toString(36).substring(7)}`,
- desc: 'An arrow right filled icon',
- };
+ export let title = {};
+ export let desc = {};
let ariaDescribedby = `${title.id || ''} ${desc.id || ''}`;
let hasDescription = false;
$: if (title.id || desc.id) {
@@ -52,6 +46,7 @@
diff --git a/packages/taikoon-ui/src/components/core/ResponsiveController/ResponsiveController.svelte b/packages/taikoon-ui/src/components/core/ResponsiveController/ResponsiveController.svelte
index c9284596f40..b080af86889 100644
--- a/packages/taikoon-ui/src/components/core/ResponsiveController/ResponsiveController.svelte
+++ b/packages/taikoon-ui/src/components/core/ResponsiveController/ResponsiveController.svelte
@@ -5,28 +5,35 @@
// CSS media queries. We can use it to show/hide elements or render
// different components based on whether or not the size is desktop
// or larger
- const isLgMediaQuery = window.matchMedia('(min-width: 1024px)');
- const isMdMediaQuery = window.matchMedia('(min-width: 768px)');
+ const isDesktopMediaQuery = window.matchMedia('(min-width: 1024px)');
+ const isMobileMediaQuery = window.matchMedia('(max-width: 640px)');
+
+ let isDesktop: boolean;
+ let isMobile: boolean;
export let windowSize: 'sm' | 'md' | 'lg' = 'md';
- function isLgQueryHandler(event: MediaQueryListEvent) {
- windowSize = event.matches ? 'lg' : 'md';
+ function isDesktopQueryHandler(event: MediaQueryListEvent) {
+ isDesktop = event.matches;
+ isDesktop ? (windowSize = 'lg') : (windowSize = 'md');
}
- function isMdQueryHandler(event: MediaQueryListEvent) {
- windowSize = event.matches ? 'md' : 'sm';
+ function isMobileQueryHandler(event: MediaQueryListEvent) {
+ isMobile = event.matches;
+ isMobile ? (windowSize = 'sm') : (windowSize = 'md');
}
onMount(() => {
- isLgMediaQuery.addEventListener('change', isLgQueryHandler);
- isMdMediaQuery.addEventListener('change', isMdQueryHandler);
+ isDesktop = isDesktopMediaQuery.matches;
+ isMobile = isMobileMediaQuery.matches;
+ isDesktopMediaQuery.addEventListener('change', isDesktopQueryHandler);
+ isMobileMediaQuery.addEventListener('change', isMobileQueryHandler);
//assign starting value
- windowSize = window.innerWidth > 1024 ? 'lg' : window.innerWidth < 768 ? 'sm' : 'md';
+ windowSize = window.innerWidth > 1024 ? 'lg' : window.innerWidth < 640 ? 'sm' : 'md';
});
onDestroy(() => {
- isLgMediaQuery.removeEventListener('change', isLgQueryHandler);
- isMdMediaQuery.removeEventListener('change', isMdQueryHandler);
+ isDesktopMediaQuery.removeEventListener('change', isDesktopQueryHandler);
+ isMobileMediaQuery.removeEventListener('change', isMobileQueryHandler);
});
diff --git a/packages/taikoon-ui/src/components/core/Section/Section.svelte b/packages/taikoon-ui/src/components/core/Section/Section.svelte
index a50ce064ee0..6e62ddd3f8a 100644
--- a/packages/taikoon-ui/src/components/core/Section/Section.svelte
+++ b/packages/taikoon-ui/src/components/core/Section/Section.svelte
@@ -1,9 +1,7 @@
-
+
+
+
+
+ {/if}
diff --git a/packages/taikoon-ui/src/components/modals/MintConfirmation.modal/classes.ts b/packages/taikoon-ui/src/components/modals/MintConfirmation.modal/classes.ts
index 20e781aa1e2..86e453e4673 100644
--- a/packages/taikoon-ui/src/components/modals/MintConfirmation.modal/classes.ts
+++ b/packages/taikoon-ui/src/components/modals/MintConfirmation.modal/classes.ts
@@ -1,18 +1,65 @@
import { classNames } from '$lib/util/classNames';
-export const modalContentWrapperClasses = classNames('sm:w-full', 'md:w-[60vw]', 'lg:w-[40vw]');
-export const modalTitleClasses = classNames('sm:mt-[0]', 'pt-6');
-export const bodyWrapperClasses = classNames('text-content-secondary', 'my-4');
-export const footerWrapperClasses = classNames('w-full', 'flex', 'flex-row', 'items-center', 'gap-4');
-export const spinnerSmWrapper = classNames(
- 'bg-interactive-tertiary',
- 'rounded-md',
- 'w-[30px]',
- 'h-[30px]',
+export const bodyWrapperClasses = 'text-content-secondary';
+export const footerWrapperClasses = 'w-full flex flex-row items-center gap-4';
+export const spinnerSmWrapper = 'bg-interactive-tertiary rounded-md w-[30px] h-[30px] flex items-center justify-center';
+export const spinnerMdWrapper = 'w-full flex justify-center items-center';
+export const textClasses = 'font-sans font-bold text-sm text-content-primary';
+export const linkClasses = 'flex flex-row items-center gap-2';
+export const mintedBodyClasses = 'justify-start gap-6 py-6 items-center';
+export const buttonWrapperClasses = 'md:w-1/2 w-full px-2';
+
+export const successBodyClasses = classNames(
+ 'max-w-[50vw]',
+ 'p-5',
+ 'rounded-3xl',
+ 'my-5',
+ 'bg-background-elevated',
+ 'flex',
+ 'overflow-x-scroll',
+);
+export const nftRendererWrapperClasses = classNames(
+ 'flex',
+ 'flex-row',
+ 'justify-start',
+ 'items-start',
+ 'gap-5',
+ 'w-max',
+);
+
+export const successTitleClasses = classNames(
+ 'text-content-primary',
+ 'text-4xl',
+ 'font-clash-grotesk',
+ 'font-semibold',
+ 'text-center',
+);
+
+export const successContentClasses = classNames(
+ 'font-sans',
+ 'text-center',
+ 'text-content-secondary',
+ 'font-normal',
+ 'text-base',
+ 'md:w-min',
+ 'md:min-w-[300px]',
+ 'w-full',
+);
+
+export const successMintedLinkClasses = classNames(
+ 'hover:text-content-link-hover',
+ 'text-content-link-primary',
+ 'font-sans',
+ 'font-normal',
+);
+
+export const successFooterWrapperClasses = classNames(
'flex',
+ 'md:flex-row',
+ 'flex-col',
+ 'w-full',
+ 'gap-4',
'items-center',
- 'justify-center',
+ 'justify-between',
+ 'min-w-[500px]',
);
-export const spinnerMdWrapper = classNames('w-full', 'flex', 'justify-center', 'items-center');
-export const textClasses = classNames('font-sans', 'font-bold', 'text-sm', 'text-content-primary');
-export const linkClasses = classNames('flex', 'flex-row', 'items-center', 'gap-2');
diff --git a/packages/taikoon-ui/src/components/modals/PostMint.modal/PostMint.modal.svelte b/packages/taikoon-ui/src/components/modals/PostMint.modal/PostMint.modal.svelte
deleted file mode 100644
index ab0a6c64f8b..00000000000
--- a/packages/taikoon-ui/src/components/modals/PostMint.modal/PostMint.modal.svelte
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/packages/taikoon-ui/src/components/modals/PostMint.modal/classes.ts b/packages/taikoon-ui/src/components/modals/PostMint.modal/classes.ts
deleted file mode 100644
index 1ed475f29d7..00000000000
--- a/packages/taikoon-ui/src/components/modals/PostMint.modal/classes.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { classNames } from '$lib/util/classNames';
-
-export const buttonWrapperClasses = classNames('md:w-1/2', 'w-full', 'px-2');
-export const mintedBodyClasses = classNames('justify-start', 'gap-6', 'py-6', 'items-center');
-
-export const successTitleClasses = classNames(
- 'text-content-primary',
- 'text-[35px]/[42px]',
- 'font-clash-grotesk',
- 'font-semibold',
- 'text-center',
-);
-
-export const successContentClasses = classNames(
- 'font-sans',
- 'text-center',
- 'text-content-secondary',
- 'font-normal',
- 'text-[16px]/[24px]',
- 'md:w-min',
- 'md:min-w-[300px]',
- 'w-full',
-);
-
-export const successMintedLinkClasses = classNames(
- 'hover:text-content-link-hover',
- 'text-content-link-primary',
- 'font-sans',
- 'font-normal',
-);
-
-export const successFooterWrapperClasses = classNames(
- 'flex',
- 'md:flex-row',
- 'flex-col',
- 'w-full',
- 'gap-4',
- 'items-center',
- 'justify-between',
- 'min-w-[500px]',
-);
diff --git a/packages/taikoon-ui/src/components/modals/TaikoonDetail.modal/TaikoonDetail.modal.svelte b/packages/taikoon-ui/src/components/modals/TaikoonDetail.modal/TaikoonDetail.modal.svelte
index 271746dd998..8b6d0d9992d 100644
--- a/packages/taikoon-ui/src/components/modals/TaikoonDetail.modal/TaikoonDetail.modal.svelte
+++ b/packages/taikoon-ui/src/components/modals/TaikoonDetail.modal/TaikoonDetail.modal.svelte
@@ -7,12 +7,11 @@
import Token from '$lib/token';
import { classNames } from '$lib/util/classNames';
import { shortenAddress } from '$lib/util/shortenAddress';
- import type { ITaikoonDetail } from '$stores/taikoonDetail';
import { Modal, ModalBody, ModalTitle } from '$ui/Modal';
$: shortenedAddress = '...';
- const taikoonDetailState = getContext('taikoonDetail');
+ const taikoonDetailState = getContext('taikoonDetail');
async function updateShortenedAddress() {
if ($taikoonDetailState.tokenId < 0) return;
diff --git a/packages/taikoon-ui/src/components/modals/index.ts b/packages/taikoon-ui/src/components/modals/index.ts
index aee92c6cd67..284f4743530 100644
--- a/packages/taikoon-ui/src/components/modals/index.ts
+++ b/packages/taikoon-ui/src/components/modals/index.ts
@@ -1,4 +1,3 @@
export { default as MintAgreementModal } from './MintAgreement.modal/MintAgreement.modal.svelte';
export { default as MintConfirmationModal } from './MintConfirmation.modal/MintConfirmation.modal.svelte';
-export { default as PostMintModal } from './PostMint.modal/PostMint.modal.svelte';
export { default as TaikoonDetailModal } from './TaikoonDetail.modal/TaikoonDetail.modal.svelte';
diff --git a/packages/taikoon-ui/src/components/sections/Collapsible.section.svelte b/packages/taikoon-ui/src/components/sections/Collapsible.section.svelte
index 3724d48d8ec..a9d7dc010d1 100644
--- a/packages/taikoon-ui/src/components/sections/Collapsible.section.svelte
+++ b/packages/taikoon-ui/src/components/sections/Collapsible.section.svelte
@@ -50,20 +50,17 @@
'w-full',
'justify-between',
'items-center',
- 'text-[26px]/[32px]',
+
'font-medium',
'font-clash-grotesk',
'collapse-title',
- 'tracking-normal',
);
const collapseContentClasses = classNames(
- 'text-[16px]/[24px]',
+ 'text-base',
'text-content-secondary',
- 'font-sans',
+ 'font-clash-grotesk',
'collapse-content',
- 'tracking-normal',
);
- /* eslint-disable */
@@ -81,8 +78,8 @@
@@ -74,24 +49,26 @@
{/if}
+
+
-
+ {:else}
+ (displayPanel = true)}
+ on:focus={() => (displayPanel = true)}
+ on:mouseleave={() => (displayPanel = false)}
+ role="button"
+ tabindex="0">
+
+
+ {#if displayPanel}
+
diff --git a/packages/taikoon-ui/src/components/core/Select/SelectPanel.svelte b/packages/taikoon-ui/src/components/core/Select/SelectPanel.svelte
new file mode 100644
index 00000000000..1b6790cf57e
--- /dev/null
+++ b/packages/taikoon-ui/src/components/core/Select/SelectPanel.svelte
@@ -0,0 +1,32 @@
+
+
+
+ {#each options as option}
+
+ {/each}
+
diff --git a/packages/taikoon-ui/src/components/core/Select/index.ts b/packages/taikoon-ui/src/components/core/Select/index.ts
new file mode 100644
index 00000000000..f3019bebded
--- /dev/null
+++ b/packages/taikoon-ui/src/components/core/Select/index.ts
@@ -0,0 +1 @@
+export { default as Select } from './Select.svelte';
diff --git a/packages/taikoon-ui/src/components/core/Toast/Toast.svelte b/packages/taikoon-ui/src/components/core/Toast/Toast.svelte
index d838f50941d..5210102409b 100644
--- a/packages/taikoon-ui/src/components/core/Toast/Toast.svelte
+++ b/packages/taikoon-ui/src/components/core/Toast/Toast.svelte
@@ -79,8 +79,9 @@
diff --git a/packages/taikoon-ui/src/components/modals/MintConfirmation.modal/MintConfirmation.modal.svelte b/packages/taikoon-ui/src/components/modals/MintConfirmation.modal/MintConfirmation.modal.svelte
index dd71c710779..066725a873b 100644
--- a/packages/taikoon-ui/src/components/modals/MintConfirmation.modal/MintConfirmation.modal.svelte
+++ b/packages/taikoon-ui/src/components/modals/MintConfirmation.modal/MintConfirmation.modal.svelte
@@ -1,33 +1,51 @@
-
-
+
+ {#if $mintState.isMinting}
+
{$mintState.isMinting
? $t('content.mint.modals.minting.title', {
values: {
@@ -66,5 +84,48 @@
{/if}
- {
+ scrollContainer.scrollLeft += e.deltaY;
+ }}
+ class={successBodyClasses}>
+
+
+
+ {#each $mintState.tokenIds as tokenId}
+
+
+ {$t('content.mint.modals.minted.title')}
+
+
+ {$t('content.mint.modals.minted.text')}
+
+
+ {$t('content.mint.modals.minted.link')}
+
+
- {$t('content.mint.modals.minted.title')}
-
-
- {$t('content.mint.modals.minted.text')}
-
-
- {$t('content.mint.modals.minted.link')}
-
-
{option.title}
-
- {@html option.text}
+
{/each}
diff --git a/packages/taikoon-ui/src/components/sections/Countdown.section.svelte b/packages/taikoon-ui/src/components/sections/Countdown.section.svelte
index d96ab48f26f..98eaf9c5b59 100644
--- a/packages/taikoon-ui/src/components/sections/Countdown.section.svelte
+++ b/packages/taikoon-ui/src/components/sections/Countdown.section.svelte
@@ -1,12 +1,27 @@
+ {option.text}
+
+
- {#each counters as { label, value }, i}
- {#if i == 2 && windowSize !== 'sm'}
+ {#if windowSize === 'sm'}
+
+ {:else}
+
-
- {/each}
-
-
-
-
- {label}
-
-
- {#each socialLinks as { name, icon, url }}
- {@const Icon = Icons[icon]}
- (hoveredIcon = name)}
- on:mouseleave={() => (hoveredIcon = 'none')}
- target="_blank"
- class={socialLinkClasses}>
-
- (isHovered = true)}
- on:mouseleave={() => (isHovered = false)}
- class={mintNowButtonClasses}>
- {$t('buttons.mintNow')}
-
diff --git a/packages/taikoon-ui/src/components/sections/Information.section.svelte b/packages/taikoon-ui/src/components/sections/Information.section.svelte
index e195543d63a..5f487853dd8 100644
--- a/packages/taikoon-ui/src/components/sections/Information.section.svelte
+++ b/packages/taikoon-ui/src/components/sections/Information.section.svelte
@@ -10,20 +10,12 @@
'text-primary',
'mb-4',
'uppercase',
- 'tracking-normal',
- 'text-[16px]/[24px]',
+ 'text-base',
'font-bold',
'font-sans',
'leading-relaxed',
);
- const contentClasses = classNames(
- 'md:font-normal',
- 'md:text-[57px]/[64px]',
- 'text-content-primary',
- 'font-medium',
- 'font-clash-grotesk',
- 'text-4xl',
- );
+ const contentClasses = classNames('md:font-normal', 'font-medium', 'md:text-6xl', 'font-clash-grotesk', 'text-4xl');
diff --git a/packages/taikoon-ui/src/components/sections/TimerItem.svelte b/packages/taikoon-ui/src/components/sections/TimerItem.svelte
new file mode 100644
index 00000000000..ff652a23c81
--- /dev/null
+++ b/packages/taikoon-ui/src/components/sections/TimerItem.svelte
@@ -0,0 +1,27 @@
+
+
+
Also, keep in mind that there are no financial incentives attached to Taikoons." + "text": "You can use your Taikoons to participate in the Taiko Layer 2 ecosystem." }, { "title": "What is the minting process?", - "text": "One time genesis mint of all 888 nfts targeted May 2024" + "text": "The minting process is as follows:" }, { - "title": "What is the official Taikoons contract?", - "text": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus tincidunt lorem eros, in bibendum lectus mollis laoreet. Praesent luctus odio rhoncus nisi pulvinar pharetra. Aliquam volutpat bibendum nisl, vitae elementum mauris egestas eget. Etiam ex felis, porttitor nec elementum vitae, mattis at felis. In cursus, augue vel pulvinar aliquet, orci sapien aliquam ipsum, non sollicitudin purus nulla ac risus." - }, - { - "title": "What are the traits?", - "text": "(tbc) Nouns are generated randomly based Ethereum block hashes. There are no 'if' statements or other rules governing Noun trait scarcity, which makes all Nouns equally rare. As of this writing, Nouns are made up of:
-backgrounds (2)
-bodies (30)
-accessories (140)
-heads (242)
-glasses (23)" + "title": "How does the daily auction work?", + "text": "The daily auction works as follows:" } ] }, @@ -100,7 +96,7 @@ "text": "The most developer-friendly and secure Ethereum scaling solution." }, "subscribe": { - "stayUpdated": "Stay updated!
Dive into the latest Taiko developer news", + "stayUpdated": "Stay updated! \nDive into the latest Taiko developer news", "subscribe": "Subscribe", "email": "Email" }, diff --git a/packages/taikoon-ui/src/lib/connect/web3modal.ts b/packages/taikoon-ui/src/lib/connect/web3modal.ts index 5978bf69d58..24760545662 100644 --- a/packages/taikoon-ui/src/lib/connect/web3modal.ts +++ b/packages/taikoon-ui/src/lib/connect/web3modal.ts @@ -7,7 +7,7 @@ import { config } from '$wagmi-config'; import { getChainImages } from '../../lib/chain'; -const projectId = PUBLIC_WALLETCONNECT_PROJECT_ID || 'walletconnect-project-id'; +const projectId = PUBLIC_WALLETCONNECT_PROJECT_ID || ''; const chainImages = getChainImages(); export const chainId = readable(getChainId(config), (set) => watchChainId(config, { onChange: set })); @@ -24,7 +24,7 @@ export const provider = readable(undefined, (set) =>
);
export const web3modal = createWeb3Modal({
- wagmiConfig: config || { projectId, chains: [], connectors: [] },
+ wagmiConfig: config,
projectId,
featuredWalletIds: [],
allowUnsupportedChain: true,
diff --git a/packages/taikoon-ui/src/lib/token/estimateMintGasCost.ts b/packages/taikoon-ui/src/lib/token/estimateMintGasCost.ts
index 3f6ef3d772d..82901bfb61f 100644
--- a/packages/taikoon-ui/src/lib/token/estimateMintGasCost.ts
+++ b/packages/taikoon-ui/src/lib/token/estimateMintGasCost.ts
@@ -9,9 +9,10 @@ import { totalWhitelistMintCount } from '../user/totalWhitelistMintCount';
import estimateContractGas from '../wagmi/estimateContractGas';
import { canMint } from './canMint';
-export async function estimateMintGasCost(): Promise {
+export async function estimateMintGasCost({ freeMintCount }: { freeMintCount: number }): Promise {
+ if (freeMintCount === 0) return 0;
const { selectedNetworkId } = web3modal.getState();
- if (!selectedNetworkId) return 0;
+ if (!selectedNetworkId) return -1;
const chainId = selectedNetworkId as IChainId;
const freeMintLeft = await totalWhitelistMintCount();
diff --git a/packages/taikoon-ui/src/lib/util/balance.test.ts b/packages/taikoon-ui/src/lib/util/balance.test.ts
index b70b9418927..7de2ae95d19 100644
--- a/packages/taikoon-ui/src/lib/util/balance.test.ts
+++ b/packages/taikoon-ui/src/lib/util/balance.test.ts
@@ -3,7 +3,7 @@ import { renderBalance, renderEthBalance } from './balance';
vi.mock('@wagmi/core');
test('renderBalance lib', () => {
- expect(renderBalance()).toBe('0.00');
+ expect(renderBalance(null)).toBe('0.00');
expect(
renderBalance({
decimals: 18,
diff --git a/packages/taikoon-ui/src/lib/util/balance.ts b/packages/taikoon-ui/src/lib/util/balance.ts
index 107bbd975d5..c3625a2b9ed 100644
--- a/packages/taikoon-ui/src/lib/util/balance.ts
+++ b/packages/taikoon-ui/src/lib/util/balance.ts
@@ -3,7 +3,7 @@ import { formatEther } from 'viem';
import { truncateString } from '../../lib/util/truncateString';
-export function renderBalance(balance?: GetBalanceReturnType) {
+export function renderBalance(balance: Maybe) {
if (!balance) return '0.00';
// if (typeof balance === 'bigint') return balance.toString();
const maxlength = Number(balance.formatted) < 0.000001 ? balance.decimals : 6;
diff --git a/packages/taikoon-ui/src/lib/util/checkForPausedContracts.test.ts b/packages/taikoon-ui/src/lib/util/checkForPausedContracts.test.ts
new file mode 100644
index 00000000000..0ee1ab6764d
--- /dev/null
+++ b/packages/taikoon-ui/src/lib/util/checkForPausedContracts.test.ts
@@ -0,0 +1,83 @@
+import { readContract } from '@wagmi/core';
+import { get } from 'svelte/store';
+
+import { bridgePausedModal } from '$stores/modal';
+
+import { checkForPausedContracts } from './checkForPausedContracts';
+
+vi.mock('@wagmi/core');
+vi.mock('viem');
+
+vi.mock('$bridgeConfig', () => ({
+ routingContractsMap: {
+ 1: {
+ 2: {
+ erc20VaultAddress: '0x00001',
+ bridgeAddress: '0x00002',
+ erc721VaultAddress: '0x00003',
+ erc1155VaultAddress: '0x00004',
+ crossChainSyncAddress: '0x00005',
+ signalServiceAddress: '0x00006',
+ },
+ },
+ 2: {
+ 1: {
+ erc20VaultAddress: '0x00007',
+ bridgeAddress: '0x00008',
+ erc721VaultAddress: '0x00009',
+ erc1155VaultAddress: '0x00010',
+ crossChainSyncAddress: '0x00011',
+ signalServiceAddress: '0x00012',
+ },
+ },
+ 3: {
+ 2: {
+ erc20VaultAddress: '0x00007',
+ bridgeAddress: '0x00008',
+ erc721VaultAddress: '0x00009',
+ erc1155VaultAddress: '0x00010',
+ crossChainSyncAddress: '0x00011',
+ signalServiceAddress: '0x00012',
+ },
+ },
+ },
+}));
+
+describe('checkForPausedContracts', () => {
+ beforeEach(() => {
+ vi.resetAllMocks();
+ });
+
+ test('should return false if no contracts are paused', async () => {
+ // when
+ await checkForPausedContracts();
+
+ // then
+ expect(readContract).toHaveBeenCalledTimes(3);
+ expect(get(bridgePausedModal)).toBe(false);
+ });
+
+ test('should return true if at least one contract is paused', async () => {
+ // given
+ vi.mocked(readContract).mockResolvedValueOnce(true);
+
+ // when
+ await checkForPausedContracts();
+
+ // then
+ expect(readContract).toHaveBeenCalledTimes(3);
+ expect(get(bridgePausedModal)).toBe(true);
+ });
+
+ test('should handle errors', async () => {
+ // given
+ vi.mocked(readContract).mockRejectedValueOnce(new Error('some error'));
+
+ // when
+ await checkForPausedContracts();
+
+ // then
+ expect(get(bridgePausedModal)).toBe(true);
+ expect(readContract).toHaveBeenCalledTimes(3);
+ });
+});
diff --git a/packages/taikoon-ui/src/lib/util/checkForPausedContracts.ts b/packages/taikoon-ui/src/lib/util/checkForPausedContracts.ts
new file mode 100644
index 00000000000..8451e79ce57
--- /dev/null
+++ b/packages/taikoon-ui/src/lib/util/checkForPausedContracts.ts
@@ -0,0 +1,7 @@
+export const isBridgePaused = async () => {
+ return await checkForPausedContracts();
+};
+
+export const checkForPausedContracts = async () => {
+ return true;
+};
diff --git a/packages/taikoon-ui/src/lib/util/classNames.ts b/packages/taikoon-ui/src/lib/util/classNames.ts
index 64c687e9396..4a60c3b72bf 100644
--- a/packages/taikoon-ui/src/lib/util/classNames.ts
+++ b/packages/taikoon-ui/src/lib/util/classNames.ts
@@ -1,3 +1,3 @@
-export function classNames(...classes: Array) {
+export function classNames(...classes: Array>) {
return classes.filter(Boolean).join(' ');
}
diff --git a/packages/taikoon-ui/src/lib/util/fetchTransactionReceipt.ts b/packages/taikoon-ui/src/lib/util/fetchTransactionReceipt.ts
new file mode 100644
index 00000000000..5a9edcd4ae8
--- /dev/null
+++ b/packages/taikoon-ui/src/lib/util/fetchTransactionReceipt.ts
@@ -0,0 +1,31 @@
+import type { Hash } from 'viem';
+
+import { chains } from '$libs/chain';
+
+export async function fetchTransactionReceipt(transactionHash: Hash, chainId: number) {
+ try {
+ const nodeUrl = chains.find((c) => c.id === chainId)?.rpcUrls?.default?.http[0];
+ if (!nodeUrl) {
+ throw new Error('Node URL not found');
+ }
+
+ const response = await fetch(nodeUrl, {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ body: JSON.stringify({
+ jsonrpc: '2.0',
+ method: 'eth_getTransactionReceipt',
+ params: [transactionHash],
+ id: 1,
+ }),
+ });
+
+ const data = await response.json();
+ return data.result;
+ } catch (error) {
+ console.error('Error fetching transaction receipt:', error);
+ throw error;
+ }
+}
diff --git a/packages/taikoon-ui/src/lib/util/getConnectedWallet.test.ts b/packages/taikoon-ui/src/lib/util/getConnectedWallet.test.ts
new file mode 100644
index 00000000000..f42cda0f29b
--- /dev/null
+++ b/packages/taikoon-ui/src/lib/util/getConnectedWallet.test.ts
@@ -0,0 +1,5 @@
+describe('getConnectedWallet', () => {
+ it('TODO', () => {
+ expect(true).toBeTruthy();
+ });
+});
diff --git a/packages/taikoon-ui/src/lib/util/getConnectedWallet.ts b/packages/taikoon-ui/src/lib/util/getConnectedWallet.ts
new file mode 100644
index 00000000000..3f042f9acbc
--- /dev/null
+++ b/packages/taikoon-ui/src/lib/util/getConnectedWallet.ts
@@ -0,0 +1,14 @@
+import { getWalletClient } from '@wagmi/core';
+
+import { NotConnectedError } from '$libs/error';
+import { config } from '$libs/wagmi';
+
+export async function getConnectedWallet(chainId?: number) {
+ const walletClient = await getWalletClient(config, { chainId });
+
+ if (!walletClient) {
+ throw new NotConnectedError('wallet is not connected');
+ }
+
+ return walletClient;
+}
diff --git a/packages/taikoon-ui/src/lib/util/groupNFTByCollection.ts b/packages/taikoon-ui/src/lib/util/groupNFTByCollection.ts
new file mode 100644
index 00000000000..bf873aeab6c
--- /dev/null
+++ b/packages/taikoon-ui/src/lib/util/groupNFTByCollection.ts
@@ -0,0 +1,13 @@
+import type { NFT } from '../token/types';
+
+export function groupNFTByCollection(nfts: NFT[]): Record {
+ const grouped: Record = {};
+ nfts.forEach((nft) => {
+ const addressKey = Object.values(nft.addresses).join('-');
+ if (!grouped[addressKey]) {
+ grouped[addressKey] = [];
+ }
+ grouped[addressKey].push(nft);
+ });
+ return grouped;
+}
diff --git a/packages/taikoon-ui/src/lib/util/isCountdownActive.ts b/packages/taikoon-ui/src/lib/util/isCountdownActive.ts
deleted file mode 100644
index cff30d478c1..00000000000
--- a/packages/taikoon-ui/src/lib/util/isCountdownActive.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { PUBLIC_LAUNCH_DATE } from '$env/static/public';
-
-export default function isCountdownActive(): boolean {
- const launchDate = new Date(PUBLIC_LAUNCH_DATE);
- return Date.now() < launchDate.getTime();
-}
diff --git a/packages/taikoon-ui/src/lib/util/jsonParseWithDefault.test.ts b/packages/taikoon-ui/src/lib/util/jsonParseWithDefault.test.ts
new file mode 100644
index 00000000000..7dd57bb5825
--- /dev/null
+++ b/packages/taikoon-ui/src/lib/util/jsonParseWithDefault.test.ts
@@ -0,0 +1,18 @@
+import { jsonParseWithDefault } from './jsonParseWithDefault';
+
+describe('jsonToArray', () => {
+ it('should return default value when input is null or empty string', () => {
+ expect(jsonParseWithDefault(null, [])).toEqual([]);
+ expect(jsonParseWithDefault('', 5)).toEqual(5);
+ });
+
+ it('should return default value when input is not a valid JSON', () => {
+ expect(jsonParseWithDefault(undefined, true)).toEqual(true);
+ expect(jsonParseWithDefault('not a valid JSON', '')).toEqual('');
+ });
+
+ it('should return parsed JSON when input is a valid JSON', () => {
+ const strJson = '{"person": "Fran", "age": "Unknown"}';
+ expect(jsonParseWithDefault(strJson, null)).toEqual(JSON.parse(strJson));
+ });
+});
diff --git a/packages/taikoon-ui/src/lib/util/jsonParseWithDefault.ts b/packages/taikoon-ui/src/lib/util/jsonParseWithDefault.ts
new file mode 100644
index 00000000000..69acdcd8670
--- /dev/null
+++ b/packages/taikoon-ui/src/lib/util/jsonParseWithDefault.ts
@@ -0,0 +1,9 @@
+export function jsonParseWithDefault(strJson: Maybe, defaultValue: T): T {
+ try {
+ // Keep in mind that strJson could be null or empty string
+ // JSON.parse would not throw an error in those cases
+ return strJson ? JSON.parse(strJson) : defaultValue;
+ } catch (e) {
+ return defaultValue;
+ }
+}
diff --git a/packages/taikoon-ui/src/lib/util/logger.ts b/packages/taikoon-ui/src/lib/util/logger.ts
new file mode 100644
index 00000000000..204f4ae8ed0
--- /dev/null
+++ b/packages/taikoon-ui/src/lib/util/logger.ts
@@ -0,0 +1,5 @@
+import debug from 'debug';
+
+export function getLogger(namespace: string) {
+ return debug(`nft-lab:${namespace}`);
+}
diff --git a/packages/taikoon-ui/src/lib/util/mergeTransactions.test.ts b/packages/taikoon-ui/src/lib/util/mergeTransactions.test.ts
new file mode 100644
index 00000000000..f6d2b4130a1
--- /dev/null
+++ b/packages/taikoon-ui/src/lib/util/mergeTransactions.test.ts
@@ -0,0 +1,162 @@
+import type { Address, Hex } from 'viem';
+
+import { type BridgeTransaction, MessageStatus } from '$libs/bridge';
+import type { TokenType } from '$libs/token';
+import { mergeAndCaptureOutdatedTransactions } from '$libs/util/mergeTransactions';
+
+function setupMocks() {
+ vi.mock('@wagmi/core');
+ vi.mock('@web3modal/wagmi');
+ vi.mock('$customToken', () => {
+ return {
+ customToken: [
+ {
+ name: 'Bull Token',
+ addresses: {
+ '31336': '0xA51c1fc2f0D1a1b8494Ed1FE312d7C3a78Ed91C0',
+ '167002': '0x9A9f2CCfdE556A7E9Ff0848998Aa4a0CFD8863AE',
+ },
+ symbol: 'BLL',
+ decimals: 18,
+ type: 'ERC20',
+ logoURI: 'ipfs://QmezMTpT6ovJ3szb3SKDM9GVGeQ1R8DfjYyXG12ppMe2BY',
+ mintable: true,
+ },
+ {
+ name: 'Horse Token',
+ addresses: {
+ '31336': '0xB7f8BC63BbcaD18155201308C8f3540b07f84F5e',
+ '167002': '0x959922bE3CAee4b8Cd9a407cc3ac1C251C2007B1',
+ },
+ symbol: 'HORSE',
+ decimals: 18,
+ type: 'ERC20',
+ logoURI: 'ipfs://QmU52ZxmSiGX24uDPNUGG3URyZr5aQdLpACCiD6tap4Mgc',
+ mintable: true,
+ },
+ ],
+ };
+ });
+}
+
+describe('mergeUniqueTransactions', () => {
+ beforeEach(() => {
+ setupMocks();
+ });
+
+ // Given
+ const localTxs: BridgeTransaction[] = [
+ {
+ hash: 'hash1' as Hex,
+ from: 'address1' as Address,
+ amount: BigInt(1000),
+ symbol: 'symbol1',
+ decimals: 2,
+ srcChainId: BigInt(1),
+ destChainId: BigInt(2),
+ status: MessageStatus.DONE,
+ msgHash: 'msg1' as Hex,
+ receipt: undefined,
+ tokenType: 'ERC20' as TokenType,
+ },
+ {
+ hash: 'hash2' as Hex,
+ from: 'address2' as Address,
+ amount: BigInt(2000),
+ symbol: 'symbol2',
+ decimals: 2,
+ srcChainId: BigInt(1),
+ destChainId: BigInt(2),
+ status: MessageStatus.DONE,
+ msgHash: 'msg2' as Hex,
+ receipt: undefined,
+ tokenType: 'ERC20' as TokenType,
+ },
+ ];
+
+ const relayerTx: BridgeTransaction[] = [
+ {
+ hash: 'hash3' as Hex,
+ from: 'address3' as Address,
+ amount: BigInt(3000),
+ symbol: 'symbol3',
+ decimals: 2,
+ srcChainId: BigInt(1),
+ destChainId: BigInt(2),
+ status: MessageStatus.DONE,
+ msgHash: 'msg3' as Hex,
+ receipt: undefined,
+ tokenType: 'ERC20' as TokenType,
+ },
+ {
+ hash: 'hash4' as Hex,
+ from: 'address4' as Address,
+ amount: BigInt(4000),
+ symbol: 'symbol4',
+ decimals: 2,
+ srcChainId: BigInt(1),
+ destChainId: BigInt(2),
+ status: MessageStatus.DONE,
+ msgHash: 'msg4' as Hex,
+ receipt: undefined,
+ tokenType: 'ERC20' as TokenType,
+ },
+ ];
+
+ it('should merge transactions when no outdated local ones', () => {
+ // When
+ const result = mergeAndCaptureOutdatedTransactions(localTxs, relayerTx);
+
+ // Then
+ expect(extractHashes(result.mergedTransactions)).toEqual(extractHashes([...localTxs, ...relayerTx]));
+ expect(result.outdatedLocalTransactions).toEqual([]);
+ });
+
+ it('should identify and capture outdated local transactions', () => {
+ // Given
+ const outdatedTx = relayerTx[0];
+ const localWithOutdated = [...localTxs, outdatedTx];
+
+ // When
+ const result = mergeAndCaptureOutdatedTransactions(localWithOutdated, relayerTx);
+
+ // Then
+ expect(extractHashes(result.mergedTransactions)).toEqual(extractHashes([...localTxs, ...relayerTx]));
+ expect(result.outdatedLocalTransactions).toEqual([outdatedTx]);
+ });
+
+ it('should merge transactions and capture outdated ones, complex', () => {
+ // Given
+
+ const localWithOutdated = [
+ ...localTxs,
+ {
+ hash: 'hash3' as Hex,
+ from: 'address2' as Address,
+ amount: BigInt(2000),
+ symbol: 'symbol2',
+ decimals: 2,
+ srcChainId: BigInt(1),
+ destChainId: BigInt(2),
+ status: MessageStatus.DONE,
+ msgHash: 'msg2' as Hex,
+ receipt: undefined,
+ tokenType: 'ERC20' as TokenType,
+ },
+ ];
+
+ const expectedMergedHashes = extractHashes([...localTxs, ...relayerTx]);
+ const expectedOutdatedHashes = ['hash3' as Hex];
+
+ // When
+ const result = mergeAndCaptureOutdatedTransactions(localWithOutdated, relayerTx);
+
+ // Then
+ expect(extractHashes(result.mergedTransactions)).toEqual(expectedMergedHashes);
+ expect(extractHashes(result.outdatedLocalTransactions)).toEqual(expectedOutdatedHashes);
+ });
+});
+
+function extractHashes(transactions: BridgeTransaction[]): Hex[] {
+ return transactions.map((tx) => tx.hash);
+}
diff --git a/packages/taikoon-ui/src/lib/util/mergeTransactions.ts b/packages/taikoon-ui/src/lib/util/mergeTransactions.ts
new file mode 100644
index 00000000000..42805471ed3
--- /dev/null
+++ b/packages/taikoon-ui/src/lib/util/mergeTransactions.ts
@@ -0,0 +1,31 @@
+import type { BridgeTransaction } from '$libs/bridge';
+
+type MergeResult = {
+ mergedTransactions: BridgeTransaction[];
+ outdatedLocalTransactions: BridgeTransaction[];
+};
+
+export const mergeAndCaptureOutdatedTransactions = (
+ localTxs: BridgeTransaction[],
+ relayerTx: BridgeTransaction[],
+): MergeResult => {
+ const relayerTxMap: Map = new Map();
+ relayerTx.forEach((tx) => relayerTxMap.set(tx.hash, tx));
+
+ const outdatedLocalTransactions: BridgeTransaction[] = [];
+ const mergedTransactions: BridgeTransaction[] = [];
+
+ for (const tx of localTxs) {
+ if (!relayerTxMap.has(tx.hash)) {
+ mergedTransactions.push(tx);
+ } else {
+ outdatedLocalTransactions.push(tx);
+ }
+ }
+
+ for (const tx of relayerTx) {
+ mergedTransactions.push(tx);
+ }
+
+ return { mergedTransactions, outdatedLocalTransactions };
+};
diff --git a/packages/taikoon-ui/src/lib/util/parseNFTMetadata.ts b/packages/taikoon-ui/src/lib/util/parseNFTMetadata.ts
new file mode 100644
index 00000000000..21cf5fcfc5c
--- /dev/null
+++ b/packages/taikoon-ui/src/lib/util/parseNFTMetadata.ts
@@ -0,0 +1,97 @@
+import axios, { AxiosError, type AxiosResponse } from 'axios';
+
+import { apiService } from '$config';
+import { type NFT, type NFTMetadata, TokenType } from '$libs/token';
+import { safeParseUrl } from '$libs/util/safeParseUrl';
+
+import { checkForAdblocker } from './checkForAdblock';
+import { extractIPFSCidFromUrl } from './extractIPFSCidFromUrl';
+import { getLogger } from './logger';
+
+const log = getLogger('libs:token:parseNFTMetadata');
+
+export const parseNFTMetadata = async (token: NFT): Promise => {
+ if (token.type !== TokenType.ERC721 && token.type !== TokenType.ERC1155) throw new Error('Not a NFT');
+
+ log(`fetching metadata for ${token.name} id: ${token.tokenId}`);
+
+ if (!token.uri) throw new Error('No token URI found');
+
+ if (token.uri.includes('{id}')) {
+ token.uri = token.uri.replace('{id}', token.tokenId.toString());
+ }
+
+ const url = safeParseUrl(token.uri);
+ if (!url) throw new Error(`Invalid token URI: ${token.uri}`);
+
+ let json;
+
+ try {
+ json = await axios.get(url, { timeout: apiService.timeout });
+ } catch (err) {
+ const error = err as AxiosError;
+ log(`error fetching metadata for ${token.name} id: ${token.tokenId}`, error);
+ //todo: handle different error scenarios?
+ json = await retry(url, token.tokenId);
+ }
+ if (!json) {
+ const isBlocked = await checkForAdblocker(url);
+ if (isBlocked) {
+ log(`The resource at ${url} is blocked by an adblocker`);
+ json = await retry(url, token.tokenId);
+ } else {
+ throw new Error(`No metadata found for ${token.name} id: ${token.tokenId}`);
+ }
+ }
+
+ if (!json || json instanceof Error) {
+ // Handle error
+ throw new Error(`No metadata found for ${token.name} id: ${token.tokenId}`);
+ }
+ const metadata = {
+ description: json.data.description || '',
+ external_url: json.data.external_url || '',
+ image: json.data.image || '',
+ name: json.data.name || '',
+ };
+
+ log(`fetched metadata for ${token.name} id: ${token.tokenId}`, metadata);
+ return metadata;
+};
+
+// TODO: we could retry several times with different gateways
+const retry = async (url: string, tokenId: number): Promise => {
+ let newUrl;
+ tokenId !== undefined && tokenId !== null ? (newUrl = useGateway(url, tokenId)) : (newUrl = useGateway(url, tokenId));
+ if (newUrl) {
+ const result = await retryRequest(newUrl);
+ if (result instanceof Error) {
+ return result;
+ }
+ return result;
+ }
+ return new Error(`No metadata found for ${url}`);
+};
+
+const retryRequest = async (newUrl: string): Promise => {
+ try {
+ log(`retrying with ${newUrl}`);
+ return await axios.get(newUrl);
+ } catch (error) {
+ log('retrying failed', error);
+ throw new Error(`No metadata found for ${newUrl}`);
+ }
+};
+
+//TODO: make this configurable via the config system?
+const useGateway = (url: string, tokenId: number) => {
+ const { cid } = extractIPFSCidFromUrl(url);
+ let gateway: string;
+ if (tokenId !== undefined && tokenId !== null && cid) {
+ gateway = `https://ipfs.io/ipfs/${cid}/${tokenId}.json`;
+ } else {
+ log(`no valid CID found in ${url}`);
+ return null;
+ }
+ return gateway;
+};
diff --git a/packages/taikoon-ui/src/lib/util/positionElementByTarget.test.ts b/packages/taikoon-ui/src/lib/util/positionElementByTarget.test.ts
new file mode 100644
index 00000000000..2943c667496
--- /dev/null
+++ b/packages/taikoon-ui/src/lib/util/positionElementByTarget.test.ts
@@ -0,0 +1,60 @@
+import { positionElementByTarget } from './positionElementByTarget';
+
+const targetElement = {
+ offsetHeight: 10,
+ offsetWidth: 10,
+} as HTMLElement;
+
+const elementToPosition = {
+ style: {
+ top: '',
+ bottom: '',
+ left: '',
+ right: '',
+ transform: '',
+ },
+ offsetHeight: 100,
+ offsetWidth: 100,
+} as HTMLElement;
+
+describe('positionElementByTarget', () => {
+ it('should position element to the top', () => {
+ positionElementByTarget(elementToPosition, targetElement, 'top', 15);
+
+ expect(elementToPosition.style.top).toBe('');
+ expect(elementToPosition.style.bottom).toBe('25px'); // 10 + 15
+ expect(elementToPosition.style.left).toBe('50%');
+ expect(elementToPosition.style.right).toBe('');
+ expect(elementToPosition.style.transform).toBe('translateX(-50%)');
+ });
+
+ it('should position element to the bottom', () => {
+ positionElementByTarget(elementToPosition, targetElement, 'bottom', 20);
+
+ expect(elementToPosition.style.top).toBe('30px'); // 10 + 20
+ expect(elementToPosition.style.bottom).toBe('');
+ expect(elementToPosition.style.left).toBe('50%');
+ expect(elementToPosition.style.right).toBe('');
+ expect(elementToPosition.style.transform).toBe('translateX(-50%)');
+ });
+
+ it('should position element to the left', () => {
+ positionElementByTarget(elementToPosition, targetElement, 'left', 25);
+
+ expect(elementToPosition.style.top).toBe('50%');
+ expect(elementToPosition.style.bottom).toBe('');
+ expect(elementToPosition.style.left).toBe('auto');
+ expect(elementToPosition.style.right).toBe('35px'); // 10 + 25
+ expect(elementToPosition.style.transform).toBe('translateY(-50%)');
+ });
+
+ it('should position element to the right', () => {
+ positionElementByTarget(elementToPosition, targetElement, 'right', 30);
+
+ expect(elementToPosition.style.top).toBe('50%');
+ expect(elementToPosition.style.bottom).toBe('');
+ expect(elementToPosition.style.left).toBe('40px'); // 10 + 30
+ expect(elementToPosition.style.right).toBe('auto');
+ expect(elementToPosition.style.transform).toBe('translateY(-50%)');
+ });
+});
diff --git a/packages/taikoon-ui/src/lib/util/positionElementByTarget.ts b/packages/taikoon-ui/src/lib/util/positionElementByTarget.ts
new file mode 100644
index 00000000000..d61bbea5fff
--- /dev/null
+++ b/packages/taikoon-ui/src/lib/util/positionElementByTarget.ts
@@ -0,0 +1,45 @@
+// TODO: add support for other positions: 'top-left', 'bottom-right', etc...
+export function positionElementByTarget(
+ elementToPosition: HTMLElement,
+ targetElement: HTMLElement,
+ position: Position = 'top',
+ gap = 10,
+) {
+ const { style } = elementToPosition;
+
+ // Reset styles.
+ style.top = '';
+ style.bottom = '';
+ style.left = '';
+ style.right = '';
+ style.transform = '';
+
+ switch (position) {
+ case 'top':
+ case 'top-right':
+ case 'top-left':
+ style.bottom = `${targetElement.offsetHeight + gap}px`;
+ style.left = '50%';
+ style.transform = 'translateX(-50%)';
+ break;
+ case 'bottom':
+ case 'bottom-right':
+ case 'bottom-left':
+ style.top = `${targetElement.offsetHeight + gap}px`;
+ style.left = '50%';
+ style.transform = 'translateX(-50%)';
+ break;
+ case 'left':
+ style.left = 'auto';
+ style.right = `${targetElement.offsetWidth + gap}px`;
+ style.top = '50%';
+ style.transform = 'translateY(-50%)';
+ break;
+ case 'right':
+ style.right = 'auto';
+ style.left = `${targetElement.offsetWidth + gap}px`;
+ style.top = '50%';
+ style.transform = 'translateY(-50%)';
+ break;
+ }
+}
diff --git a/packages/taikoon-ui/src/lib/util/resolveIPFSUri.ts b/packages/taikoon-ui/src/lib/util/resolveIPFSUri.ts
new file mode 100644
index 00000000000..d1c72c5c144
--- /dev/null
+++ b/packages/taikoon-ui/src/lib/util/resolveIPFSUri.ts
@@ -0,0 +1,31 @@
+import axios, { type AxiosRequestConfig } from 'axios';
+
+import { ipfsConfig } from '$config';
+import { PUBLIC_IPFS_GATEWAYS } from '$env/static/public';
+import { ConfigError, IpfsError } from '$libs/error';
+
+const gateways = PUBLIC_IPFS_GATEWAYS.split(',') || [];
+
+const axiosConfig: AxiosRequestConfig = {
+ timeout: ipfsConfig.gatewayTimeout,
+};
+
+export async function resolveIPFSUri(uri: string): Promise {
+ const cid = uri.replace('ipfs://', '');
+ let elapsedTime = 0;
+ if (gateways.length === 0) throw new ConfigError('No IPFS gateways configured');
+ for (const gateway of gateways) {
+ const start = Date.now();
+ try {
+ const url = `${gateway}/ipfs/${cid}`;
+ await axios.head(url, axiosConfig);
+ return url; // Return the first successful gateway URL
+ } catch (error) {
+ elapsedTime += Date.now() - start;
+ if (elapsedTime > ipfsConfig.overallTimeout) {
+ break;
+ }
+ }
+ }
+ throw new IpfsError('Failed to retrieve metadata from IPFS gateways');
+}
diff --git a/packages/taikoon-ui/src/lib/util/safeReadContract.test.ts b/packages/taikoon-ui/src/lib/util/safeReadContract.test.ts
new file mode 100644
index 00000000000..85df57956ca
--- /dev/null
+++ b/packages/taikoon-ui/src/lib/util/safeReadContract.test.ts
@@ -0,0 +1,35 @@
+import { readContract } from '@wagmi/core';
+import { zeroAddress } from 'viem';
+
+import { safeReadContract } from './safeReadContract';
+
+vi.mock('@wagmi/core');
+
+describe('safeReadContract', () => {
+ it('should return contract data on success', async () => {
+ const mockData = { data: 'mockData' };
+ vi.mocked(readContract).mockResolvedValue(mockData);
+
+ const result = await safeReadContract({
+ address: zeroAddress,
+ abi: [],
+ functionName: 'functionName',
+ chainId: 1,
+ });
+
+ expect(result).toEqual(mockData);
+ });
+
+ it('should return null on failure', async () => {
+ vi.mocked(readContract).mockRejectedValue(new Error('mockError'));
+
+ const result = await safeReadContract({
+ address: zeroAddress,
+ abi: [],
+ functionName: 'functionName',
+ chainId: 1,
+ });
+
+ expect(result).toBeNull();
+ });
+});
diff --git a/packages/taikoon-ui/src/lib/util/safeReadContract.ts b/packages/taikoon-ui/src/lib/util/safeReadContract.ts
new file mode 100644
index 00000000000..072c97c7787
--- /dev/null
+++ b/packages/taikoon-ui/src/lib/util/safeReadContract.ts
@@ -0,0 +1,29 @@
+import { readContract } from '@wagmi/core';
+import type { Abi, Address } from 'viem';
+
+import { config } from '$libs/wagmi';
+
+import { getLogger } from './logger';
+
+const log = getLogger('libs:util:safeReadContract');
+
+type ReadContractParams = {
+ address: Address;
+ abi: Abi;
+ functionName: string;
+ args?: unknown[];
+ chainId: number;
+};
+
+/*
+ * Safely read a contract, returning null if it fails
+ * useful when trying to access a non standard, non mandatory function
+ */
+export async function safeReadContract(params: ReadContractParams): Promise {
+ try {
+ return await readContract(config, params);
+ } catch (error) {
+ log(`Safely failed to read contract: ${error}`);
+ return null;
+ }
+}
diff --git a/packages/taikoon-ui/src/lib/util/shortenAddress.test.ts b/packages/taikoon-ui/src/lib/util/shortenAddress.test.ts
new file mode 100644
index 00000000000..e7181058e50
--- /dev/null
+++ b/packages/taikoon-ui/src/lib/util/shortenAddress.test.ts
@@ -0,0 +1,12 @@
+import { shortenAddress } from './shortenAddress';
+
+it('should return string with prefix and suffix', () => {
+ const dummyAddress = '0x63FaC9201494f0bd17B9892B9fae4d52fe3BD377';
+
+ expect(shortenAddress(dummyAddress)).toStrictEqual('0x63Fa…D377');
+ expect(shortenAddress(dummyAddress, 10, 10)).toStrictEqual('0x63FaC920…52fe3BD377');
+});
+
+it('should return 0x if empty', () => {
+ expect(shortenAddress('')).toBe('0x');
+});
diff --git a/packages/taikoon-ui/src/lib/util/shortenAddress.ts b/packages/taikoon-ui/src/lib/util/shortenAddress.ts
index 4d3b693278b..d30beb3f364 100644
--- a/packages/taikoon-ui/src/lib/util/shortenAddress.ts
+++ b/packages/taikoon-ui/src/lib/util/shortenAddress.ts
@@ -2,7 +2,7 @@ import type { IAddress } from '../../types';
import { web3modal } from '../connect';
import { getName } from '../ens';
-export async function shortenAddress(address: IAddress, charsStart = 5, charsEnd = 3, sep = '…'): Promise {
+export async function shortenAddress(address: IAddress, charsStart = 6, charsEnd = 4, sep = '…'): Promise {
if (!address) return '0x';
const shortened = [address.slice(0, charsStart), address.slice(-charsEnd)].join(sep);
diff --git a/packages/taikoon-ui/src/lib/wagmi/watcher.ts b/packages/taikoon-ui/src/lib/wagmi/watcher.ts
index 9af9d86f4fd..819d7b2e9aa 100644
--- a/packages/taikoon-ui/src/lib/wagmi/watcher.ts
+++ b/packages/taikoon-ui/src/lib/wagmi/watcher.ts
@@ -4,18 +4,24 @@ import { config } from '$wagmi-config';
import { isSupportedChain } from '../../lib/chain';
import { refreshUserBalance } from '../../lib/util/balance';
+import { checkForPausedContracts } from '../../lib/util/checkForPausedContracts';
+import { getLogger } from '../../lib/util/logger';
import { account } from '../../stores/account';
import { switchChainModal } from '../../stores/modal';
import { connectedSourceChain } from '../../stores/network';
+const log = getLogger('wagmi:watcher');
let isWatching = false;
let unWatchAccount: () => void;
export async function startWatching() {
+ checkForPausedContracts();
+
if (!isWatching) {
unWatchAccount = watchAccount(config, {
onChange(data) {
- console.warn('Account changed', data);
+ checkForPausedContracts();
+ log('Account changed', data);
account.set(data);
refreshUserBalance();
const { chain } = data;
@@ -23,7 +29,7 @@ export async function startWatching() {
// We need to check if the chain is supported, and if not
// we present the user with a modal to switch networks.
if (chain && !isSupportedChain(Number(chain.id))) {
- console.warn('Unsupported chain', chain);
+ log('Unsupported chain', chain);
switchChainModal.set(true);
return;
} else if (chain) {
diff --git a/packages/taikoon-ui/src/routes/+layout.svelte b/packages/taikoon-ui/src/routes/+layout.svelte
index 5c7d8bb12c8..0c77630d904 100644
--- a/packages/taikoon-ui/src/routes/+layout.svelte
+++ b/packages/taikoon-ui/src/routes/+layout.svelte
@@ -7,7 +7,7 @@
import { zeroAddress } from 'viem';
import { ResponsiveController } from '$components/core/ResponsiveController';
- import { MintConfirmationModal, PostMintModal, TaikoonDetailModal } from '$components/modals';
+ import { MintConfirmationModal, TaikoonDetailModal } from '$components/modals';
import { mint } from '$stores/mint';
import { taikoonDetail } from '$stores/taikoonDetail';
@@ -26,7 +26,6 @@
tokenIds: [],
address: zeroAddress,
totalMintCount: 0,
- txHash: '',
});
const taikoonDetailState = taikoonDetail;
@@ -37,16 +36,7 @@
setContext('mint', mintState);
setContext('taikoonDetail', taikoonDetailState);
- const containerClasses = classNames(
- 'z-0',
- 'w-full',
- 'h-full',
- 'flex',
- 'flex-col',
- 'relative',
- 'items-center',
- 'justify-evenly',
- );
+ const containerClasses = classNames('z-0', 'w-full', 'h-full', 'flex', 'flex-col', 'items-center', 'justify-evenly');
let windowSize: 'sm' | 'md' | 'lg' = 'md';
@@ -71,9 +61,7 @@
- {#if isCountdownActive()}
+ {#if currentPage === 'teaser'}
+
diff --git a/packages/taikoon-ui/src/components/sections/index.ts b/packages/taikoon-ui/src/components/sections/index.ts
index e9a1d7747b3..e3b6b0efaf4 100644
--- a/packages/taikoon-ui/src/components/sections/index.ts
+++ b/packages/taikoon-ui/src/components/sections/index.ts
@@ -1,6 +1,5 @@
export { default as CollapsibleSection } from './Collapsible.section.svelte';
export { default as CountdownSection } from './Countdown.section.svelte';
-export { default as FaqSection } from './Faq.section.svelte';
export { default as FooterSection } from './Footer.section.svelte';
export { default as HeadingSection } from './Heading.section.svelte';
export { default as InformationSection } from './Information.section.svelte';
diff --git a/packages/taikoon-ui/src/generated/abi/index.ts b/packages/taikoon-ui/src/generated/abi/index.ts
index 276d4ce8e72..fae30cd3856 100644
--- a/packages/taikoon-ui/src/generated/abi/index.ts
+++ b/packages/taikoon-ui/src/generated/abi/index.ts
@@ -3,7 +3,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/**
- * - [__View Contract on Holesky Etherscan__](https://holesky.etherscan.io/address/0xfDbaA6d6c382A2555856bFaB315D5E6F3CDA1393)
+ * - [__View Contract on Holesky Etherscan__](https://holesky.etherscan.io/address/0x0874bD201a33bff5Ebd4f8200c6482A72457FeF0)
* -
*/
export const taikoonTokenAbi = [
@@ -544,16 +544,16 @@ export const taikoonTokenAbi = [
] as const;
/**
- * - [__View Contract on Holesky Etherscan__](https://holesky.etherscan.io/address/0xfDbaA6d6c382A2555856bFaB315D5E6F3CDA1393)
+ * - [__View Contract on Holesky Etherscan__](https://holesky.etherscan.io/address/0x0874bD201a33bff5Ebd4f8200c6482A72457FeF0)
* -
*/
export const taikoonTokenAddress = {
- 17000: '0xfDbaA6d6c382A2555856bFaB315D5E6F3CDA1393',
- 31337: '0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512',
+ 17000: '0x0874bD201a33bff5Ebd4f8200c6482A72457FeF0',
+ 31337: '0x0DCd1Bf9A1b36cE34237eEaFef220932846BCD82',
} as const;
/**
- * - [__View Contract on Holesky Etherscan__](https://holesky.etherscan.io/address/0xfDbaA6d6c382A2555856bFaB315D5E6F3CDA1393)
+ * - [__View Contract on Holesky Etherscan__](https://holesky.etherscan.io/address/0x0874bD201a33bff5Ebd4f8200c6482A72457FeF0)
* -
*/
export const taikoonTokenConfig = {
diff --git a/packages/taikoon-ui/src/i18n/en.json b/packages/taikoon-ui/src/i18n/en.json
index d37c3d0f072..3c77860da7e 100644
--- a/packages/taikoon-ui/src/i18n/en.json
+++ b/packages/taikoon-ui/src/i18n/en.json
@@ -16,7 +16,7 @@
},
"buttons": {
"mintNow": "Mint Now",
- "learnMore": "FAQs",
+ "learnMore": "Learn More",
"mint": "Mint",
"etherscan": "View on Etherscan",
"share": "Share",
@@ -28,7 +28,7 @@
"mint": {
"title": "Taikoons",
"text": "Taikoons are the genesis NFT collection for the Taiko Layer 2 ecosystem.",
- "eligibleLabel": "You are eligible to mint:",
+ "mintsLeft": "Mints left: {mintsLeft}",
"toast": {
"clipboardCopy": "Link copied to clipboard"
},
@@ -72,23 +72,19 @@
"entries": [
{
"title": "What is the total supply of the NFTs in this collection?",
- "text": "There are 888 Taikoons — not more, not less! Always double check if the official collection when minting/trading."
+ "text": "The total supply of the NFTs in this collection is 888."
},
{
"title": "How can I use my Taikoons?",
- "text": "Taikoons are primarily a PFP collection, meaning its purpose is to give you a sense of identity in the Taiko community. However, since the Taikoons you hold are your property, you can do with them whatever you want! Trade, print, or just hold them — they're yours!
+ {count}
+
+ {label}
+Also, keep in mind that there are no financial incentives attached to Taikoons." + "text": "You can use your Taikoons to participate in the Taiko Layer 2 ecosystem." }, { "title": "What is the minting process?", - "text": "One time genesis mint of all 888 nfts targeted May 2024" + "text": "The minting process is as follows:" }, { - "title": "What is the official Taikoons contract?", - "text": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus tincidunt lorem eros, in bibendum lectus mollis laoreet. Praesent luctus odio rhoncus nisi pulvinar pharetra. Aliquam volutpat bibendum nisl, vitae elementum mauris egestas eget. Etiam ex felis, porttitor nec elementum vitae, mattis at felis. In cursus, augue vel pulvinar aliquet, orci sapien aliquam ipsum, non sollicitudin purus nulla ac risus." - }, - { - "title": "What are the traits?", - "text": "(tbc) Nouns are generated randomly based Ethereum block hashes. There are no 'if' statements or other rules governing Noun trait scarcity, which makes all Nouns equally rare. As of this writing, Nouns are made up of:
-backgrounds (2)
-bodies (30)
-accessories (140)
-heads (242)
-glasses (23)" + "title": "How does the daily auction work?", + "text": "The daily auction works as follows:" } ] }, @@ -100,7 +96,7 @@ "text": "The most developer-friendly and secure Ethereum scaling solution." }, "subscribe": { - "stayUpdated": "Stay updated!
Dive into the latest Taiko developer news", + "stayUpdated": "Stay updated! \nDive into the latest Taiko developer news", "subscribe": "Subscribe", "email": "Email" }, diff --git a/packages/taikoon-ui/src/lib/connect/web3modal.ts b/packages/taikoon-ui/src/lib/connect/web3modal.ts index 5978bf69d58..24760545662 100644 --- a/packages/taikoon-ui/src/lib/connect/web3modal.ts +++ b/packages/taikoon-ui/src/lib/connect/web3modal.ts @@ -7,7 +7,7 @@ import { config } from '$wagmi-config'; import { getChainImages } from '../../lib/chain'; -const projectId = PUBLIC_WALLETCONNECT_PROJECT_ID || 'walletconnect-project-id'; +const projectId = PUBLIC_WALLETCONNECT_PROJECT_ID || ''; const chainImages = getChainImages(); export const chainId = readable(getChainId(config), (set) => watchChainId(config, { onChange: set })); @@ -24,7 +24,7 @@ export const provider = readable