- {hasOfframpBadge && (
+ {hasOfframpMigrationEntry && (
}
- onClick={() => router.push('/add-money/crypto?network=EVM&source=offramp')}
+ onClick={() => router.push(OFFRAMP_MIGRATION_ROUTE)}
/>
)}
}
onClick={() => setIsDrawerOpen(true)}
/>
diff --git a/src/components/Badges/BadgeDetailModal.tsx b/src/components/Badges/BadgeDetailModal.tsx
index fae5044a20..11e6f6e05f 100644
--- a/src/components/Badges/BadgeDetailModal.tsx
+++ b/src/components/Badges/BadgeDetailModal.tsx
@@ -1,9 +1,9 @@
'use client'
-import Image from 'next/image'
import type { StaticImageData } from 'next/image'
import { useLocale, useTranslations } from 'next-intl'
import ActionModal from '../Global/ActionModal'
+import { BadgeImage } from './BadgeImage'
import ShareButton from '../Global/ShareButton'
import { getBadgeShareText } from './badge.utils'
import { useUserStore } from '@/redux/hooks'
@@ -35,7 +35,16 @@ export const BadgeDetailModal = ({ isOpen, onClose, code, title, description, lo
return (
}
+ icon={
+
+ }
iconContainerClassName="bg-transparent min-w-60 h-auto"
modalPanelClassName="m-0"
visible={isOpen}
diff --git a/src/components/Badges/BadgeEarnToast.tsx b/src/components/Badges/BadgeEarnToast.tsx
index 2000f84142..2143810cb3 100644
--- a/src/components/Badges/BadgeEarnToast.tsx
+++ b/src/components/Badges/BadgeEarnToast.tsx
@@ -18,14 +18,14 @@
import { useEffect, useRef, useState } from 'react'
import { usePathname, useRouter } from 'next/navigation'
-import Image from 'next/image'
import posthog from 'posthog-js'
import { useTranslations } from 'next-intl'
import { useToast } from '@/components/0_Bruddle/Toast'
import { BadgeDetailModal } from '@/components/Badges/BadgeDetailModal'
-import { getBadgeDisplayName, getBadgeIcon, getPublicBadgeDescription } from '@/components/Badges/badge.utils'
+import { getBadgeDescription, getBadgeDisplayName, getBadgeIcon } from '@/components/Badges/badge.utils'
import { useBadgeEarnToast } from '@/components/Badges/useBadgeEarnToast'
import { ANALYTICS_EVENTS } from '@/constants/analytics.consts'
+import { BadgeImage } from '@/components/Badges/BadgeImage'
const HOME_PATH = '/home'
@@ -53,7 +53,7 @@ export default function BadgeEarnToast() {
const count = badges.length
const newest = badges[0]
const newestName = getBadgeDisplayName(newest.code, newest.name)
- const newestIcon = getBadgeIcon(newest.code)
+ const newestIcon = getBadgeIcon(newest.code, newest.iconUrl)
// Per-batch id (not a fixed id): a fixed id de-dupes in the Toast layer,
// so a second badge earned within the toast's window would be marked
// seen but never shown. Keying on the codes lets a distinct later batch
@@ -68,7 +68,7 @@ export default function BadgeEarnToast() {
setModalBadge({
code: newest.code,
title: newestName,
- description: newest.description || getPublicBadgeDescription(newest.code) || '',
+ description: getBadgeDescription(newest.description) || '',
logo: newestIcon,
})
} else {
@@ -85,7 +85,7 @@ export default function BadgeEarnToast() {
className: 'border-yellow-1',
content: (