Merge branch 'master' into minor

license/signatures/version1/cla.json

@@ -791,6 +791,14 @@
       "created_at": "2025-10-06T19:00:41Z",
       "repoId": 136938012,
       "pullRequestNo": 3865
+    },
+    {
+      "name": "SiebelsTim",
+      "id": 1153003,
+      "comment_id": 3382213352,
+      "created_at": "2025-10-08T15:52:35Z",
+      "repoId": 136938012,
+      "pullRequestNo": 3869
     }
   ]
 }

packages/dashboard/src/app/routes/_authenticated/_shipping-methods/shipping-methods_.$id.tsx

@@ -169,7 +169,7 @@ function ShippingMethodDetailPage() {
                         />
                     </DetailFormGrid>
                 </PageBlock>
-                <CustomFieldsPageBlock column="main" entityType="Promotion" control={form.control} />
+                <CustomFieldsPageBlock column="main" entityType="ShippingMethod" control={form.control} />
                 <PageBlock column="main" blockId="conditions" title={<Trans>Conditions</Trans>}>
                     <FormFieldWrapper
                         control={form.control}