diff --git a/.changeset/heavy-eels-fold.md b/.changeset/heavy-eels-fold.md
new file mode 100644
index 0000000000..ea20f7bc2a
--- /dev/null
+++ b/.changeset/heavy-eels-fold.md
@@ -0,0 +1,5 @@
+---
+"@medusajs/medusa": patch
+---
+
+Order/cart decorate totals should assign items totals, shipping option requirements should be tax-inclusive if shipping option is, ensure swaps can be created on orders with discounts