diff --git a/resources/js/Components/Carousel/Carousel.tsx b/resources/js/Components/Carousel/Carousel.tsx index 7bccb17bc..60b1b4415 100644 --- a/resources/js/Components/Carousel/Carousel.tsx +++ b/resources/js/Components/Carousel/Carousel.tsx @@ -132,7 +132,7 @@ export const CarouselPreviousButton = ({ disabled?: boolean; }): JSX.Element => ( ( -
+
{showNameColumn && !isLgAndAbove && ( )} - {(!showNameColumn || isLgAndAbove) && } + {(!showNameColumn || isLgAndAbove) && ( + + )}
@@ -200,7 +205,7 @@ export const Type = ({ {showNameColumn && !isMdAndAbove && ( <> {!isLgAndAbove && ( -
+
)} @@ -219,16 +224,16 @@ export const Type = ({ variant="link" className="flex items-center leading-6" fontSize="text-base" - textColor="text-theme-primary-600" + textColor="text-theme-primary-600 dark:text-theme-primary-400 dark:hover:text-theme-primary-500 dark:hover:decoration-theme-primary-500" href={transactionUrl(activity.id)} external - iconClassName="ml-2 text-theme-secondary-500" + iconClassName="ml-2 text-theme-secondary-500 dark:text-theme-dark-300" > {activityTypeLabel} {!showNameColumn && !isMdAndAbove && ( <> -
+
)} @@ -237,7 +242,7 @@ export const Type = ({ {!isXlAndAbove && ( <> {showNameColumn && !isLgAndAbove && ( -
+
)} {isMdAndAbove && } {!isMdAndAbove && nativeToken != null && ( @@ -278,18 +283,18 @@ export const Type = ({
{activityTypeLabel}
@@ -312,7 +317,7 @@ export const Timestamp = ({ value }: { value: number }): JSX.Element => { @@ -321,7 +326,9 @@ export const Timestamp = ({ value }: { value: number }): JSX.Element => { }; const Label = ({ children }: { children: React.ReactNode }): JSX.Element => ( - {children} + + {children} + ); export const SalePrice = ({ @@ -344,7 +351,7 @@ export const SalePrice = ({ > {isTruthy(nativePrice) && isTruthy(usdPrice) ? ( <> - + ETH @@ -355,7 +362,7 @@ export const SalePrice = ({ ) : ( -

+

{t("common.na")}

)} @@ -384,7 +391,7 @@ export const CollectionActivityTableItemSkeleton = ({ if (isCompact) { return ( -
+
{showNameColumn && (
{!isMdAndAbove && (
-
+
-
+
+
{showNameColumn && (
@@ -744,7 +751,7 @@ export const CollectionActivityTableItem = ({ })} >
- {!isXlAndAbove && {t("common.from")}} + {!isXlAndAbove && {t("common.from")}} - {t("common.to")} + {t("common.to")} 0 && (
- +{rest.length + 1} + + +{rest.length + 1} +
)}
diff --git a/resources/js/Components/Collections/CollectionHeader/CollectionHeaderBottom.tsx b/resources/js/Components/Collections/CollectionHeader/CollectionHeaderBottom.tsx index 3c0edfe5c..d6271b1f8 100644 --- a/resources/js/Components/Collections/CollectionHeader/CollectionHeaderBottom.tsx +++ b/resources/js/Components/Collections/CollectionHeader/CollectionHeaderBottom.tsx @@ -25,11 +25,11 @@ export const CollectionHeaderBottom = ({ collection }: CollectionHeaderBottomPro <>
: null} /> : null} /> diff --git a/resources/js/Components/Collections/CollectionImages/CollectionImages.tsx b/resources/js/Components/Collections/CollectionImages/CollectionImages.tsx index b49c2260c..cd9735dbd 100644 --- a/resources/js/Components/Collections/CollectionImages/CollectionImages.tsx +++ b/resources/js/Components/Collections/CollectionImages/CollectionImages.tsx @@ -29,8 +29,8 @@ export const CollectionImages = ({ {nftsCount >= maxItems && (
{nftsCount > maxItems && ( -
- +
+ {maxItems > 1 && "+"} {nftsCount - maxItems + 1} diff --git a/resources/js/Components/Collections/Nfts/NftBackButton/NftBackButton.tsx b/resources/js/Components/Collections/Nfts/NftBackButton/NftBackButton.tsx index d78609cf7..368f5b251 100644 --- a/resources/js/Components/Collections/Nfts/NftBackButton/NftBackButton.tsx +++ b/resources/js/Components/Collections/Nfts/NftBackButton/NftBackButton.tsx @@ -46,7 +46,7 @@ export const NftBackButton = ({ nft, url, className }: Properties): JSX.Element />
-
+
{t("common.back_to")}{" "} {nft.collection.name} diff --git a/resources/js/Components/Collections/Nfts/NftHeader/NftBasicInfo.tsx b/resources/js/Components/Collections/Nfts/NftHeader/NftBasicInfo.tsx index 822d6c815..094ce431e 100644 --- a/resources/js/Components/Collections/Nfts/NftHeader/NftBasicInfo.tsx +++ b/resources/js/Components/Collections/Nfts/NftHeader/NftBasicInfo.tsx @@ -29,7 +29,7 @@ export const NftBasicInfo = ({ nft }: Properties): JSX.Element => { { router.visit( diff --git a/resources/js/Components/Collections/Nfts/NftHeader/NftHeader.tsx b/resources/js/Components/Collections/Nfts/NftHeader/NftHeader.tsx index 7ee983edd..89e874f97 100644 --- a/resources/js/Components/Collections/Nfts/NftHeader/NftHeader.tsx +++ b/resources/js/Components/Collections/Nfts/NftHeader/NftHeader.tsx @@ -39,7 +39,7 @@ export const NftHeader = ({
- +
- +
- +
-
+
{ }, [nft, t]); return ( -
+
{t("pages.nfts.owned_by") + " "} {nft.wallet !== null && ownerUrl !== null && address !== null ? ( @@ -36,7 +36,7 @@ export const NftOwner = ({ nft }: Properties): JSX.Element => { showExternalIcon={true} className="ml-1 flex flex-row items-center" > - + diff --git a/resources/js/Components/GridHeader.tsx b/resources/js/Components/GridHeader.tsx index 79334a593..573961a14 100644 --- a/resources/js/Components/GridHeader.tsx +++ b/resources/js/Components/GridHeader.tsx @@ -24,7 +24,7 @@ export const GridHeader = ({ return (
{title} @@ -41,9 +41,11 @@ export const GridHeader = ({ data-testid="GridHeader__value" className="leading-6 md:leading-7" > - {isTruthy(value) && {value}} + {isTruthy(value) && {value}} - {!isTruthy(value) && {emptyValue}} + {!isTruthy(value) && ( + {emptyValue} + )}
diff --git a/resources/js/Components/Point.tsx b/resources/js/Components/Point.tsx index b2fea01c0..67f0dd340 100644 --- a/resources/js/Components/Point.tsx +++ b/resources/js/Components/Point.tsx @@ -2,8 +2,14 @@ interface Properties { width?: string; height?: string; color?: string; + className?: string; } -export const Point = ({ width = "w-[5px]", height = "h-[5px]", color = "secondary-400" }: Properties): JSX.Element => ( -
+export const Point = ({ + width = "w-[5px]", + height = "h-[5px]", + color = "secondary-400", + className, +}: Properties): JSX.Element => ( +
); diff --git a/resources/js/Pages/Collections/Components/CollectionFilterSlider/CollectionFilterSlider.tsx b/resources/js/Pages/Collections/Components/CollectionFilterSlider/CollectionFilterSlider.tsx index 776449402..acc7383e9 100644 --- a/resources/js/Pages/Collections/Components/CollectionFilterSlider/CollectionFilterSlider.tsx +++ b/resources/js/Pages/Collections/Components/CollectionFilterSlider/CollectionFilterSlider.tsx @@ -91,7 +91,7 @@ export const CollectionFilterSlider = ({
-
+