set explicit color-scheme on storefront theme roots

Align native browser controls with the active light or dark theme instead of using light dark on html.

Co-authored-by: Cursor <cursoragent@cursor.com>

backend/src/modules/order/services/OrderCreationService.ts

@@ -36,6 +36,7 @@ export class OrderCreationService {
                 .leftJoinAndSelect('session.discounts', 'discount')
                 .leftJoinAndSelect('session.invoice', 'invoice')
                 .leftJoinAndSelect('invoice.moneroDetails', 'moneroDetails')
+                .leftJoinAndSelect('invoice.btcDetails', 'btcDetails')
                 .leftJoinAndSelect('invoice.payments', 'payment')
                 .leftJoin('session.order', 'order')
                 .where('session.id = :sessionId', { sessionId })

backend/src/modules/order/services/OrderService.spec.ts

@@ -222,7 +222,7 @@ describe('OrderService', () => {
             ({
                 id: 'order-1',
                 lines: [{ deliveryMode: DeliveryMode.Manual }],
-                checkoutInvoice: { id: 'checkout-invoice-1', fiatCurrency: 'USD' }
+                checkoutInvoice: { id: 'checkout-invoice-1', fiatCurrency: 'USD', paymentMethod: PaymentMethod.Xmr }
             }) as Order;
 
         it('throws when the order cannot be quoted', async () => {
@@ -300,6 +300,26 @@ describe('OrderService', () => {
             });
             expect(result).toBe(orderExtended);
         });
+
+        it('uses the checkout invoice payment method for shipping invoices', async () => {
+            orderRepo.findOne.mockResolvedValue({
+                ...buildQuotableOrder(),
+                checkoutInvoice: {
+                    id: 'checkout-invoice-1',
+                    fiatCurrency: 'USD',
+                    paymentMethod: PaymentMethod.Btc
+                }
+            });
+
+            await service.setDeliveryCost('order-1', { deliveryCost: 12.5 });
+
+            expect(invoiceService.issueInvoice).toHaveBeenCalledWith({
+                paymentMethod: PaymentMethod.Btc,
+                reason: InvoiceReason.Shipping,
+                contextId: 'order-1',
+                amountFiat: 12.5
+            });
+        });
     });
 
     describe('fulfillManualLine', () => {

backend/src/modules/order/services/OrderService.ts

@@ -15,7 +15,6 @@ import type { InvoiceExtended } from '../../payment/types/InvoiceExtended';
 import type { InvoicePaymentExtended } from '../../payment/types/InvoicePaymentExtended';
 import { InvoiceReason } from '../../payment/types/InvoiceReason';
 import { InvoiceService } from '../../payment/services/InvoiceService';
-import { PaymentMethod } from '../../payment/types/PaymentMethod';
 import { DeliveryMode } from '../../product/types/DeliveryMode';
 import { SetDeliveryCostDto } from '../dto/SetDeliveryCostDto';
 import type { ListOrdersQueryDto } from '../dto/ListOrdersQueryDto';
@@ -99,9 +98,11 @@ export class OrderService {
                 'checkoutInvoice',
                 'checkoutInvoice.payments',
                 'checkoutInvoice.moneroDetails',
+                'checkoutInvoice.btcDetails',
                 'shippingInvoice',
                 'shippingInvoice.payments',
                 'shippingInvoice.moneroDetails',
+                'shippingInvoice.btcDetails',
                 'lines',
                 'lines.manualFulfillment',
                 'discounts',
@@ -244,7 +245,7 @@ export class OrderService {
         }
 
         const shippingInvoice = await this.invoiceService.issueInvoice({
-            paymentMethod: PaymentMethod.Xmr,
+            paymentMethod: order.checkoutInvoice.paymentMethod,
             reason: InvoiceReason.Shipping,
             contextId: orderId,
             amountFiat: deliveryCost

backend/src/modules/storefrontCheckout/services/CheckoutPaymentPollerService.ts

@@ -25,6 +25,7 @@ export class CheckoutPaymentPollerService {
             .createQueryBuilder('session')
             .innerJoinAndSelect('session.invoice', 'invoice')
             .leftJoinAndSelect('invoice.moneroDetails', 'moneroDetails')
+            .leftJoinAndSelect('invoice.btcDetails', 'btcDetails')
             .leftJoinAndSelect('invoice.payments', 'payment')
             .leftJoin('session.order', 'order')
             .where('session.cancelledAt IS NULL')

backend/src/modules/storefrontCheckout/services/CheckoutSessionService.ts

@@ -6,7 +6,7 @@ import type { CookieCartSummary } from '../../storefrontCart/types/CookieCartSum
 import { deriveCheckoutSessionState } from '../../../utils/checkout/deriveCheckoutSessionState';
 import { InvoiceReason } from '../../payment/types/InvoiceReason';
 import { InvoiceService } from '../../payment/services/InvoiceService';
-import { PaymentMethod } from '../../payment/types/PaymentMethod';
+import type { PaymentMethod } from '../../payment/types/PaymentMethod';
 import { CheckoutSessionDiscount } from '../entities/CheckoutSessionDiscount';
 import { CheckoutSessionLine } from '../entities/CheckoutSessionLine';
 import { CheckoutSession } from '../entities/CheckoutSession';
@@ -26,7 +26,14 @@ export class CheckoutSessionService {
     async findById(id: string): Promise<CheckoutSession | null> {
         return this.sessionRepo.findOne({
             where: { id },
-            relations: ['lines', 'discounts', 'invoice', 'invoice.moneroDetails', 'invoice.payments']
+            relations: [
+                'lines',
+                'discounts',
+                'invoice',
+                'invoice.moneroDetails',
+                'invoice.btcDetails',
+                'invoice.payments'
+            ]
         });
     }
 
@@ -87,7 +94,7 @@ export class CheckoutSessionService {
     async cancelSession(sessionId: string): Promise<void> {
         const session = await this.sessionRepo.findOne({
             where: { id: sessionId },
-            relations: ['invoice', 'invoice.moneroDetails', 'invoice.payments']
+            relations: ['invoice', 'invoice.moneroDetails', 'invoice.btcDetails', 'invoice.payments']
         });
 
         if (!session) {

backend/src/modules/storefrontCore/public/css/storefront.css

@@ -1,4 +1,5 @@
 :root {
+    color-scheme: light;
     --sf-font-sans:
         'Helvetica Neue', Helvetica, 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', Arial, sans-serif;
     --sf-font-mono: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace;
@@ -52,6 +53,7 @@
 
 @media (prefers-color-scheme: dark) {
     :root:not([data-theme='light']) {
+        color-scheme: dark;
         --sf-bg: #0a0a0a;
         --sf-surface: #141414;
         --sf-surface-muted: #262727;
@@ -85,6 +87,7 @@
 }
 
 :root[data-theme='dark'] {
+    color-scheme: dark;
     --sf-bg: #0a0a0a;
     --sf-surface: #141414;
     --sf-surface-muted: #262727;
@@ -117,6 +120,7 @@
 }
 
 :root[data-theme='light'] {
+    color-scheme: light;
     --sf-bg: #ffffff;
     --sf-surface: #ffffff;
     --sf-surface-muted: #f5f7fa;
@@ -154,10 +158,6 @@
     box-sizing: border-box;
 }
 
-html {
-    color-scheme: light dark;
-}
-
 body.sf-body {
     margin: 0;
     min-height: 100vh;

backend/src/modules/storefrontOrder/services/StorefrontOrderService.ts

@@ -68,6 +68,7 @@ export class StorefrontOrderService {
             .createQueryBuilder('order')
             .leftJoinAndSelect('order.checkoutInvoice', 'checkoutInvoice')
             .leftJoinAndSelect('checkoutInvoice.moneroDetails', 'moneroDetails')
+            .leftJoinAndSelect('checkoutInvoice.btcDetails', 'btcDetails')
             .leftJoinAndSelect('checkoutInvoice.payments', 'payment')
             .where('order.id = :orderId', { orderId })
             .getOne();

backend/src/types/CryptoAtomicConverter.ts

@@ -0,0 +1,3 @@
+import type Decimal from 'decimal.js';
+
+export type CryptoAtomicConverter = (amountAtomic: string, rounding?: Decimal.Rounding) => string;

backend/src/utils/invoice/toStorefrontInvoiceView.spec.ts

@@ -1,15 +1,19 @@
 import { InternalServerErrorException } from '@nestjs/common';
 import { XMR_ATOMIC_PER_XMR } from '../../consts/xmrAtomicPerXmr';
+import { BTC_ATOMIC_PER_BTC } from '../../consts/btcAtomicPerBtc';
 import type { Invoice } from '../../modules/payment/entities/Invoice';
+import type { InvoiceBtcDetails } from '../../modules/payment/entities/InvoiceBtcDetails';
 import type { InvoiceMoneroDetails } from '../../modules/payment/entities/InvoiceMoneroDetails';
 import type { InvoicePayment } from '../../modules/payment/entities/InvoicePayment';
 import { PaymentMethod } from '../../modules/payment/types/PaymentMethod';
 import { InvoiceReason } from '../../modules/payment/types/InvoiceReason';
+import type { BtcDetailsOverrides, MoneroDetailsOverrides } from './types/ToStorefrontInvoiceViewTestTypes';
 import * as formatRelativeTimeAgoModule from '../formatRelativeTimeAgo';
 import * as generateQrCodeDataUrlModule from '../generateQrCodeDataUrl';
 import { toStorefrontInvoiceView } from './toStorefrontInvoiceView';
 
 const oneXmrAtomic = XMR_ATOMIC_PER_XMR.toString();
+const oneBtcAtomic = BTC_ATOMIC_PER_BTC.toString();
 const paymentAddress = '4StorefrontInvoiceViewTestAddress';
 
 const buildPayment = (overrides: Partial<InvoicePayment> = {}): InvoicePayment =>
@@ -21,10 +25,6 @@ const buildPayment = (overrides: Partial<InvoicePayment> = {}): InvoicePayment =
         ...overrides
     }) as InvoicePayment;
 
-type MoneroDetailsOverrides = Partial<
-    Pick<InvoiceMoneroDetails, 'paymentAddressIndex' | 'fiatPerXmrAtCreation' | 'requiredConfirmations'>
->;
-
 const buildMoneroDetails = (overrides: MoneroDetailsOverrides = {}): InvoiceMoneroDetails =>
     ({
         paymentAddressIndex: 1,
@@ -33,6 +33,13 @@ const buildMoneroDetails = (overrides: MoneroDetailsOverrides = {}): InvoiceMone
         ...overrides
     }) as InvoiceMoneroDetails;
 
+const buildBtcDetails = (overrides: BtcDetailsOverrides = {}): InvoiceBtcDetails =>
+    ({
+        fiatPerBtcAtCreation: 60_000,
+        requiredConfirmations: 1,
+        ...overrides
+    }) as InvoiceBtcDetails;
+
 const buildInvoice = (overrides: Partial<Invoice> = {}): Invoice =>
     ({
         reason: InvoiceReason.Checkout,
@@ -77,10 +84,21 @@ describe('toStorefrontInvoiceView', () => {
             await expect(toStorefrontInvoiceView(invoice)).rejects.toBeInstanceOf(InternalServerErrorException);
         });
 
-        it('throws for unsupported payment methods', async () => {
+        it('throws when bitcoin details are missing', async () => {
-            const invoice = buildInvoice({ paymentMethod: 'btc' as PaymentMethod });
+            const invoice = buildInvoice({
+                paymentMethod: PaymentMethod.Btc,
+                moneroDetails: null,
+                btcDetails: null,
+                expectedTotalAtomic: oneBtcAtomic
+            });
 
-            await expect(toStorefrontInvoiceView(invoice)).rejects.toThrow('Unsupported payment method: btc');
+            await expect(toStorefrontInvoiceView(invoice)).rejects.toThrow('Invoice is missing Bitcoin payment details');
+        });
+
+        it('throws for unsupported payment methods', async () => {
+            const invoice = buildInvoice({ paymentMethod: 'eth' as PaymentMethod, moneroDetails: null });
+
+            await expect(toStorefrontInvoiceView(invoice)).rejects.toThrow('Unsupported payment method: eth');
         });
     });
 
@@ -124,6 +142,27 @@ describe('toStorefrontInvoiceView', () => {
             expect(generateQrCodeDataUrlSpy).toHaveBeenCalledWith(`monero:${paymentAddress}?tx_amount=1.00000000`);
         });
 
+        it('maps bitcoin invoices and builds a bip21 qr code', async () => {
+            const invoice = buildInvoice({
+                paymentMethod: PaymentMethod.Btc,
+                moneroDetails: null,
+                btcDetails: buildBtcDetails(),
+                expectedTotalAtomic: oneBtcAtomic,
+                paymentAddress: 'bc1qstorefronttest'
+            });
+
+            const view = await toStorefrontInvoiceView(invoice);
+
+            expect(view).toMatchObject({
+                cryptoCurrency: 'BTC',
+                expectedTotalCrypto: '1.00000000',
+                paymentAddress: 'bc1qstorefronttest'
+            });
+            expect(generateQrCodeDataUrlSpy).toHaveBeenCalledWith(
+                'bitcoin:bc1qstorefronttest?amount=1.00000000'
+            );
+        });
+
         it('formats expiry as seconds only when under one minute remains', async () => {
             const invoice = buildInvoice({
                 expiresAt: new Date('2026-06-01T12:00:45.000Z')

backend/src/utils/invoice/toStorefrontInvoiceView.ts

@@ -2,13 +2,16 @@ import Decimal from 'decimal.js';
 import { InternalServerErrorException } from '@nestjs/common';
 import type { StorefrontInvoicePaymentView } from '../../modules/storefrontCore/types/StorefrontInvoicePaymentView';
 import type { StorefrontInvoiceView } from '../../modules/storefrontCore/types/StorefrontInvoiceView';
+import type { CryptoAtomicConverter } from '../../types/CryptoAtomicConverter';
 import type { Invoice } from '../../modules/payment/entities/Invoice';
 import type { InvoicePayment } from '../../modules/payment/entities/InvoicePayment';
 import { PaymentMethod } from '../../modules/payment/types/PaymentMethod';
 import dayjs from '../../plugins/dayjs';
 import { generateQrCodeDataUrl } from '../generateQrCodeDataUrl';
+import { convertBtcAtomicToBtc } from '../bitcoin/convertBtcAtomicToBtc';
 import { convertXmrAtomicToXmr } from '../monero/convertXmrAtomicToXmr';
 import { subtractAtomic } from '../atomic/subtractAtomic';
+import { paymentMethodLabel } from '../../consts/paymentMethodLabel';
 import { deriveInvoiceState } from './deriveInvoiceState';
 import { formatInvoicePaymentConfirmationStatus } from './formatInvoicePaymentConfirmationStatus';
 import { resolveInvoiceStatusMessage } from './resolveInvoiceStatusMessage';
@@ -19,17 +22,44 @@ import { sumInvoicePaymentAmountsAtomic } from './sumInvoicePaymentAmountsAtomic
 export const toStorefrontInvoiceView = async (invoice: Invoice): Promise<StorefrontInvoiceView> => {
     switch (invoice.paymentMethod) {
         case PaymentMethod.Xmr:
-            return toXmrInvoiceView(invoice);
+            if (!invoice.moneroDetails) {
+                throw new InternalServerErrorException('Invoice is missing Monero payment details');
+            }
+
+            return buildStorefrontInvoiceView({
+                invoice,
+                paymentLabel: paymentMethodLabel[PaymentMethod.Xmr],
+                convertAtomicToCrypto: convertXmrAtomicToXmr,
+                buildQrCodePayload: (paymentAddress, amountCrypto) =>
+                    `monero:${paymentAddress}?tx_amount=${amountCrypto}`
+            });
+        case PaymentMethod.Btc:
+            if (!invoice.btcDetails) {
+                throw new InternalServerErrorException('Invoice is missing Bitcoin payment details');
+            }
+
+            return buildStorefrontInvoiceView({
+                invoice,
+                paymentLabel: paymentMethodLabel[PaymentMethod.Btc],
+                convertAtomicToCrypto: convertBtcAtomicToBtc,
+                buildQrCodePayload: (paymentAddress, amountCrypto) => `bitcoin:${paymentAddress}?amount=${amountCrypto}`
+            });
         default:
             throw new InternalServerErrorException(`Unsupported payment method: ${String(invoice.paymentMethod)}`);
     }
 };
 
-const toXmrInvoiceView = async (invoice: Invoice): Promise<StorefrontInvoiceView> => {
+const buildStorefrontInvoiceView = async ({
-    if (!invoice.moneroDetails) {
+    invoice,
-        throw new InternalServerErrorException('Invoice is missing Monero payment details');
+    paymentLabel,
-    }
+    convertAtomicToCrypto,
-
+    buildQrCodePayload
+}: {
+    invoice: Invoice;
+    paymentLabel: string;
+    convertAtomicToCrypto: CryptoAtomicConverter;
+    buildQrCodePayload: (paymentAddress: string, amountCrypto: string) => string;
+}): Promise<StorefrontInvoiceView> => {
     const invoiceState = deriveInvoiceState(invoice);
 
     const {
@@ -42,22 +72,20 @@ const toXmrInvoiceView = async (invoice: Invoice): Promise<StorefrontInvoiceView
         hasPendingConfirmations
     } = invoiceState;
 
-    const cryptoCurrency = 'XMR';
+    const expectedTotalCrypto = convertAtomicToCrypto(invoice.expectedTotalAtomic);
-    const expectedTotalCrypto = convertXmrAtomicToXmr(invoice.expectedTotalAtomic);
     const receivedAtomic = sumInvoicePaymentAmountsAtomic(invoice.payments);
-    const receivedTotalCrypto = receivedAtomic === '0' ? null : convertXmrAtomicToXmr(receivedAtomic);
+    const receivedTotalCrypto = receivedAtomic === '0' ? null : convertAtomicToCrypto(receivedAtomic);
 
     const requiredConfirmations = resolveInvoiceRequiredConfirmations(invoice);
 
     const payments = [...(invoice.payments ?? [])]
         .sort((left, right) => left.createdAt.getTime() - right.createdAt.getTime())
-        .map(payment => toPaymentView(payment, requiredConfirmations));
+        .map(payment => toPaymentView(payment, requiredConfirmations, convertAtomicToCrypto));
 
     const showPaymentCapture = (isAwaitingPayment || isUnderpaid) && !isExpired;
 
     const expiresInDuration = showPaymentCapture ? formatInvoiceExpiresInDuration(invoice.expiresAt) : null;
 
-    let remainingTotalCrypto: string | null = null;
     let instructionPrefix: string | null = null;
     let instructionAmountCrypto: string | null = null;
     let instructionSuffix: string | null = null;
@@ -65,22 +93,20 @@ const toXmrInvoiceView = async (invoice: Invoice): Promise<StorefrontInvoiceView
 
     if (showPaymentCapture) {
         if (isAwaitingPayment) {
-            remainingTotalCrypto = expectedTotalCrypto;
             instructionAmountCrypto = expectedTotalCrypto;
             instructionPrefix = 'Send exactly';
             instructionSuffix = 'to the address below.';
         } else {
             const remainingTotalCryptoAtomic = subtractAtomic(invoice.expectedTotalAtomic, receivedAtomic);
 
-            remainingTotalCrypto = convertXmrAtomicToXmr(remainingTotalCryptoAtomic, Decimal.ROUND_CEIL);
+            instructionAmountCrypto = convertAtomicToCrypto(remainingTotalCryptoAtomic, Decimal.ROUND_CEIL);
-            instructionAmountCrypto = remainingTotalCrypto;
             instructionPrefix = 'Send';
             instructionSuffix = 'more to the same address below.';
         }
 
-        qrCodeUrl = await generateQrCodeDataUrl(
+        const qrCodePayload = buildQrCodePayload(invoice.paymentAddress, instructionAmountCrypto);
-            `monero:${invoice.paymentAddress}?tx_amount=${instructionAmountCrypto}`
+
-        );
+        qrCodeUrl = await generateQrCodeDataUrl(qrCodePayload);
     }
 
     const statusMessage = resolveInvoiceStatusMessage(invoiceState);
@@ -88,7 +114,7 @@ const toXmrInvoiceView = async (invoice: Invoice): Promise<StorefrontInvoiceView
     const statusVariant = resolveInvoiceStatusVariant(invoiceState);
 
     return {
-        cryptoCurrency,
+        cryptoCurrency: paymentLabel,
         expectedTotalCrypto,
         receivedTotalCrypto,
         paymentAddress: invoice.paymentAddress,
@@ -122,12 +148,16 @@ const toXmrInvoiceView = async (invoice: Invoice): Promise<StorefrontInvoiceView
     };
 };
 
-const toPaymentView = (payment: InvoicePayment, requiredConfirmations: number): StorefrontInvoicePaymentView => {
+const toPaymentView = (
+    payment: InvoicePayment,
+    requiredConfirmations: number,
+    convertAtomicToCrypto: CryptoAtomicConverter
+): StorefrontInvoicePaymentView => {
     const isConfirmed = payment.confirmations >= requiredConfirmations;
 
     return {
         txHash: payment.txHash,
-        amountCrypto: convertXmrAtomicToXmr(payment.amountAtomic),
+        amountCrypto: convertAtomicToCrypto(payment.amountAtomic),
         confirmationStatus: formatInvoicePaymentConfirmationStatus({
             confirmations: payment.confirmations,
             requiredConfirmations,

backend/src/utils/invoice/types/ToStorefrontInvoiceViewTestTypes.ts

@@ -0,0 +1,8 @@
+import type { InvoiceBtcDetails } from '../../../modules/payment/entities/InvoiceBtcDetails';
+import type { InvoiceMoneroDetails } from '../../../modules/payment/entities/InvoiceMoneroDetails';
+
+export type MoneroDetailsOverrides = Partial<
+    Pick<InvoiceMoneroDetails, 'paymentAddressIndex' | 'fiatPerXmrAtCreation' | 'requiredConfirmations'>
+>;
+
+export type BtcDetailsOverrides = Partial<Pick<InvoiceBtcDetails, 'fiatPerBtcAtCreation' | 'requiredConfirmations'>>;

backend/src/utils/order/createOrderDetailQuery.ts

@@ -11,9 +11,11 @@ export const createOrderDetailQuery = (orderRepo: Repository<Order>, orderId: st
         .leftJoinAndSelect('order.discounts', 'orderDiscount')
         .leftJoinAndSelect('order.checkoutInvoice', 'checkoutInvoice')
         .leftJoinAndSelect('checkoutInvoice.moneroDetails', 'checkoutMoneroDetails')
+        .leftJoinAndSelect('checkoutInvoice.btcDetails', 'checkoutBtcDetails')
         .leftJoinAndSelect('checkoutInvoice.payments', 'checkoutPayment')
         .leftJoinAndSelect('order.shippingInvoice', 'shippingInvoice')
         .leftJoinAndSelect('shippingInvoice.moneroDetails', 'shippingMoneroDetails')
+        .leftJoinAndSelect('shippingInvoice.btcDetails', 'shippingBtcDetails')
         .leftJoinAndSelect('shippingInvoice.payments', 'shippingPayment')
         .leftJoinAndSelect('order.messages', 'message')
         .addSelect('order.accessToken')