Release 202507281850

web/.nvmrc

@@ -1 +1 @@
-23
+24

web/astro.config.mjs

@@ -107,7 +107,8 @@ export default defineConfig({
         SITE_URL === 'http://localhost:4321'
           ? "frame-ancestors 'none'; upgrade-insecure-requests"
           : "default-src 'self'; img-src 'self' *; frame-ancestors 'none'; upgrade-insecure-requests",
-      'Strict-Transport-Security': 'max-age=31536000; includeSubdomains; preload;',
+      'Strict-Transport-Security':
+        SITE_URL === 'http://localhost:4321' ? undefined : 'max-age=31536000; includeSubdomains; preload;',
     },
   },
   image: {

web/package.json

@@ -33,17 +33,19 @@
     "@fontsource-variable/space-grotesk": "5.2.8",
     "@fontsource/inter": "5.2.6",
     "@fontsource/space-grotesk": "5.2.8",
-    "@prisma/client": "6.10.1",
+    "@prisma/client": "6.11.1",
     "@tailwindcss/vite": "4.1.11",
     "@types/mime-types": "3.0.1",
     "@types/pg": "8.15.4",
-    "@vercel/og": "0.6.8",
+    "@vercel/og": "0.7.2",
-    "astro": "5.11.0",
+    "astro": "5.9.0",
     "astro-loading-indicator": "0.7.0",
     "astro-remote": "0.3.4",
     "astro-seo-schema": "5.0.0",
     "canvas": "3.1.2",
     "clsx": "2.1.1",
+    "countries-list": "3.1.1",
+    "country-flag-icons": "1.5.19",
     "he": "1.2.0",
     "htmx.org": "2.0.6",
     "javascript-time-ago": "2.5.11",
@@ -54,7 +56,7 @@
     "pg": "8.16.3",
     "qrcode": "1.5.4",
     "react": "19.1.0",
-    "redis": "5.5.6",
+    "redis": "5.6.0",
     "schema-dts": "1.1.5",
     "seedrandom": "3.0.5",
     "sharp": "0.34.2",
@@ -69,7 +71,7 @@
   "devDependencies": {
     "@eslint/js": "9.30.1",
     "@faker-js/faker": "9.9.0",
-    "@iconify-json/material-symbols": "1.2.28",
+    "@iconify-json/material-symbols": "1.2.29",
     "@iconify-json/mdi": "1.2.3",
     "@iconify-json/ri": "1.2.5",
     "@stylistic/eslint-plugin": "5.1.0",
@@ -82,12 +84,12 @@
     "@types/react": "19.1.8",
     "@types/seedrandom": "3.0.8",
     "@types/web-push": "3.6.4",
-    "@typescript-eslint/parser": "8.35.1",
+    "@typescript-eslint/parser": "8.36.0",
     "@vite-pwa/assets-generator": "1.0.0",
     "@vite-pwa/astro": "1.1.0",
     "astro-icon": "1.1.5",
     "date-fns": "4.1.0",
-    "esbuild": "0.25.5",
+    "esbuild": "0.25.6",
     "eslint": "9.30.1",
     "eslint-import-resolver-typescript": "4.4.4",
     "eslint-plugin-astro": "1.3.1",
@@ -97,13 +99,13 @@
     "prettier": "3.6.2",
     "prettier-plugin-astro": "0.14.1",
     "prettier-plugin-tailwindcss": "0.6.13",
-    "prisma": "6.10.1",
+    "prisma": "6.11.1",
-    "prisma-json-types-generator": "3.5.0",
+    "prisma-json-types-generator": "3.5.1",
     "tailwind-htmx": "0.1.2",
     "ts-essentials": "10.1.1",
     "ts-toolbelt": "9.6.0",
     "tsx": "4.20.3",
-    "typescript-eslint": "8.35.1",
+    "typescript-eslint": "8.36.0",
     "vite-plugin-devtools-json": "0.2.1",
     "workbox-core": "7.3.0",
     "workbox-precaching": "7.3.0"

web/prisma/migrations/20250723070746_add_registered_country/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Service" ADD COLUMN     "registrationCountryCode" VARCHAR(2);

web/prisma/migrations/20250723073720_add_company_name_field/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Service" ADD COLUMN     "registeredCompanyName" TEXT;

web/prisma/schema.prisma

@@ -345,60 +345,64 @@ model ServiceSuggestionMessage {
 }
 
 model Service {
-  id                     Int                          @id @default(autoincrement())
+  id                      Int                          @id @default(autoincrement())
-  name                   String
+  name                    String
-  slug                   String                       @unique
+  slug                    String                       @unique
-  previousSlugs          String[]                     @default([])
+  previousSlugs           String[]                     @default([])
-  description            String
+  description             String
-  categories             Category[]                   @relation("ServiceToCategory")
+  categories              Category[]                   @relation("ServiceToCategory")
-  kycLevel               Int                          @default(4)
+  kycLevel                Int                          @default(4)
-  kycLevelClarification  KycLevelClarification        @default(NONE)
+  kycLevelClarification   KycLevelClarification        @default(NONE)
   /// Date only, no time.
-  operatingSince         DateTime?                    @db.Date
+  operatingSince          DateTime?                    @db.Date
-  overallScore           Int                          @default(0)
+  overallScore            Int                          @default(0)
-  privacyScore           Int                          @default(0)
+  privacyScore            Int                          @default(0)
-  trustScore             Int                          @default(0)
+  trustScore              Int                          @default(0)
   /// Computed via trigger. Do not update through prisma.
-  averageUserRating      Float?
+  averageUserRating       Float?
-  serviceVisibility      ServiceVisibility            @default(PUBLIC)
+  serviceVisibility       ServiceVisibility            @default(PUBLIC)
-  serviceInfoBanner      ServiceInfoBanner            @default(NONE)
+  serviceInfoBanner       ServiceInfoBanner            @default(NONE)
-  serviceInfoBannerNotes String?
+  serviceInfoBannerNotes  String?
-  verificationStatus     VerificationStatus           @default(COMMUNITY_CONTRIBUTED)
+  verificationStatus      VerificationStatus           @default(COMMUNITY_CONTRIBUTED)
-  verificationSummary    String?
+  verificationSummary     String?
-  verificationRequests   ServiceVerificationRequest[]
+  verificationRequests    ServiceVerificationRequest[]
-  verificationProofMd    String?
+  verificationProofMd     String?
   /// [UserSentiment]
-  userSentiment          Json?
+  userSentiment           Json?
-  userSentimentAt        DateTime?
+  userSentimentAt         DateTime?
-  referral               String?
+  referral                String?
-  acceptedCurrencies     Currency[]                   @default([])
+  acceptedCurrencies      Currency[]                   @default([])
-  serviceUrls            String[]
+  serviceUrls             String[]
-  tosUrls                String[]                     @default([])
+  tosUrls                 String[]                     @default([])
-  onionUrls              String[]                     @default([])
+  onionUrls               String[]                     @default([])
-  i2pUrls                String[]                     @default([])
+  i2pUrls                 String[]                     @default([])
-  imageUrl               String?
+  imageUrl                String?
+  /// ISO 3166-1 alpha-2 country code where the service company is registered
+  registrationCountryCode String?                      @db.VarChar(2)
+  /// Official name of the registered company
+  registeredCompanyName   String?
   /// [TosReview]
-  tosReview              Json?
+  tosReview               Json?
-  tosReviewAt            DateTime?
+  tosReviewAt             DateTime?
-  createdAt              DateTime                     @default(now())
+  createdAt               DateTime                     @default(now())
-  updatedAt              DateTime                     @default(now()) @updatedAt
+  updatedAt               DateTime                     @default(now()) @updatedAt
   /// Computed via trigger when the visibility is PUBLIC or (ARCHIVED and listedAt was null). Do not update through prisma.
-  listedAt               DateTime?
+  listedAt                DateTime?
   /// Computed via trigger when the verification status is APPROVED. Do not update through prisma.
-  approvedAt             DateTime?
+  approvedAt              DateTime?
   /// Computed via trigger when the verification status is VERIFICATION_SUCCESS. Do not update through prisma.
-  verifiedAt             DateTime?
+  verifiedAt              DateTime?
   /// Computed via trigger when the verification status is VERIFICATION_FAILED. Do not update through prisma.
-  spamAt                 DateTime?
+  spamAt                  DateTime?
   /// Computed via trigger. Do not update through prisma.
-  isRecentlyApproved     Boolean                      @default(false)
+  isRecentlyApproved      Boolean                      @default(false)
-  comments               Comment[]
+  comments                Comment[]
-  events                 Event[]
+  events                  Event[]
-  contactMethods         ServiceContactMethod[]       @relation("ServiceToContactMethod")
+  contactMethods          ServiceContactMethod[]       @relation("ServiceToContactMethod")
-  attributes             ServiceAttribute[]
+  attributes              ServiceAttribute[]
-  verificationSteps      VerificationStep[]
+  verificationSteps       VerificationStep[]
-  suggestions            ServiceSuggestion[]
+  suggestions             ServiceSuggestion[]
-  internalNotes          InternalServiceNote[]        @relation("ServiceRecievedNotes")
+  internalNotes           InternalServiceNote[]        @relation("ServiceRecievedNotes")
 
   onEventCreatedForServices       NotificationPreferences[] @relation("onEventCreatedForServices")
   onRootCommentCreatedForServices NotificationPreferences[] @relation("onRootCommentCreatedForServices")

web/prisma/seed.ts

@@ -28,6 +28,7 @@ import { generateUsername } from 'unique-username-generator'
 import { kycLevels } from '../src/constants/kycLevels'
 import { undefinedIfEmpty } from '../src/lib/arrays'
 import { transformCase } from '../src/lib/strings'
+import { countries } from '../src/constants/countries'
 
 // Exit if not in development mode
 if (process.env.NODE_ENV === 'production') {
@@ -697,6 +698,12 @@ const generateFakeService = (users: User[]) => {
       { count: { min: 0, max: 2 } }
     ),
     imageUrl: `https://ui-avatars.com/api/?name=${encodeURIComponent(name)}&background=random&format=svg`,
+    registrationCountryCode: faker.helpers.maybe(() => faker.helpers.arrayElement(countries).code, {
+      probability: 0.7,
+    }),
+    registeredCompanyName: faker.helpers.maybe(() => faker.company.name(), {
+      probability: 0.6,
+    }),
     listedAt:
       serviceVisibility === 'PUBLIC' || serviceVisibility === 'ARCHIVED'
         ? faker.date.recent({ days: 30 })

web/prisma/triggers/02_service_score.sql

@@ -96,6 +96,7 @@ DECLARE
     recently_approved_factor INT := 0;
     tos_penalty_factor INT := 0;
     operating_since_factor INT := 0;
+    legally_registered_factor INT := 0;
 BEGIN
     -- Get verification status factor
     SELECT 
@@ -160,9 +161,17 @@ BEGIN
     INTO operating_since_factor
     FROM "Service"
     WHERE id = service_id;
+    
+    -- Check for legal registration (country code or company name)
+    IF EXISTS (
+        SELECT 1 FROM "Service" 
+        WHERE id = service_id AND ("registrationCountryCode" IS NOT NULL OR "registeredCompanyName" IS NOT NULL)
+    ) THEN
+        legally_registered_factor := 2;
+    END IF;
 
     -- Calculate final trust score (base 100)
-    trust_score := 50 + verification_factor + attributes_score + recently_approved_factor + tos_penalty_factor + operating_since_factor;
+    trust_score := 50 + verification_factor + attributes_score + recently_approved_factor + tos_penalty_factor + operating_since_factor + legally_registered_factor;
 
     -- Ensure the score is in reasonable bounds (0-100)
     trust_score := GREATEST(0, LEAST(100, trust_score));

web/src/actions/admin/service.ts

@@ -4,12 +4,14 @@ import { ActionError } from 'astro:actions'
 import { uniq } from 'lodash-es'
 import slugify from 'slugify'
 
+import { countriesZodEnumById } from '../../constants/countries'
 import { defineProtectedAction } from '../../lib/defineProtectedAction'
 import { saveFileLocally, deleteFileLocally } from '../../lib/fileStorage'
 import { prisma } from '../../lib/prisma'
 import { separateServiceUrlsByType } from '../../lib/urls'
 import {
   imageFileSchema,
+  stringListOfContactMethodsSchema,
   stringListOfUrlsSchemaRequired,
   zodCohercedNumber,
   zodContactMethod,
@@ -44,6 +46,7 @@ const serviceSchemaBase = z.object({
   description: z.string().min(1),
   allServiceUrls: stringListOfUrlsSchemaRequired,
   tosUrls: stringListOfUrlsSchemaRequired,
+  contactMethods: stringListOfContactMethodsSchema,
   kycLevel: z.coerce.number().int().min(0).max(4),
   kycLevelClarification: z.nativeEnum(KycLevelClarification).optional().nullable().default(null),
   attributes: z.array(z.coerce.number().int().positive()),
@@ -51,7 +54,7 @@ const serviceSchemaBase = z.object({
   verificationStatus: z.nativeEnum(VerificationStatus),
   verificationSummary: z.string().optional().nullable().default(null),
   verificationProofMd: z.string().optional().nullable().default(null),
-  acceptedCurrencies: z.array(z.nativeEnum(Currency)),
+  acceptedCurrencies: z.array(z.nativeEnum(Currency)).min(1),
   referral: z
     .string()
     .regex(/^(\?\w+=.|\/.+)/, 'Referral must be a valid URL parameter or path, not a full URL')
@@ -59,8 +62,15 @@ const serviceSchemaBase = z.object({
     .nullable()
     .default(null),
   operatingSince: z.coerce.date().optional().nullable(),
+  registrationCountryCode: z
+    .union([countriesZodEnumById, z.literal('')])
+    .optional()
+    .nullable()
+    .refine((val) => val === null || val === undefined || val === '' || val.length === 2, {
+      message: 'Country code must be a valid 2-character code or empty',
+    }),
+  registeredCompanyName: z.string().trim().max(100).optional().nullable(),
   imageFile: imageFileSchema,
-  overallScore: zodCohercedNumber(z.number().int().min(0).max(10)).optional(),
   serviceVisibility: z.nativeEnum(ServiceVisibility),
   internalNote: z.string().optional(),
   strictCommentingEnabled: z.boolean().optional().default(false),
@@ -135,7 +145,6 @@ export const adminServiceActions = {
           referral: input.referral || null,
           serviceVisibility: input.serviceVisibility,
           slug: input.slug,
-          overallScore: input.overallScore,
           categories: {
             connect: input.categories.map((id) => ({ id })),
           },
@@ -146,6 +155,11 @@ export const adminServiceActions = {
               },
             })),
           },
+          contactMethods: {
+            create: input.contactMethods.map((value) => ({
+              value,
+            })),
+          },
           imageUrl,
           internalNotes: input.internalNote
             ? {
@@ -156,6 +170,8 @@ export const adminServiceActions = {
               }
             : undefined,
           operatingSince: input.operatingSince,
+          registrationCountryCode: input.registrationCountryCode ?? null,
+          registeredCompanyName: input.registeredCompanyName,
         },
         select: {
           id: true,
@@ -257,7 +273,6 @@ export const adminServiceActions = {
           referral: input.referral || null,
           serviceVisibility: input.serviceVisibility,
           slug: input.slug,
-          overallScore: input.overallScore,
           previousSlugs:
             existingService.slug !== input.slug
               ? {
@@ -283,6 +298,8 @@ export const adminServiceActions = {
             })),
           },
           operatingSince: input.operatingSince,
+          registrationCountryCode: input.registrationCountryCode ?? null,
+          registeredCompanyName: input.registeredCompanyName,
         },
       })
 
@@ -343,7 +360,6 @@ export const adminServiceActions = {
         await prisma.serviceContactMethod.delete({
           where: { id: input.id },
         })
-        return { success: true }
       },
     }),
   },
@@ -469,7 +485,6 @@ export const adminServiceActions = {
       input: evidenceImageDeleteSchema,
       handler: async (input) => {
         await deleteFileLocally(input.fileUrl)
-        return { success: true }
       },
     }),
   },

