diff --git a/apps/admin-x-design-system/src/global/form/TextField.tsx b/apps/admin-x-design-system/src/global/form/TextField.tsx index e640721441..5e62848785 100644 --- a/apps/admin-x-design-system/src/global/form/TextField.tsx +++ b/apps/admin-x-design-system/src/global/form/TextField.tsx @@ -76,7 +76,7 @@ const TextField: React.FC = ({ const textFieldClasses = !unstyled && clsx( 'peer z-[1] order-2 h-8 w-full bg-transparent px-3 py-1 text-sm placeholder:text-grey-500 dark:placeholder:text-grey-700 md:h-9 md:py-2 md:text-md', - disabled ? 'cursor-not-allowed text-grey-700 opacity-60 dark:text-grey-700' : 'dark:text-white', + disabled ? 'text-grey-700 opacity-60 dark:text-grey-700' : 'dark:text-white', rightPlaceholder ? 'w-0 grow rounded-l-md' : 'rounded-md', className ); diff --git a/apps/admin-x-settings/src/components/settings/growth/offers/EditOfferModal.tsx b/apps/admin-x-settings/src/components/settings/growth/offers/EditOfferModal.tsx index 9ba159f989..7b4740d5bb 100644 --- a/apps/admin-x-settings/src/components/settings/growth/offers/EditOfferModal.tsx +++ b/apps/admin-x-settings/src/components/settings/growth/offers/EditOfferModal.tsx @@ -92,27 +92,29 @@ const Sidebar: React.FC<{ return (
-
+

Stats

Created at {formatTimestamp(offer?.created_at ? offer.created_at : '')}
-
- Total redemptions - {offer?.redemption_count} {offer?.redemption_count === 1 ? 'redemption' : 'redemptions'} -
- {offer?.redemption_count > 0 && offer?.last_redeemed ? -
+
+
- Last redemption - {formatTimestamp(offer?.last_redeemed)} + Total redemptions + {offer?.redemption_count} {offer?.redemption_count === 1 ? 'redemption' : 'redemptions'}
- See all → -
: - null - } + {offer?.redemption_count > 0 && offer?.last_redeemed ? +
+ Last redemption + {formatTimestamp(offer?.last_redeemed)} +
: + null + } +
+ See all → +
@@ -136,7 +138,7 @@ const Sidebar: React.FC<{ type='url' value={offerUrl} /> -
diff --git a/apps/admin-x-settings/src/components/settings/growth/offers/OffersIndex.tsx b/apps/admin-x-settings/src/components/settings/growth/offers/OffersIndex.tsx index cba1e8b0ce..fd87c622b9 100644 --- a/apps/admin-x-settings/src/components/settings/growth/offers/OffersIndex.tsx +++ b/apps/admin-x-settings/src/components/settings/growth/offers/OffersIndex.tsx @@ -89,15 +89,15 @@ const OfferCard: React.FC<{amount: number, cadence: string, currency: string, du return (
-
+

{name}

- {discountOffer} + {discountOffer}
- {updatedPriceWithCurrency} + {updatedPriceWithCurrency} {originalPriceWithCurrency}
-
+
{tierName} {redemptionCount} redemptions @@ -212,7 +212,7 @@ export const OffersIndexModal = () => { })}
; - const listLayoutOutput = + const listLayoutOutput =
{sortedOffers.length} {sortedOffers.length > 1 ? 'offers' : 'offer'} Tier