chore(merge): integrate origin/staging into local staging

Resolved conflict in customer-accordion-list.tsx by keeping
the per-device flattening (DeviceCard) implementation.

shop/lib/types.ts

@@ -18,6 +18,7 @@ export type Product = {
   requirements?: string[]
   exclusions?: string[]
   allow_update_discount?: boolean
+  linked_fee_product_id?: string | null
 }
 
 export type Category = {