web/src/actions/serviceSuggestion.ts

@@ -3,6 +3,7 @@ import { z } from 'astro/zod'
 import { ActionError } from 'astro:actions'
 import { formatDistanceStrict } from 'date-fns'
 
+import { countriesZodEnumById } from '../constants/countries'
 import { captchaFormSchemaProperties, captchaFormSchemaSuperRefine } from '../lib/captchaValidation'
 import { defineProtectedAction } from '../lib/defineProtectedAction'
 import { saveFileLocally } from '../lib/fileStorage'
@@ -184,6 +185,14 @@ export const serviceSuggestionActions = {
           }),
         }),
         operatingSince: z.coerce.date().optional(),
+        registrationCountryCode: z
+          .union([countriesZodEnumById, z.literal('')])
+          .optional()
+          .nullable()
+          .refine((val) => val === null || val === undefined || val === '' || val.length === 2, {
+            message: 'Country code must be a valid 2-character code or empty',
+          }),
+        registeredCompanyName: z.string().trim().max(100).optional(),
         /** @deprecated Honey pot field, do not use */
         message: z.unknown().optional(),
         skipDuplicateCheck: z
@@ -282,6 +291,8 @@ export const serviceSuggestionActions = {
             slug: input.slug,
             description: input.description,
             operatingSince: input.operatingSince,
+            registrationCountryCode: input.registrationCountryCode ?? null,
+            registeredCompanyName: input.registeredCompanyName,
             serviceUrls,
             tosUrls: input.tosUrls,
             onionUrls,

web/src/components/AnnouncementBanner.astro

@@ -43,6 +43,7 @@ const Tag = announcement.link ? 'a' : 'div'
     'group xs:px-6 2xs:px-4 relative isolate z-50 flex items-center justify-center gap-x-2 overflow-hidden border-b border-zinc-800 bg-black px-2 py-2 focus-visible:outline-none sm:gap-x-6 sm:px-3.5',
     className
   )}
+  aria-label="Announcement banner"
   {...props}
 >
   <div

web/src/components/Header.astro

@@ -37,6 +37,7 @@ const splashText = showSplashText ? sample(splashTexts) : null
     }
   )}
   transition:name="header-container"
+  aria-label="Header"
 >
   <nav class={cn('container mx-auto flex h-full w-full items-stretch justify-between px-4', classNames?.nav)}>
     <div class="@container -ml-4 flex max-w-[192px] grow-99999 items-center">

web/src/components/OgImage.tsx

@@ -9,6 +9,7 @@ import defaultOGImage from '../assets/ogimage.png'
 import { makeOverallScoreInfo } from '../lib/overallScore'
 import { urlWithParams } from '../lib/urls'
 
+import type { VerificationStatus } from '@prisma/client'
 import type { APIContext } from 'astro'
 import type { Prettify } from 'ts-essentials'
 
@@ -107,6 +108,7 @@ export const ogImageTemplates = {
       categories,
       score,
       imageUrl,
+      verificationStatus,
     }: {
       title: string
       description: string
@@ -116,6 +118,7 @@ export const ogImageTemplates = {
       }[]
       score: number
       imageUrl: string | null
+      verificationStatus: VerificationStatus | null
     },
     context
   ) => {
@@ -272,6 +275,37 @@ export const ogImageTemplates = {
           >
             <path d="M1 0a1 1 0 0 0-1 1v26a1 1 0 0 0 1 1h74a1 1 0 0 0 1-1V1a1 1 0 0 0-1-1Zm4 4h2a1 1 0 0 1 1 1v6a1 1 0 0 0 1 1h6a1 1 0 0 1 1 1v3h3a1 1 0 0 1 1 1v3h3a1 1 0 0 1 1 1v2a1 1 0 0 1-1 1h-2a1 1 0 0 1-1-1v-3h-3a1 1 0 0 1-1-1v-3H9a1 1 0 0 0-1 1v6a1 1 0 0 1-1 1H5a1 1 0 0 1-1-1V5a1 1 0 0 1 1-1Zm12 0h3a1 1 0 0 1 1 1v3a1 1 0 0 1-1 1h-3a1 1 0 0 1-1-1V5a1 1 0 0 1 1-1zm12.82 0h2.37a1 1 0 0 1 .85.46L38 12.27l4.97-7.8A1 1 0 0 1 43.8 4h2.37a1 1 0 0 1 .85 1.54l-6.87 10.8a1 1 0 0 0-.16.53V23a1 1 0 0 1-1 1h-2a1 1 0 0 1-1-1v-6.13a1 1 0 0 0-.15-.53l-6.87-10.8A1 1 0 0 1 29.82 4ZM57 4h14a1 1 0 0 1 1 1v2a1 1 0 0 1-1 1H56v12h15a1 1 0 0 1 1 1v2a1 1 0 0 1-1 1H57a1 1 0 0 1-1-1v-3h-3a1 1 0 0 1-1-1V9a1 1 0 0 1 1-1h3V5a1 1 0 0 1 1-1zm24 0a1 1 0 0 0-1 1v18a1 1 0 0 0 1 1h2a1 1 0 0 0 1-1V7.6l9.18 15.9c.18.3.5.5.86.5H99a1 1 0 0 0 1-1V5a1 1 0 0 0-1-1h-2a1 1 0 0 0-1 1v15.4L86.83 4.5a1 1 0 0 0-.87-.5Zm29 0a1 1 0 0 0-1 1v3h12V5a1 1 0 0 0-1-1zm11 4v12h3a1 1 0 0 0 1-1V9a1 1 0 0 0-1-1zm0 12h-12v3a1 1 0 0 0 1 1h10a1 1 0 0 0 1-1zm-12 0V8h-3a1 1 0 0 0-1 1v10a1 1 0 0 0 1 1zm21-16a1 1 0 0 0-1 1v6a1 1 0 0 0 1 1h2a1 1 0 0 0 1-1V8h4v15a1 1 0 0 0 1 1h2a1 1 0 0 0 1-1V8h4v3a1 1 0 0 0 1 1h2a1 1 0 0 0 1-1V5a1 1 0 0 0-1-1zm27 0a1 1 0 0 0-1 1v18a1 1 0 0 0 1 1h2a1 1 0 0 0 1-1V11.4l5.53 12.02a1 1 0 0 0 .91.58h3.12a1 1 0 0 0 .91-.58L176 11.4V23a1 1 0 0 0 1 1h2a1 1 0 0 0 1-1V5a1 1 0 0 0-1-1h-3.36a1 1 0 0 0-.9.58L168 19.21l-6.73-14.63a1 1 0 0 0-.9-.58Zm32 0a1 1 0 0 0-1 1v3h15a1 1 0 0 0 1-1V5a1 1 0 0 0-1-1zm-1 4h-3a1 1 0 0 0-1 1v14a1 1 0 0 0 1 1h18a1 1 0 0 0 1-1v-2a1 1 0 0 0-1-1h-14a1 1 0 0 1-1-1v-3h7a1 1 0 0 0 1-1v-2a1 1 0 0 0-1-1h-7zm-38 12a1 1 0 0 0-1 1v2a1 1 0 0 0 1 1h2a1 1 0 0 0 1-1v-2a1 1 0 0 0-1-1z" />
           </svg>
+          {verificationStatus === 'VERIFICATION_FAILED' && (
+            <div
+              style={{
+                position: 'absolute',
+                top: 0,
+                left: 0,
+                right: 0,
+                bottom: 0,
+                display: 'flex',
+                alignItems: 'center',
+                justifyContent: 'center',
+              }}
+            >
+              <div
+                style={{
+                  transform: 'rotate(-20deg)',
+                  fontSize: 200,
+                  fontWeight: 'bold',
+                  color: 'red',
+                  backgroundColor: 'rgba(0, 0, 0, 0.5)',
+                  boxShadow: '0 0 15px 30px rgba(0, 0, 0, 0.5)',
+                  border: '15px solid red',
+                  borderRadius: 15,
+                  padding: '10px 50px',
+                  textAlign: 'center',
+                }}
+              >
+                SCAM
+              </div>
+            </div>
+          )}
         </div>
       ),
       defaultOptions

web/src/components/ServiceCard.astro

@@ -13,7 +13,7 @@ import Tooltip from './Tooltip.astro'
 import type { Prisma } from '@prisma/client'
 import type { HTMLAttributes } from 'astro/types'
 
-type Props = HTMLAttributes<'a'> & {
+type Props = HTMLAttributes<'article'> & {
   inlineIcons?: boolean
   withoutLink?: boolean
   service: Prisma.ServiceGetPayload<{
@@ -57,7 +57,7 @@ const {
   },
   class: className,
   withoutLink = false,
-  ...aProps
+  ...htmlProps
 } = Astro.props
 
 const statusIcon = {
@@ -70,127 +70,129 @@ const Element = withoutLink ? 'div' : 'a'
 const overallScoreInfo = makeOverallScoreInfo(overallScore)
 ---
 
-<Element
+<article {...htmlProps}>
-  href={Element === 'a' ? `/service/${slug}` : undefined}
+  <Element
-  {...aProps}
+    href={Element === 'a' ? `/service/${slug}` : undefined}
-  class={cn(
+    aria-label={Element === 'a' ? name : undefined}
-    'border-night-600 group/card bg-night-800 flex flex-col gap-(--gap) rounded-xl border p-(--gap) [--gap:calc(var(--spacing)*3)]',
+    class={cn(
-    (serviceVisibility === 'ARCHIVED' || verificationStatus === 'VERIFICATION_FAILED') &&
+      'border-night-600 group/card bg-night-800 flex flex-col gap-(--gap) rounded-xl border p-(--gap) [--gap:calc(var(--spacing)*3)]',
-      'opacity-75 transition-opacity hover:opacity-100 focus-visible:opacity-100',
+      (serviceVisibility === 'ARCHIVED' || verificationStatus === 'VERIFICATION_FAILED') &&
-    className
+        'opacity-75 transition-opacity hover:opacity-100 focus-visible:opacity-100',
-  )}
+      className
->
+    )}
-  <!-- Header with Icon and Title -->
+  >
-  <div class="flex items-center gap-(--gap)">
+    <!-- Header with Icon and Title -->
-    <MyPicture
+    <div class="flex items-center gap-(--gap)">
-      src={imageUrl}
+      <MyPicture
-      fallback="service"
+        src={imageUrl}
-      alt={name || 'Service logo'}
+        fallback="service"
-      class={cn(
+        alt="Logo"
-        'size-12 shrink-0 rounded-sm object-contain text-white',
+        class={cn(
-        (serviceVisibility === 'ARCHIVED' || verificationStatus === 'VERIFICATION_FAILED') &&
+          'size-12 shrink-0 rounded-sm object-contain text-white',
-          'grayscale-67 transition-all group-hover/card:grayscale-0 group-focus-visible/card:grayscale-0'
+          (serviceVisibility === 'ARCHIVED' || verificationStatus === 'VERIFICATION_FAILED') &&
-      )}
+            'grayscale-67 transition-all group-hover/card:grayscale-0 group-focus-visible/card:grayscale-0'
-      width={48}
+        )}
-      height={48}
+        width={48}
-    />
+        height={48}
+      />
 
-    <div class="flex min-w-0 flex-1 flex-col justify-center self-stretch">
+      <div class="flex min-w-0 flex-1 flex-col justify-center self-stretch">
-      <h3 class="font-title text-lg leading-none font-medium tracking-wide text-white">
+        <h1 class="font-title text-lg leading-none font-medium tracking-wide text-white">
-        {name}{
+          {name}{
-          statusIcon && (
+            statusIcon && (
-            <Tooltip
+              <Tooltip
-              text={statusIcon.label}
+                text={statusIcon.label}
-              position="right"
+                position="right"
-              class="-my-2 shrink-0 whitespace-nowrap"
+                class="-my-2 shrink-0 whitespace-nowrap"
-              enabled={verificationStatus !== 'VERIFICATION_FAILED'}
+                enabled={verificationStatus !== 'VERIFICATION_FAILED'}
-            >
+              >
-              {[
+                {[
+                  <Icon
+                    is:inline={inlineIcons}
+                    name={statusIcon.icon}
+                    class={cn(
+                      'inline-block size-6 shrink-0 rounded-lg p-1 align-[-0.37em]',
+                      verificationStatus === 'VERIFICATION_FAILED' && 'pr-0',
+                      statusIcon.classNames.icon
+                    )}
+                  />,
+                  verificationStatus === 'VERIFICATION_FAILED' && (
+                    <span class="text-sm font-bold text-red-500">SCAM</span>
+                  ),
+                ]}
+              </Tooltip>
+            )
+          }{
+            serviceVisibility === 'ARCHIVED' && (
+              <Tooltip
+                text={serviceVisibilitiesById.ARCHIVED.label}
+                position="right"
+                class="-my-2 shrink-0 whitespace-nowrap"
+              >
                 <Icon
                   is:inline={inlineIcons}
-                  name={statusIcon.icon}
+                  name={serviceVisibilitiesById.ARCHIVED.icon}
                   class={cn(
                     'inline-block size-6 shrink-0 rounded-lg p-1 align-[-0.37em]',
-                    verificationStatus === 'VERIFICATION_FAILED' && 'pr-0',
+                    serviceVisibilitiesById.ARCHIVED.iconClass
-                    statusIcon.classNames.icon
                   )}
-                />,
+                />
-                verificationStatus === 'VERIFICATION_FAILED' && (
+              </Tooltip>
-                  <span class="text-sm font-bold text-red-500">SCAM</span>
+            )
-                ),
+          }
-              ]}
+        </h1>
-            </Tooltip>
+        <div class="max-h-2 flex-1" aria-hidden="true"></div>
-          )
+        <div class="flex items-center gap-4 overflow-hidden mask-r-from-[calc(100%-var(--spacing)*4)]">
-        }{
+          {
-          serviceVisibility === 'ARCHIVED' && (
+            categories.map((category) => (
-            <Tooltip
+              <span class="text-day-300 inline-flex shrink-0 items-center gap-1 text-sm leading-none">
-              text={serviceVisibilitiesById.ARCHIVED.label}
+                <Icon name={category.icon} class="size-4" is:inline={inlineIcons} />
-              position="right"
+                <span>{category.name}</span>
-              class="-my-2 shrink-0 whitespace-nowrap"
+              </span>
-            >
+            ))
-              <Icon
+          }
-                is:inline={inlineIcons}
+        </div>
-                name={serviceVisibilitiesById.ARCHIVED.icon}
+      </div>
-                class={cn(
+    </div>
-                  'inline-block size-6 shrink-0 rounded-lg p-1 align-[-0.37em]',
+
-                  serviceVisibilitiesById.ARCHIVED.iconClass
+    <div class="flex-1">
-                )}
+      <p class="text-day-400 line-clamp-3 text-sm leading-tight">
-              />
+        {description}
-            </Tooltip>
+      </p>
-          )
+    </div>
-        }
+
-      </h3>
+    <div class="flex items-center justify-start">
-      <div class="max-h-2 flex-1"></div>
+      <Tooltip
-      <div class="flex items-center gap-4 overflow-hidden mask-r-from-[calc(100%-var(--spacing)*4)]">
+        class={cn(
+          'inline-flex size-6 items-center justify-center rounded-sm text-lg font-bold',
+          overallScoreInfo.classNameBg
+        )}
+        text={`${Math.round(privacyScore).toLocaleString()}% Privacy | ${Math.round(trustScore).toLocaleString()}% Trust`}
+      >
+        {overallScoreInfo.formattedScore}
+      </Tooltip>
+
+      <span class="text-day-300 ml-3 text-sm font-bold whitespace-nowrap">
+        KYC &nbsp;{kycLevel.toLocaleString()}
+      </span>
+
+      <div class="-m-1 ml-auto flex">
         {
-          categories.map((category) => (
+          currencies.map((currency) => {
-            <span class="text-day-300 inline-flex shrink-0 items-center gap-1 text-sm leading-none">
+            const isAccepted = acceptedCurrencies.includes(currency.id)
-              <Icon name={category.icon} class="size-4" is:inline={inlineIcons} />
+
-              <span>{category.name}</span>
+            return (
-            </span>
+              <Tooltip text={currency.name}>
-          ))
+                <Icon
+                  is:inline={inlineIcons}
+                  name={currency.icon}
+                  class={cn('text-day-600 box-content size-4 p-1', { 'text-white': isAccepted })}
+                />
+              </Tooltip>
+            )
+          })
         }
       </div>
     </div>
-  </div>
+  </Element>
-
+</article>
-  <div class="flex-1">
-    <p class="text-day-400 line-clamp-3 text-sm leading-tight">
-      {description}
-    </p>
-  </div>
-
-  <div class="flex items-center justify-start">
-    <Tooltip
-      class={cn(
-        'inline-flex size-6 items-center justify-center rounded-sm text-lg font-bold',
-        overallScoreInfo.classNameBg
-      )}
-      text={`${Math.round(privacyScore).toLocaleString()}% Privacy | ${Math.round(trustScore).toLocaleString()}% Trust`}
-    >
-      {overallScoreInfo.formattedScore}
-    </Tooltip>
-
-    <span class="text-day-300 ml-3 text-sm font-bold whitespace-nowrap">
-      KYC &nbsp;{kycLevel.toLocaleString()}
-    </span>
-
-    <div class="-m-1 ml-auto flex">
-      {
-        currencies.map((currency) => {
-          const isAccepted = acceptedCurrencies.includes(currency.id)
-
-          return (
-            <Tooltip text={currency.name}>
-              <Icon
-                is:inline={inlineIcons}
-                name={currency.icon}
-                class={cn('text-day-600 box-content size-4 p-1', { 'text-white': isAccepted })}
-              />
-            </Tooltip>
-          )
-        })
-      }
-    </div>
-  </div>
-</Element>

web/src/components/ServiceFiltersPill.astro

@@ -39,6 +39,7 @@ const makeUrlWithoutFilter = (filter: string, value?: string) => {
     'bg-night-800 hover:bg-night-900 border-night-400 flex h-8 shrink-0 items-center gap-2 rounded-full border px-3 text-sm text-white',
     className
   )}
+  aria-label={`Remove filter: ${text}`}
 >
   {icon && <Icon name={icon} class={cn('size-4', iconClass)} is:inline={inlineIcons} />}
   {text}

web/src/components/ServiceFiltersPillsRow.astro

@@ -32,6 +32,7 @@ type Props = HTMLAttributes<'div'> & {
     }
   }>[]
   attributeOptions: AttributeOption[]
+  inlineIcons?: boolean
 }
 
 const {
@@ -41,6 +42,7 @@ const {
   categories,
   attributes,
   attributeOptions,
+  inlineIcons = true,
   ...divProps
 } = Astro.props
 ---
@@ -50,11 +52,17 @@ const {
     'not-pointer-coarse:no-scrollbar -ml-4 flex shrink grow items-center gap-2 overflow-x-auto mask-r-from-[calc(100%-var(--spacing)*16)] pr-12 pl-4',
     className
   )}
+  aria-label="Applied filters"
   {...divProps}
 >
   {
     filters.q && (
-      <ServiceFiltersPill text={`"${filters.q}"`} searchParamName="q" searchParamValue={filters.q} />
+      <ServiceFiltersPill
+        text={`"${filters.q}"`}
+        searchParamName="q"
+        searchParamValue={filters.q}
+        inlineIcons={inlineIcons}
+      />
     )
   }
 
@@ -69,6 +77,7 @@ const {
           icon={category.icon}
           searchParamName="categories"
           searchParamValue={categorySlug}
+          inlineIcons={inlineIcons}
         />
       )
     })
@@ -83,6 +92,7 @@ const {
           searchParamName="currencies"
           searchParamValue={currency.slug}
           icon={currency.icon}
+          inlineIcons={inlineIcons}
         />
       )
     })
@@ -97,6 +107,7 @@ const {
           icon={networkOption.icon}
           searchParamName="networks"
           searchParamValue={network}
+          inlineIcons={inlineIcons}
         />
       )
     })
@@ -107,6 +118,7 @@ const {
         text={`KYC Lvl ≤ ${filters['max-kyc'].toLocaleString()}`}
         icon="ri:shield-keyhole-line"
         searchParamName="max-kyc"
+        inlineIcons={inlineIcons}
       />
     )
   }
@@ -116,6 +128,7 @@ const {
         text={`Rating ≥ ${filters['user-rating'].toLocaleString()}★`}
         icon="ri:star-fill"
         searchParamName="user-rating"
+        inlineIcons={inlineIcons}
       />
     )
   }
@@ -125,6 +138,7 @@ const {
         text={`Score ≥ ${filters['min-score'].toLocaleString()}`}
         icon="ri:medal-line"
         searchParamName="min-score"
+        inlineIcons={inlineIcons}
       />
     )
   }
@@ -135,6 +149,7 @@ const {
         icon="ri:filter-3-line"
         searchParamName="attribute-mode"
         searchParamValue="and"
+        inlineIcons={inlineIcons}
       />
     )
   }
@@ -152,6 +167,7 @@ const {
               text={`${prefix}: ${attribute.title}`}
               searchParamName={`attr-${attributeId}`}
               searchParamValue={attributeValue}
+              inlineIcons={inlineIcons}
             />
           )
         })
@@ -176,6 +192,7 @@ const {
             iconClass={verificationStatusInfo.classNames.icon}
             searchParamName="verification"
             searchParamValue={verificationStatusInfo.slug}
+            inlineIcons={inlineIcons}
           />
         )
       })

web/src/components/ServiceLinkButton.astro

@@ -7,13 +7,21 @@ import { cn } from '../lib/cn'
 
 import type { HTMLAttributes } from 'astro/types'
 
-type Props = Omit<HTMLAttributes<'a'>, 'href' | 'rel' | 'target'> & {
+type Props = Omit<HTMLAttributes<'a' | 'span'>, 'href' | 'rel' | 'target'> & {
   url: string
   referral: string | null
   enableMinWidth?: boolean
+  isScam?: boolean
 }
 
-const { url: baseUrl, referral, class: className, enableMinWidth = false, ...htmlProps } = Astro.props
+const {
+  url: baseUrl,
+  referral,
+  class: className,
+  enableMinWidth = false,
+  isScam = false,
+  ...htmlProps
+} = Astro.props
 
 function makeLink(url: string, referral: string | null) {
   const hostname = new URL(url).hostname
@@ -124,28 +132,39 @@ const link = makeLink(baseUrl, referral)
 if (!z.string().url().safeParse(link.url).success) {
   console.error(`Invalid service URL with referral: ${link.url}`)
 }
+
+const Tag = isScam ? 'span' : 'a'
 ---
 
-<a
+<Tag
-  href={link.url}
+  href={isScam ? undefined : link.url}
-  target="_blank"
+  target={isScam ? undefined : '_blank'}
-  rel="noopener noreferrer"
+  rel={isScam ? undefined : 'noopener noreferrer'}
   class={cn(
     '2xs:text-sm 2xs:h-8 2xs:gap-2 focus-visible:ring-offset-night-700 inline-flex h-6 items-center gap-1 rounded-full bg-white text-xs whitespace-nowrap text-black focus-visible:ring-4 focus-visible:ring-orange-500 focus-visible:ring-offset-2 focus-visible:outline-none',
+    isScam && 'bg-day-800 cursor-not-allowed text-red-300',
     className
   )}
+  title={link.url}
   {...htmlProps}
 >
-  <Icon name={link.icon} class="2xs:ml-2 2xs:size-5 2xs:-mr-0.5 -mr-0.25 ml-1 size-4" />
+  <Icon
+    name={isScam ? 'ri:alert-line' : link.icon}
+    class={cn('2xs:ml-2 2xs:size-5 2xs:-mr-0.5 -mr-0.25 ml-1 size-4', isScam && 'text-red-400')}
+  />
   <span class={cn('font-title font-bold', { 'min-w-[29ch]': enableMinWidth })}>
     {
       link.textBits.map((textBit) => (
-        <span class={cn(textBit.style === 'irrelevant' && 'text-zinc-500')}>{textBit.text}</span>
+        <span class={cn(textBit.style === 'irrelevant' && 'opacity-60')}>{textBit.text}</span>
       ))
     }
   </span>
-  <Icon
+  {
-    name="ri:arrow-right-line"
+    !isScam && (
-    class="2xs:size-6 mr-1 size-4 rounded-full bg-orange-500 p-0.5 text-white"
+      <Icon
-  />
+        name="ri:arrow-right-line"
-</a>
+        class="2xs:size-6 mr-1 size-4 rounded-full bg-orange-500 p-0.5 text-white"
+      />
+    )
+  }
+</Tag>

web/src/components/ServicesSearchResults.astro

@@ -190,6 +190,7 @@ const searchTitle = (() => {
       categories={categories}
       attributes={attributes}
       attributeOptions={attributeOptions}
+      inlineIcons={inlineIcons}
     />
   </div>
   <div class="flex items-center justify-between">
@@ -201,6 +202,7 @@ const searchTitle = (() => {
         name="ri:loader-4-line"
         id="search-indicator"
         class="htmx-request:opacity-100 xs:-mx-1.5 -mx-1 inline-block size-4 animate-spin text-white opacity-0 transition-opacity duration-500 sm:-mx-3"
+        aria-hidden="true"
         is:inline={inlineIcons}
       />
 
@@ -346,11 +348,9 @@ const searchTitle = (() => {
       </div>
     ) : (
       <>
-        <div class="mt-6 grid grid-cols-1 gap-4 sm:gap-6 md:grid-cols-[repeat(auto-fill,minmax(calc(var(--spacing)*80),1fr))]">
+        <ol class="mt-6 grid grid-cols-1 gap-4 sm:gap-6 md:grid-cols-[repeat(auto-fill,minmax(calc(var(--spacing)*80),1fr))]">
           {services.map((service, i) => (
-            <ServiceCard
+            <li
-              inlineIcons={inlineIcons}
-              service={service}
               data-hx-search-results-card
               {...(i === services.length - 1 && currentPage < totalPages
                 ? {
@@ -361,9 +361,11 @@ const searchTitle = (() => {
                     'hx-indicator': '#infinite-scroll-indicator',
                   }
                 : {})}
-            />
+            >
+              <ServiceCard inlineIcons={inlineIcons} service={service} />
+            </li>
           ))}
-        </div>
+        </ol>
 
         <div class="no-js:hidden mt-8 flex justify-center" id="infinite-scroll-indicator">
           <div class="htmx-request:opacity-100 flex items-center gap-2 opacity-0 transition-opacity duration-500">

web/src/components/Tooltip.astro

@@ -33,6 +33,7 @@ const {
     enabled && (
       <span
         tabindex="-1"
+        aria-hidden="true"
         class={cn(
           'pointer-events-none hidden select-none group-hover/tooltip:flex',
           'ease-out-cubic scale-75 opacity-0 transition-all transition-discrete duration-100 group-hover/tooltip:scale-100 group-hover/tooltip:opacity-100 starting:group-hover/tooltip:scale-75 starting:group-hover/tooltip:opacity-0',

web/src/constants/countries.ts

@@ -0,0 +1,76 @@
+import { countries as countriesData, type TCountryCode } from 'countries-list'
+import { countries as flagCountries } from 'country-flag-icons'
+import getUnicodeFlagIcon from 'country-flag-icons/unicode'
+
+import { makeHelpersForOptions } from '../lib/makeHelpersForOptions'
+
+type CountryInfo<T extends string | null | undefined = string> = {
+  code: T
+  name: string
+  flag: string
+  slug: string
+  order: number
+}
+
+// Convert countries-list data to our format, ensuring we only use countries that have flags
+const countriesArray = Object.entries(countriesData)
+  .filter(([code]) => flagCountries.includes(code as TCountryCode))
+  .map(([code, data]) => ({
+    code: code as TCountryCode,
+    name: data.name,
+    flag: getUnicodeFlagIcon(code) || '🏳️',
+    slug: code.toLowerCase(),
+    order: data.name.charCodeAt(0), // Sort alphabetically by first letter
+  }))
+  // Pre-sort the array alphabetically by name for performance
+  .sort((a, b) => a.name.localeCompare(b.name))
+
+// Create a map for efficient lookups
+const countriesMap = new Map(countriesArray.map((country) => [country.code, country]))
+
+export const {
+  dataArray: countries,
+  dataObject: countriesById,
+  getFn: getCountryInfo,
+  getFnSlug: getCountryInfoBySlug,
+  zodEnumBySlug: countriesZodEnumBySlug,
+  zodEnumById: countriesZodEnumById,
+  keyToSlug: countryCodeToSlug,
+  slugToKey: countrySlugToCode,
+} = makeHelpersForOptions(
+  'code',
+  (code): CountryInfo<typeof code> => {
+    // For null, undefined, or empty string, return a default "No Country" object
+    if (!code) {
+      return {
+        code,
+        name: 'No Country',
+        flag: '🏳️',
+        slug: '',
+        order: 999,
+      } as CountryInfo<typeof code>
+    }
+
+    // Try to find the country in our pre-built map
+    const country = countriesMap.get(code as TCountryCode)
+
+    // If found, return it; otherwise, return a default "Unknown Country" object
+    if (country) {
+      return country as CountryInfo
+    } else {
+      return {
+        code,
+        name: 'Unknown Country',
+        flag: '🏳️',
+        slug: code.toLowerCase(),
+        order: 999,
+      } as CountryInfo
+    }
+  },
+  countriesArray
+)
+
+// Helper function to validate country code
+export const isValidCountryCode = (code: string): code is TCountryCode => {
+  return code in countriesData && flagCountries.includes(code as TCountryCode)
+}

web/src/layouts/MarkdownLayout.astro

@@ -58,9 +58,13 @@ const ogImageTemplateData = {
     class="prose prose-invert prose-headings:text-green-400 prose-h1:text-[2.5rem] prose-h1:font-bold prose-h1:my-8 prose-h1:drop-shadow-[0_0_10px_rgba(0,255,0,0.3)] prose-h2:text-green-500 prose-h2:text-[1.8rem] prose-h2:font-semibold prose-h2:my-6 prose-h2:border-b prose-h2:border-green-900 prose-h2:pb-1 prose-h3:text-green-600 prose-h3:text-[1.4rem] prose-h3:font-semibold prose-h3:my-4 prose-h4:text-green-700 prose-h4:text-[1.2rem] prose-h4:font-semibold prose-h4:my-3 prose-strong:font-semibold prose-strong:drop-shadow-[0_0_5px_rgba(0,255,0,0.2)] prose-p:text-gray-300 prose-p:my-4 prose-p:leading-relaxed prose-a:text-green-400 prose-a:no-underline prose-a:transition-all prose-a:border-b prose-a:border-green-900 prose-a:hover:text-green-400 prose-a:hover:drop-shadow-[0_0_8px_rgba(0,255,0,0.4)] prose-a:hover:border-green-400 prose-ul:text-gray-300 prose-ol:text-gray-300 prose-li:my-2 prose-li:leading-relaxed mx-auto"
   >
     <h1 class="mb-0!">{frontmatter.title}</h1>
-    <p class="mt-2! opacity-70">
+    {
-      Updated {frontmatter.updatedAt && <TimeFormatted date={new Date(frontmatter.updatedAt)} />}
+      !!frontmatter.updatedAt && (
-    </p>
+        <p class="mt-2! opacity-70">
+          Updated <TimeFormatted date={new Date(frontmatter.updatedAt)} />
+        </p>
+      )
+    }
 
     <slot />
   </div>

web/src/lib/attributes.ts

@@ -1,8 +1,10 @@
 import { differenceInMonths, differenceInYears } from 'date-fns'
+import he from 'he'
 import { orderBy } from 'lodash-es'
 
 import { getAttributeCategoryInfo } from '../constants/attributeCategories'
 import { getAttributeTypeInfo } from '../constants/attributeTypes'
+import { getCountryInfo } from '../constants/countries'
 import { kycLevelClarifications } from '../constants/kycLevelClarifications'
 import { kycLevels } from '../constants/kycLevels'
 import { serviceVisibilitiesById } from '../constants/serviceVisibility'
@@ -47,6 +49,8 @@ type NonDbAttributeFull = NonDbAttribute & {
         kycLevel: true
         kycLevelClarification: true
         operatingSince: true
+        registrationCountryCode: true
+        registeredCompanyName: true
       }
     }>
   ) => Partial<Pick<NonDbAttribute, 'description' | 'title'>> & {
@@ -306,6 +310,42 @@ export const nonDbAttributes: NonDbAttributeFull[] = [
       }
     },
   },
+  {
+    slug: 'legally-registered',
+    title: 'Legally registered',
+    type: 'INFO',
+    category: 'TRUST',
+    description: 'This service is legally registered as a company.',
+    privacyPoints: 0,
+    trustPoints: 2,
+    links: [],
+    customize: (service) => {
+      const countryCode = service.registrationCountryCode
+      const companyName = service.registeredCompanyName
+
+      if (!countryCode && !companyName) {
+        return { show: false }
+      }
+
+      const countryInfo = countryCode ? getCountryInfo(countryCode) : null
+      const flagTitle = countryInfo ? `${countryInfo.flag} Legally registered` : 'Legally registered'
+
+      let description = 'Legally registered.'
+      if (companyName && countryCode && countryInfo) {
+        description = `Legally registered as **${he.escape(companyName)}** in **${countryInfo.name}**.`
+      } else if (companyName) {
+        description = `Legally registered as **${he.escape(companyName)}**.`
+      } else if (countryCode && countryInfo) {
+        description = `Legally registered in **${countryInfo.name}**.`
+      }
+
+      return {
+        show: true,
+        title: flagTitle,
+        description,
+      }
+    },
+  },
 ]
 
 export function sortAttributes<

web/src/pages/admin/services/[slug]/edit.astro

@@ -25,6 +25,7 @@ import UserBadge from '../../../../components/UserBadge.astro'
 import { getAttributeCategoryInfo } from '../../../../constants/attributeCategories'
 import { getAttributeTypeInfo } from '../../../../constants/attributeTypes'
 import { contactMethodUrlTypes, formatContactMethod } from '../../../../constants/contactMethods'
+import { countries } from '../../../../constants/countries'
 import { currencies } from '../../../../constants/currencies'
 import { eventTypes, getEventTypeInfo } from '../../../../constants/eventTypes'
 import { kycLevelClarifications } from '../../../../constants/kycLevelClarifications'
@@ -386,6 +387,36 @@ const apiCalls = await Astro.locals.banners.try(
           />
         </div>
 
+        <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+          <InputText
+            label="Registered Company Name"
+            name="registeredCompanyName"
+            description="Official name of the registered company"
+            inputProps={{
+              value: service.registeredCompanyName,
+              placeholder: 'e.g. Example Corp Ltd.',
+            }}
+            error={serviceInputErrors.registeredCompanyName}
+          />
+
+          <InputSelect
+            name="registrationCountryCode"
+            label="Company Registration Country"
+            description="Country where the service company is legally registered"
+            options={[
+              { label: 'Not registered', value: '' },
+              ...countries
+                .sort((a, b) => a.name.localeCompare(b.name))
+                .map((country) => ({
+                  label: `${country.flag} ${country.name}`,
+                  value: country.code,
+                }))
+            ]}
+            selectedValue={service.registrationCountryCode || ''}
+            error={serviceInputErrors.registrationCountryCode}
+          />
+        </div>
+
         <div class="flex items-center justify-between gap-2">
           <InputImageFile
             label="Image"

web/src/pages/admin/services/new.astro

@@ -1,24 +1,57 @@
 ---
-import { AttributeCategory, Currency, VerificationStatus } from '@prisma/client'
+import { ServiceVisibility, VerificationStatus } from '@prisma/client'
-import { Icon } from 'astro-icon/components'
 import { actions, isInputError } from 'astro:actions'
+import { orderBy } from 'lodash-es'
 
+import InputCardGroup from '../../../components/InputCardGroup.astro'
 import InputCheckbox from '../../../components/InputCheckbox.astro'
+import InputCheckboxGroup from '../../../components/InputCheckboxGroup.astro'
+import InputImageFile from '../../../components/InputImageFile.astro'
+import InputSelect from '../../../components/InputSelect.astro'
+import InputSubmitButton from '../../../components/InputSubmitButton.astro'
+import InputText from '../../../components/InputText.astro'
+import InputTextArea from '../../../components/InputTextArea.astro'
+import { getAttributeCategoryInfo } from '../../../constants/attributeCategories'
+import { getAttributeTypeInfo } from '../../../constants/attributeTypes'
+import { contactMethodUrlTypes } from '../../../constants/contactMethods'
+import { countries } from '../../../constants/countries'
+import { currencies } from '../../../constants/currencies'
+import { kycLevelClarifications } from '../../../constants/kycLevelClarifications'
+import { kycLevels } from '../../../constants/kycLevels'
+import { serviceVisibilities } from '../../../constants/serviceVisibility'
+import { verificationStatuses } from '../../../constants/verificationStatus'
 import BaseLayout from '../../../layouts/BaseLayout.astro'
-import { cn } from '../../../lib/cn'
 import { prisma } from '../../../lib/prisma'
 
-const categories = await Astro.locals.banners.try('Failed to fetch categories', () =>
+const [categories, attributes] = await Astro.locals.banners.tryMany([
-  prisma.category.findMany({
+  [
-    orderBy: { name: 'asc' },
+    'Failed to fetch categories',
-  })
+    () =>
-)
+      prisma.category.findMany({
-
+        orderBy: { name: 'asc' },
-const attributes = await Astro.locals.banners.try('Failed to fetch attributes', () =>
+        select: {
-  prisma.attribute.findMany({
+          id: true,
-    orderBy: { category: 'asc' },
+          name: true,
-  })
+          icon: true,
-)
+        },
+      }),
+    [],
+  ],
+  [
+    'Failed to fetch attributes',
+    () =>
+      prisma.attribute.findMany({
+        orderBy: { category: 'asc' },
+        select: {
+          id: true,
+          title: true,
+          category: true,
+          type: true,
+        },
+      }),
+    [],
+  ],
+])
 
 const result = Astro.getActionResult(actions.admin.service.create)
 Astro.locals.banners.addIfSuccess(result, 'Service created successfully')
@@ -28,382 +61,287 @@ if (result && !result.error) {
 const inputErrors = isInputError(result?.error) ? result.error.fields : {}
 ---
 
-<BaseLayout pageTitle="Create Service" widthClassName="max-w-screen-sm">
+<BaseLayout
-  <section class="mb-8">
+  pageTitle="Create Service"
-    <div class="font-title mb-4">
+  description="Create a new service for KYCnot.me"
-      <span class="text-sm text-green-500">service.create</span>
+  widthClassName="max-w-screen-md"
-    </div>
+>
+  <h1 class="font-title mt-12 mb-6 text-center text-3xl font-bold">Create Service</h1>
 
-    <form
+  <form
-      method="POST"
+    method="POST"
-      action={actions.admin.service.create}
+    action={actions.admin.service.create}
-      class="space-y-4 rounded-lg border border-green-500/30 bg-black/40 p-6 shadow-[0_0_15px_rgba(34,197,94,0.2)] backdrop-blur-xs"
+    enctype="multipart/form-data"
-      enctype="multipart/form-data"
+    class="space-y-6"
-    >
+  >
-      <div>
+    <InputText
-        <label for="name" class="font-title mb-2 block text-sm text-green-500">name</label>
+      label="Name"
-        <input
+      name="name"
-          transition:persist
+      inputProps={{
-          type="text"
+        required: true,
-          name="name"
+        maxlength: 40,
-          id="name"
+      }}
-          required
+      error={inputErrors.name}
-          class="font-title w-full rounded-md border border-green-500/30 bg-black/50 p-2 text-gray-300 placeholder-gray-500 focus:border-green-500 focus:ring-green-500"
+    />
-        />
-        {
-          inputErrors.name && (
-            <p class="font-title mt-1 text-sm text-red-500">{inputErrors.name.join(', ')}</p>
-          )
-        }
-      </div>
 
-      <div>
+    <InputTextArea
-        <label for="description" class="font-title mb-2 block text-sm text-green-500">description</label>
+      label="Description"
-        <textarea
+      name="description"
-          transition:persist
+      inputProps={{
-          name="description"
+        required: true,
-          id="description"
+      }}
-          required
+      error={inputErrors.description}
-          class="font-title w-full rounded-md border border-green-500/30 bg-black/50 p-2 text-gray-300 placeholder-gray-500 focus:border-green-500 focus:ring-green-500"
+    />
-          set:text=""
-        />
-        {
-          inputErrors.description && (
-            <p class="font-title mt-1 text-sm text-red-500">{inputErrors.description.join(', ')}</p>
-          )
-        }
-      </div>
 
-      <div>
+    <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
-        <label for="allServiceUrls" class="font-title mb-2 block text-sm text-green-500">Service URLs</label>
+      <InputTextArea
-        <textarea
+        label="Service URLs"
-          transition:persist
+        description="One per line. Accepts **Web**, **Onion**, and **I2P** URLs."
-          class="font-title w-full rounded-md border border-green-500/30 bg-black/50 p-2 text-gray-300 placeholder-gray-500 focus:border-green-500 focus:ring-green-500"
+        name="allServiceUrls"
-          name="allServiceUrls"
+        inputProps={{
-          id="allServiceUrls"
+          placeholder: 'example1.com\nexample2.onion\nexample3.b32.i2p',
-          rows={3}
+          class: 'md:min-h-20 min-h-24 h-full',
-          placeholder="https://example1.com\nhttps://example2.onion\nhttps://example3.b32.i2p"
+          required: true,
-          set:text=""
+        }}
-        />
+        class="flex flex-col self-stretch"
-        {
+        error={inputErrors.allServiceUrls}
-          inputErrors.allServiceUrls && (
-            <p class="font-title mt-1 text-sm text-red-500">{inputErrors.allServiceUrls.join(', ')}</p>
-          )
-        }
-      </div>
-
-      <div>
-        <label for="tosUrls" class="font-title mb-2 block text-sm text-green-500">tosUrls</label>
-        <textarea
-          transition:persist
-          class="font-title w-full rounded-md border border-green-500/30 bg-black/50 p-2 text-gray-300 placeholder-gray-500 focus:border-green-500 focus:ring-green-500"
-          name="tosUrls"
-          id="tosUrls"
-          rows={3}
-          placeholder="https://example1.com/tos https://example2.com/tos"
-          set:text=""
-        />
-        {
-          inputErrors.tosUrls && (
-            <p class="font-title mt-1 text-sm text-red-500">{inputErrors.tosUrls.join(', ')}</p>
-          )
-        }
-      </div>
-
-      <div>
-        <label for="imageFile" class="font-title mb-2 block text-sm text-green-500">serviceImage</label>
-        <div class="space-y-2">
-          <input
-            transition:persist
-            type="file"
-            name="imageFile"
-            id="imageFile"
-            accept="image/*"
-            required
-            class="font-title file:font-title block w-full rounded-md border border-green-500/30 bg-black/50 p-2 text-gray-300 file:mr-3 file:rounded-md file:border-0 file:bg-green-500/30 file:px-3 file:py-1 file:text-gray-300 focus:border-green-500 focus:ring-green-500"
-          />
-          <p class="font-title text-xs text-gray-400">
-            Upload a square image for best results. Supported formats: JPG, PNG, WebP, SVG.
-          </p>
-        </div>
-        {
-          inputErrors.imageFile && (
-            <p class="font-title mt-1 text-sm text-red-500">{inputErrors.imageFile.join(', ')}</p>
-          )
-        }
-      </div>
-
-      <div>
-        <label class="font-title mb-2 block text-sm text-green-500" for="categories">categories</label>
-        <div class="mt-2 grid grid-cols-2 gap-2">
-          {
-            categories?.map((category) => (
-              <label class="inline-flex items-center">
-                <input
-                  transition:persist
-                  type="checkbox"
-                  name="categories"
-                  value={category.id}
-                  class="rounded-sm border-green-500/30 bg-black/50 text-green-500 focus:ring-green-500 focus:ring-offset-black"
-                />
-                <span class="font-title ml-2 flex items-center gap-2 text-gray-300">
-                  <Icon class="h-3 w-3 text-green-500" name={category.icon} />
-                  {category.name}
-                </span>
-              </label>
-            ))
-          }
-        </div>
-        {
-          inputErrors.categories && (
-            <p class="font-title mt-1 text-sm text-red-500">{inputErrors.categories.join(', ')}</p>
-          )
-        }
-      </div>
-
-      <div>
-        <label for="kycLevel" class="font-title mb-2 block text-sm text-green-500">kycLevel</label>
-        <input
-          transition:persist
-          class="font-title w-full rounded-md border border-green-500/30 bg-black/50 p-2 text-gray-300 placeholder-gray-500 focus:border-green-500 focus:ring-green-500"
-          type="number"
-          name="kycLevel"
-          id="kycLevel"
-          min={0}
-          max={4}
-          value={4}
-          required
-        />
-        {
-          inputErrors.kycLevel && (
-            <p class="font-title mt-1 text-sm text-red-500">{inputErrors.kycLevel.join(', ')}</p>
-          )
-        }
-      </div>
-
-      <div>
-        <label class="font-title mb-2 block text-sm text-green-500" for="attributes">attributes</label>
-        <div class="space-y-4">
-          {
-            Object.values(AttributeCategory).map((category) => (
-              <div class="rounded-md border border-green-500/20 bg-black/30 p-4">
-                <h4 class="font-title mb-3 text-green-400">{category}</h4>
-                <div class="grid grid-cols-1 gap-2">
-                  {attributes
-                    ?.filter((attr) => attr.category === category)
-                    .map((attr) => (
-                      <label class="inline-flex items-center">
-                        <input
-                          transition:persist
-                          type="checkbox"
-                          name="attributes"
-                          value={attr.id}
-                          class="rounded-sm border-green-500/30 bg-black/50 text-green-500 focus:ring-green-500 focus:ring-offset-black"
-                        />
-                        <span class="font-title ml-2 flex items-center gap-2 text-gray-300">
-                          {attr.title}
-                          <span
-                            class={cn('font-title rounded-sm px-1.5 py-0.5 text-xs', {
-                              'border border-green-500/50 bg-green-500/20 text-green-400':
-                                attr.type === 'GOOD',
-                              'border border-red-500/50 bg-red-500/20 text-red-400': attr.type === 'BAD',
-                              'border border-yellow-500/50 bg-yellow-500/20 text-yellow-400':
-                                attr.type === 'WARNING',
-                              'border border-blue-500/50 bg-blue-500/20 text-blue-400': attr.type === 'INFO',
-                            })}
-                          >
-                            {attr.type}
-                          </span>
-                        </span>
-                      </label>
-                    ))}
-                </div>
-                {inputErrors.attributes && (
-                  <p class="font-title mt-1 text-sm text-red-500">{inputErrors.attributes.join(', ')}</p>
-                )}
-              </div>
-            ))
-          }
-        </div>
-      </div>
-
-      <div>
-        <label class="font-title mb-2 block text-sm text-green-500" for="verificationStatus"
-          >verificationStatus</label
-        >
-        <select
-          transition:persist
-          class="font-title w-full rounded-md border border-green-500/30 bg-black/50 p-2 text-gray-300 focus:border-green-500 focus:ring-green-500"
-          name="verificationStatus"
-          id="verificationStatus"
-          required
-        >
-          {Object.values(VerificationStatus).map((status) => <option value={status}>{status}</option>)}
-        </select>
-        {
-          inputErrors.verificationStatus && (
-            <p class="font-title mt-1 text-sm text-red-500">{inputErrors.verificationStatus.join(', ')}</p>
-          )
-        }
-      </div>
-
-      <div>
-        <label class="font-title mb-2 block text-sm text-green-500" for="verificationSummary"
-          >verificationSummary</label
-        >
-        <textarea
-          transition:persist
-          class="font-title w-full rounded-md border border-green-500/30 bg-black/50 p-2 text-gray-300 placeholder-gray-500 focus:border-green-500 focus:ring-green-500"
-          name="verificationSummary"
-          id="verificationSummary"
-          rows={3}
-          set:text=""
-        />
-        {
-          inputErrors.verificationSummary && (
-            <p class="font-title mt-1 text-sm text-red-500">{inputErrors.verificationSummary.join(', ')}</p>
-          )
-        }
-      </div>
-
-      <div>
-        <label class="font-title mb-2 block text-sm text-green-500" for="verificationProofMd"
-          >verificationProofMd</label
-        >
-        <textarea
-          transition:persist
-          class="font-title w-full rounded-md border border-green-500/30 bg-black/50 p-2 text-gray-300 placeholder-gray-500 focus:border-green-500 focus:ring-green-500"
-          name="verificationProofMd"
-          id="verificationProofMd"
-          rows={10}
-          set:text=""
-        />
-        {
-          inputErrors.verificationProofMd && (
-            <p class="font-title mt-1 text-sm text-red-500">{inputErrors.verificationProofMd.join(', ')}</p>
-          )
-        }
-      </div>
-
-      <div>
-        <label class="font-title mb-2 block text-sm text-green-500" for="acceptedCurrencies"
-          >acceptedCurrencies</label
-        >
-        <div class="mt-2 grid grid-cols-2 gap-2">
-          {
-            Object.values(Currency).map((currency) => (
-              <label class="inline-flex items-center">
-                <input
-                  transition:persist
-                  type="checkbox"
-                  name="acceptedCurrencies"
-                  value={currency}
-                  class="rounded-sm border-green-500/30 bg-black/50 text-green-500 focus:ring-green-500 focus:ring-offset-black"
-                />
-                <span class="font-title ml-2 text-gray-300">{currency}</span>
-              </label>
-            ))
-          }
-        </div>
-        {
-          inputErrors.acceptedCurrencies && (
-            <p class="font-title mt-1 text-sm text-red-500">{inputErrors.acceptedCurrencies.join(', ')}</p>
-          )
-        }
-      </div>
-
-      <div>
-        <label class="font-title mb-2 block text-sm text-green-500" for="overallScore">overallScore</label>
-        <input
-          transition:persist
-          type="number"
-          name="overallScore"
-          id="overallScore"
-          value={0}
-          min={0}
-          max={10}
-          required
-          class="font-title w-full rounded-md border border-green-500/30 bg-black/50 p-2 text-gray-300 focus:border-green-500 focus:ring-green-500"
-        />
-        {
-          inputErrors.overallScore && (
-            <p class="font-title mt-1 text-sm text-red-500">{inputErrors.overallScore.join(', ')}</p>
-          )
-        }
-      </div>
-
-      <div>
-        <label class="font-title mb-2 block text-sm text-green-500" for="referral">referral link path</label>
-        <input
-          transition:persist
-          type="text"
-          name="referral"
-          id="referral"
-          placeholder="e.g. ?ref=123 or /ref/123"
-          class="font-title w-full rounded-md border border-green-500/30 bg-black/50 p-2 text-gray-300 placeholder-gray-500 focus:border-green-500 focus:ring-green-500"
-        />
-        {
-          inputErrors.referral && (
-            <p class="font-title mt-1 text-sm text-red-500">{inputErrors.referral.join(', ')}</p>
-          )
-        }
-      </div>
-
-      <div>
-        <label for="internalNote" class="font-title mb-2 block text-sm text-green-500">internalNote</label>
-        <div class="space-y-2">
-          <textarea
-            transition:persist
-            name="internalNote"
-            id="internalNote"
-            rows={4}
-            placeholder="Markdown supported"
-            class="font-title w-full rounded-md border border-green-500/30 bg-black/50 p-2 text-gray-300 placeholder-gray-500 focus:border-green-500 focus:ring-green-500"
-            set:text=""
-          />
-        </div>
-        {
-          inputErrors.internalNote && (
-            <p class="font-title mt-1 text-sm text-red-500">{inputErrors.internalNote.join(', ')}</p>
-          )
-        }
-      </div>
-
-      <InputCheckbox
-        label="Strict Commenting"
-        name="strictCommentingEnabled"
-        checked={false}
-        descriptionInline="Require proof of being a client for comments."
       />
 
-      <div>
+      <InputTextArea
-        <label for="commentSectionMessage" class="font-title mb-2 block text-sm text-green-500"
+        label="Contact Methods"
-          >Comment Section Message</label
+        description={[
-        >
+          'One per line.',
-        <div class="space-y-2">
+          `Accepts: ${contactMethodUrlTypes.map((type: any) => type.labelPlural).join(', ')}`,
-          <textarea
+        ].join('\n')}
-            transition:persist
+        name="contactMethods"
-            name="commentSectionMessage"
+        inputProps={{
-            id="commentSectionMessage"
+          placeholder: 'contact@example.com\nt.me/example\n+123 456 7890',
-            rows={4}
+          class: 'h-full',
-            placeholder="Markdown supported. This message will be displayed in the comment section for root comments."
+        }}
-            class="font-title w-full rounded-md border border-green-500/30 bg-black/50 p-2 text-gray-300 placeholder-gray-500 focus:border-green-500 focus:ring-green-500"
+        class="flex flex-col self-stretch"
-            set:text=""
+        error={inputErrors.contactMethods}
-          />
+      />
-        </div>
+    </div>
-        {
-          inputErrors.commentSectionMessage && (
-            <p class="font-title mt-1 text-sm text-red-500">{inputErrors.commentSectionMessage.join(', ')}</p>
-          )
-        }
-      </div>
 
-      <button
+    <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
-        type="submit"
+      <InputTextArea
-        class="font-title inline-flex justify-center rounded-md border border-green-500/30 bg-green-500/10 px-4 py-2 text-sm text-green-400 shadow-xs transition-colors duration-200 hover:bg-green-500/20 focus:ring-2 focus:ring-green-500 focus:ring-offset-2 focus:ring-offset-black focus:outline-hidden"
+        label="ToS URLs"
-      >
+        description="One per line. AI review uses the first working URL only."
-        Create Service
+        name="tosUrls"
-      </button>
+        inputProps={{
-    </form>
+          placeholder: 'example.com/tos',
-  </section>
+          required: true,
+          class: 'min-h-10',
+        }}
+        error={inputErrors.tosUrls}
+      />
+
+      <InputText
+        label="Operating since"
+        name="operatingSince"
+        inputProps={{
+          type: 'date',
+          max: new Date().toISOString().slice(0, 10),
+        }}
+        error={inputErrors.operatingSince}
+      />
+    </div>
+
+    <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+      <InputText
+        label="Registered Company Name"
+        name="registeredCompanyName"
+        description="Official name of the registered company (optional)"
+        inputProps={{
+          placeholder: 'e.g. Example Corp Ltd.',
+        }}
+      />
+
+      <InputSelect
+        name="registrationCountryCode"
+        label="Company Registration Country"
+        description="Country where the service company is legally registered (optional)"
+        options={[
+          { label: 'Not registered', value: '' },
+          ...countries
+            .sort((a: any, b: any) => a.name.localeCompare(b.name))
+            .map((country: any) => ({
+              label: `${country.flag} ${country.name}`,
+              value: country.code,
+            }))
+        ]}
+        selectedValue=""
+      />
+    </div>
+
+    <InputCardGroup
+      name="kycLevel"
+      label="KYC Level"
+      options={kycLevels.map((kycLevel: any) => ({
+        label: kycLevel.name,
+        value: kycLevel.id.toString(),
+        icon: kycLevel.icon,
+        description: `${kycLevel.description}\n\n_KYC Level ${kycLevel.value}/4_`,
+      }))}
+      iconSize="md"
+      cardSize="md"
+      required
+      error={inputErrors.kycLevel}
+    />
+
+    <InputCardGroup
+      name="kycLevelClarification"
+      label="KYC Level Clarification"
+      options={kycLevelClarifications.map((clarification: any) => ({
+        label: clarification.label,
+        value: clarification.value,
+        icon: clarification.icon,
+        description: clarification.description,
+      }))}
+      selectedValue="NONE"
+      iconSize="sm"
+      cardSize="sm"
+      error={inputErrors.kycLevelClarification}
+    />
+
+    <div class="xs:grid-cols-[1fr_2fr] grid grid-cols-1 items-stretch gap-x-4 gap-y-6">
+      <InputCheckboxGroup
+        name="categories"
+        label="Categories"
+        required
+        options={categories.map((category: any) => ({
+          label: category.name,
+          value: category.id.toString(),
+          icon: category.icon,
+        }))}
+        size="lg"
+        error={inputErrors.categories}
+        class="min-w-auto"
+      />
+
+      <InputCheckboxGroup
+        name="attributes"
+        label="Attributes"
+        options={orderBy(
+          attributes.map((attribute: any) => ({
+            ...attribute,
+            categoryInfo: getAttributeCategoryInfo(attribute.category),
+            typeInfo: getAttributeTypeInfo(attribute.type),
+          })),
+          ['categoryInfo.order', 'typeInfo.order']
+        ).map((attribute: any) => ({
+          label: attribute.title,
+          value: attribute.id.toString(),
+          icon: [attribute.categoryInfo.icon, attribute.typeInfo.icon],
+          iconClassName: [attribute.categoryInfo.classNames.icon, attribute.typeInfo.classNames.icon],
+        }))}
+        description="See list of [all attributes](/attributes) and their scoring."
+        error={inputErrors.attributes}
+        size="lg"
+      />
+    </div>
+
+    <InputCardGroup
+      name="acceptedCurrencies"
+      label="Accepted Currencies"
+      options={currencies.map((currency: any) => ({
+        label: currency.name,
+        value: currency.id,
+        icon: currency.icon,
+      }))}
+      error={inputErrors.acceptedCurrencies}
+      multiple
+    />
+
+    <InputImageFile
+      label="Service Image"
+      name="imageFile"
+      description="Square image. At least 192x192px. Transparency supported."
+      error={inputErrors.imageFile}
+      square
+      required
+    />
+
+    <InputSelect
+      name="verificationStatus"
+      label="Verification Status"
+      options={Object.values(VerificationStatus).map((status) => ({
+        label: status.replace(/_/g, ' ').toLowerCase().replace(/\b\w/g, (l: string) => l.toUpperCase()),
+        value: status,
+      }))}
+      error={inputErrors.verificationStatus}
+    />
+
+    <InputTextArea
+      label="Verification Summary"
+      name="verificationSummary"
+      error={inputErrors.verificationSummary}
+    />
+
+    <InputTextArea
+      label="Verification Proof (Markdown)"
+      name="verificationProofMd"
+      inputProps={{
+        rows: 10,
+      }}
+      error={inputErrors.verificationProofMd}
+    />
+
+    <InputText
+      label="Referral Link Path"
+      name="referral"
+      inputProps={{
+        placeholder: 'e.g. ?ref=123 or /ref/123',
+      }}
+      error={inputErrors.referral}
+      description="Will be appended to the service URL"
+    />
+
+    <InputCardGroup
+      name="serviceVisibility"
+      label="Service Visibility"
+      options={serviceVisibilities.map((visibility: any) => ({
+        label: visibility.label,
+        value: visibility.value,
+        icon: visibility.icon,
+        iconClass: visibility.iconClass,
+        description: visibility.description,
+      }))}
+      selectedValue="PUBLIC"
+      error={inputErrors.serviceVisibility}
+      cardSize="sm"
+    />
+
+    <InputTextArea
+      label="Internal Note"
+      name="internalNote"
+      description="Markdown supported. Internal notes for admins."
+      inputProps={{
+        rows: 4,
+      }}
+      error={inputErrors.internalNote}
+    />
+
+    <InputCheckbox
+      label="Strict Commenting"
+      name="strictCommentingEnabled"
+      checked={false}
+      descriptionInline="Require proof of being a client for comments."
+      error={inputErrors.strictCommentingEnabled}
+    />
+
+    <InputTextArea
+      label="Comment Section Message"
+      name="commentSectionMessage"
+      description="Markdown supported. This message will be displayed in the comment section for root comments."
+      inputProps={{
+        rows: 4,
+      }}
+      error={inputErrors.commentSectionMessage}
+    />
+
+    <InputSubmitButton label="Create Service" icon="ri:add-line" hideCancel />
+      </form>
+    </FormSection>
+  </div>
 </BaseLayout>

web/src/pages/downloads.mdx

@@ -9,11 +9,15 @@ icon: 'ri:image-line'
 
 import PressAssets from '../components/PressAssets.astro'
 
+## How you can use our logo?
+
+**You are not allowed to list us as partners**. We don't accept partnerships. You should make sure it's clear that you're adding our logo **voluntarily**. Examples of correct use: "Rate us on", "Listed on" sections.
+
 Please, link back to [KYCnot.me](https://kycnot.me) when possible, and use responsibly.
 
 <PressAssets />
 
-Review service link format: `https://kycnot.me/service/[slug]/review`
+> You can link to a service's review section with: `https://kycnot.me/service/[slug]/review`
 
 ## Brand design
 

web/src/pages/index.astro

@@ -467,6 +467,7 @@ const showFiltersId = 'show-filters'
             categories={categories}
             attributes={attributes}
             attributeOptions={attributeOptions}
+            inlineIcons={false}
           />
         )
       }
@@ -492,6 +493,7 @@ const showFiltersId = 'show-filters'
     />
     <div
       class="bg-night-700 fixed top-0 left-0 z-50 hidden h-dvh w-dvw shrink-0 translate-y-full overflow-y-auto overscroll-contain border-t border-green-500/30 px-8 pt-4 transition-transform peer-checked:translate-y-0 max-sm:peer-checked:block sm:relative sm:z-auto sm:block sm:h-auto sm:w-64 sm:translate-y-0 sm:overflow-visible sm:border-none sm:bg-none sm:p-0"
+      aria-label="Search filters"
     >
       <ServicesFilters
         searchResultsId={searchResultsId}
@@ -519,6 +521,7 @@ const showFiltersId = 'show-filters'
       filtersOptions={filtersOptions}
       attributes={attributes}
       attributeOptions={attributeOptions}
+      aria-label="Search results"
     />
   </div>
   {

web/src/pages/service-suggestion/new.astro

@@ -15,12 +15,14 @@ import InputCheckbox from '../../components/InputCheckbox.astro'
 import InputCheckboxGroup from '../../components/InputCheckboxGroup.astro'
 import InputHoneypotTrap from '../../components/InputHoneypotTrap.astro'
 import InputImageFile from '../../components/InputImageFile.astro'
+import InputSelect from '../../components/InputSelect.astro'
 import InputSubmitButton from '../../components/InputSubmitButton.astro'
 import InputText from '../../components/InputText.astro'
 import InputTextArea from '../../components/InputTextArea.astro'
 import { getAttributeCategoryInfo } from '../../constants/attributeCategories'
 import { getAttributeTypeInfo } from '../../constants/attributeTypes'
 import { contactMethodUrlTypes } from '../../constants/contactMethods'
+import { countries } from '../../constants/countries'
 import { currencies } from '../../constants/currencies'
 import { kycLevelClarifications } from '../../constants/kycLevelClarifications'
 import { kycLevels } from '../../constants/kycLevels'
@@ -262,6 +264,33 @@ const [categories, attributes] = await Astro.locals.banners.tryMany([
       />
     </div>
 
+    <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+      <InputText
+        label="Registered Company Name"
+        name="registeredCompanyName"
+        description="Official name of the registered company (optional)"
+        inputProps={{
+          placeholder: 'e.g. Example Corp Ltd.',
+        }}
+      />
+
+      <InputSelect
+        name="registrationCountryCode"
+        label="Company Registration Country"
+        description="Country where the service company is legally registered (optional)"
+        options={[
+          { label: 'Not registered', value: '' },
+          ...countries
+            .sort((a, b) => a.name.localeCompare(b.name))
+            .map((country) => ({
+              label: `${country.flag} ${country.name}`,
+              value: country.code,
+            }))
+        ]}
+        selectedValue=""
+      />
+    </div>
+
     <InputCardGroup
       name="kycLevel"
       label="KYC Level"

web/src/pages/service/[slug].astro

@@ -96,6 +96,8 @@ const [service, dbNotificationPreferences] = await Astro.locals.banners.tryMany(
           createdAt: true,
           acceptedCurrencies: true,
           operatingSince: true,
+          registrationCountryCode: true,
+          registeredCompanyName: true,
           tosReview: true,
           tosReviewAt: true,
           userSentiment: true,
@@ -296,8 +298,6 @@ const statusIcon = {
   APPROVED: undefined,
 }[service.verificationStatus]
 
-const isScam = service.verificationStatus === 'VERIFICATION_FAILED'
-
 const shuffledLinks = {
   clearnet: shuffle(service.serviceUrls),
   onion: shuffle(service.onionUrls),
@@ -414,6 +414,7 @@ const ogImageTemplateData = {
   categories: service.categories.map((category) => pick(category, ['name', 'icon'])),
   score: service.overallScore,
   imageUrl: service.imageUrl,
+  verificationStatus: service.verificationStatus,
 } satisfies OgImageAllTemplatesWithProps
 
 const serviceVisibilityInfo = getServiceVisibilityInfo(service.serviceVisibility)
@@ -426,6 +427,30 @@ const activeAlertOrWarningEvents = service.events
   .filter((event) => event.typeInfo.showBanner && (event.endedAt === null || event.endedAt >= now))
 const activeEventToShow =
   activeAlertOrWarningEvents.find((event) => event.type === EventType.ALERT) ?? activeAlertOrWarningEvents[0]
+
+// Sort verification steps: failed first, then warnings, then others, newest first within each group
+const getVerificationStepPriority = (status: VerificationStepStatus) => {
+  switch (status) {
+    case VerificationStepStatus.FAILED:
+      return 0 // Highest priority
+    case VerificationStepStatus.WARNING:
+      return 1
+    case VerificationStepStatus.IN_PROGRESS:
+      return 2
+    case VerificationStepStatus.PENDING:
+      return 3
+    case VerificationStepStatus.PASSED:
+      return 4 // Lowest priority
+    default:
+      return 5
+  }
+}
+
+const sortedVerificationSteps = orderBy(
+  service.verificationSteps,
+  [(step) => getVerificationStepPriority(step.status), (step) => step.updatedAt],
+  ['asc', 'desc'] // Priority ascending (failed first), date descending (newest first)
+)
 ---
 
 <BaseLayout
@@ -767,18 +792,12 @@ const activeEventToShow =
       <ul aria-label="Service links" class="xs:justify-start mt-4 flex flex-wrap justify-center gap-2">
         {shownLinks.map((url) => (
           <li>
-            {isScam ? (
+            <ServiceLinkButton
-              <span class="2xs:text-sm 2xs:h-8 2xs:gap-2 2xs:px-4 bg-day-800 inline-flex h-6 items-center gap-1 rounded-full px-2 text-xs whitespace-nowrap text-red-400">
+              url={url}
-                <Icon name="ri:alert-line" class="size-4 text-red-400" />
+              referral={service.referral}
-                {urlDomain(url)}
+              enableMinWidth={shuffledLinks.onion.length + shuffledLinks.i2p.length > 0}
-              </span>
+              isScam={service.verificationStatus === 'VERIFICATION_FAILED'}
-            ) : (
+            />
-              <ServiceLinkButton
-                url={url}
-                referral={service.referral}
-                enableMinWidth={shuffledLinks.onion.length + shuffledLinks.i2p.length > 0}
-              />
-            )}
           </li>
         ))}
 
@@ -802,18 +821,12 @@ const activeEventToShow =
 
         {hiddenLinks.map((url) => (
           <li class="hidden peer-checked:block">
-            {isScam ? (
+            <ServiceLinkButton
-              <span class="2xs:text-sm 2xs:h-8 2xs:gap-2 2xs:px-4 bg-day-800 inline-flex h-6 items-center gap-1 rounded-full px-2 text-xs whitespace-nowrap text-red-400">
+              url={url}
-                <Icon name="ri:alert-line" class="size-4 text-red-400" />
+              referral={service.referral}
-                {urlDomain(url)}
+              enableMinWidth={shuffledLinks.onion.length + shuffledLinks.i2p.length > 0}
-              </span>
+              isScam={service.verificationStatus === 'VERIFICATION_FAILED'}
-            ) : (
+            />
-              <ServiceLinkButton
-                url={url}
-                referral={service.referral}
-                enableMinWidth={shuffledLinks.onion.length + shuffledLinks.i2p.length > 0}
-              />
-            )}
           </li>
         ))}
       </ul>
@@ -1476,11 +1489,11 @@ const activeEventToShow =
     )
   }
   {
-    service.verificationSteps.length > 0 && (
+    sortedVerificationSteps.length > 0 && (
       <>
         <h3 class="font-title text-md mt-6 mb-2 font-semibold">Verification Steps</h3>
         <ul class="mb-8 space-y-2">
-          {service.verificationSteps.map((step) => {
+          {sortedVerificationSteps.map((step) => {
             const statusInfo = getVerificationStepStatusInfo(step.status)
 
             return (