From c1740218e94471533f8b57c84886e1e371985285 Mon Sep 17 00:00:00 2001
From: Kasper Fabricius Kristensen
 <45367945+kasperkristensen@users.noreply.github.com>
Date: Fri, 28 Jun 2024 16:08:23 +0200
Subject: [PATCH] feat(dashboard,types,js-sdk,ui): Add missing Price List
 features (#7856)

**What**
- Adds missing features to Price List domain
- Adds `StackedFocusModal` and `StackedDrawer` components that should replace SplitView across the project.
- Add Footer to FocusModal
- Adds missing js-sdk functions and types

**Note**
The DatePickers in the PriceLists forms do not work as intended atm. The component is broken, and needs to be fixed. I am working on a fix, but choose to move that work into a separate branch, to prevent this PR from getting bigger then it already is. Will update once the fixes have been merged.
---
 .../condition-block/condition-block.tsx       |  59 ++
 .../date-range-display/date-range-display.tsx |  73 +++
 .../common/date-range-display/index.ts        |   1 +
 .../data-grid-root/data-grid-root.tsx         |  15 +-
 .../src/components/data-grid/hooks.tsx        |   9 +-
 .../src/components/data-grid/types.ts         |   4 +
 .../layout/main-layout/main-layout.tsx        |   4 +-
 .../dashboard/src/components/modals/index.ts  |   7 +
 .../route-drawer/index.ts                     |   0
 .../route-drawer/route-drawer.tsx             |  27 +-
 .../route-focus-modal/index.ts                |   0
 .../route-focus-modal/route-focus-modal.tsx   |  29 +-
 .../modals/route-modal-form/index.ts          |   1 +
 .../route-modal-form/route-modal-form.tsx}    |   6 +-
 .../modals/route-modal-provider/index.ts      |   2 +
 .../route-modal-context.tsx                   |   8 +
 .../route-modal-provider/route-provider.tsx   |  20 +-
 .../route-modal-provider/use-route-modal.tsx  |  12 +
 .../components/modals/stacked-drawer/index.ts |   1 +
 .../modals/stacked-drawer/stacked-drawer.tsx  |  85 +++
 .../modals/stacked-focus-modal/index.ts       |   1 +
 .../stacked-foucs-modal.tsx                   |  88 +++
 .../modals/stacked-modal-provider/index.ts    |   2 +
 .../stacked-modal-context.tsx                 |  10 +
 .../stacked-modal-provider.tsx                |  54 ++
 .../use-stacked-modal.ts                      |  14 +
 .../src/components/route-modal/index.ts       |   3 -
 .../route-modal/route-form/index.ts           |   1 -
 .../route-modal/route-modal-provider/index.ts |   1 -
 .../data-table-search/data-table-search.tsx   |   1 +
 .../src/hooks/api/customer-groups.tsx         |   6 +-
 .../dashboard/src/hooks/api/price-lists.tsx   |  97 +--
 .../dashboard/src/hooks/api/store.tsx         |  41 +-
 .../dashboard/src/i18n/translations/en.json   | 127 ++--
 .../src/providers/keybind-provider/hooks.tsx  |   2 +-
 .../providers/router-provider/route-map.tsx   |  27 +-
 .../src/providers/theme-provider/index.ts     |   6 +-
 .../theme-provider/theme-provider.tsx         |  36 +-
 .../providers/theme-provider/use-theme.tsx    |  12 +-
 .../api-key-management-create.tsx             |   2 +-
 .../api-key-create-form.tsx                   |   2 +-
 .../api-key-management-edit.tsx               |   2 +-
 .../edit-api-key-form/edit-api-key-form.tsx   |   2 +-
 .../api-key-management-sales-channels.tsx     |   2 +-
 .../api-key-sales-channels-form.tsx           |   2 +-
 .../add-campaign-promotions.tsx               |   2 +-
 .../add-campaign-promotions-form.tsx          |   6 +-
 .../campaign-budget-edit.tsx                  |   2 +-
 .../edit-campaign-budget-form.tsx             |   2 +-
 .../campaign-create/campaign-create.tsx       |   2 +-
 .../create-campaign-form.tsx                  |   2 +-
 .../campaigns/campaign-edit/campaign-edit.tsx |   2 +-
 .../edit-campaign-form/edit-campaign-form.tsx |   2 +-
 .../category-create/category-create.tsx       |   2 +-
 .../create-category-form.tsx                  |   2 +-
 .../category-edit/category-edit.tsx           |   2 +-
 .../edit-category-form/edit-category-form.tsx |   2 +-
 .../category-organize/category-organize.tsx   |   2 +-
 .../organize-category-form.tsx                |   2 +-
 .../category-products/category-products.tsx   |   2 +-
 .../edit-category-products-form.tsx           |   2 +-
 .../collection-add-products.tsx               |   2 +-
 .../add-products-to-collection-form.tsx       |   2 +-
 .../collection-create/collection-create.tsx   |   2 +-
 .../create-collection-form.tsx                |   2 +-
 .../collection-edit/collection-edit.tsx       |   2 +-
 .../edit-collection-form.tsx                  |   4 +-
 .../add-customers-form/add-customers-form.tsx |   4 +-
 .../customer-group-add-customers.tsx          |   2 +-
 .../create-customer-group-form.tsx            |   2 +-
 .../customer-group-create.tsx                 |   2 +-
 .../edit-customer-group-form.tsx              |   4 +-
 .../customer-group-edit.tsx                   |   2 +-
 .../create-customer-form.tsx                  |   2 +-
 .../customer-create/customer-create.tsx       |   2 +-
 .../edit-customer-form/edit-customer-form.tsx |   4 +-
 .../customers/customer-edit/customer-edit.tsx |   2 +-
 ...transfer-customer-order-ownership-form.tsx |   2 +-
 .../customer-transfer-ownership.tsx           |   2 +-
 .../add-customer-groups-form.tsx              |   2 +-
 .../customer-add-customer-groups.tsx          |   2 +-
 .../create-inventory-item-form.tsx            |  16 +-
 .../inventory-create/inventory-create.tsx     |   2 +-
 .../adjust-inventory-drawer.tsx               |  12 +-
 .../components/adjust-inventory-form.tsx      |   8 +-
 .../components/edit-item-attributes-form.tsx  |   2 +-
 .../edit-item-attributes-drawer.tsx           |   8 +-
 .../components/edit-item-form.tsx             |   8 +-
 .../edit-inventory-item/edit-item-drawer.tsx  |   8 +-
 .../components/manage-locations-form.tsx      |   8 +-
 .../manage-locations-drawer.tsx               |   6 +-
 .../create-location-form.tsx                  |   2 +-
 .../location-create/location-create.tsx       |   2 +-
 .../edit-location-form/edit-location-form.tsx |   2 +-
 .../locations/location-edit/location-edit.tsx |   2 +-
 .../edit-sales-channels-form.tsx              |   2 +-
 .../location-sales-channels.tsx               |   2 +-
 .../create-service-zone-form.tsx              |   2 +-
 .../location-service-zone-create.tsx          |   2 +-
 .../edit-service-zone-form.tsx                |   2 +-
 .../location-service-zone-edit.tsx            |   2 +-
 .../edit-service-zone-areas-form.tsx          |   2 +-
 .../location-service-zone-manage-areas.tsx    |   2 +-
 .../create-shipping-options-form.tsx          |   2 +-
 ...on-service-zone-shipping-option-create.tsx |   2 +-
 .../edit-shipping-option-form.tsx             |   2 +-
 ...tion-service-zone-shipping-option-edit.tsx |   2 +-
 .../edit-shipping-options-pricing-form.tsx    |   2 +-
 ...n-service-zone-shipping-option-pricing.tsx |   2 +-
 .../order-create-fulfillment-form.tsx         |   6 +-
 .../order-create-fulfillments.tsx             |   4 +-
 .../index.ts                                  |   1 +
 .../price-list-customer-group-rule-form.tsx   | 187 ++++++
 .../common/constants.ts                       |   0
 .../hooks/use-delete-price-list-action.tsx    |  56 ++
 .../hooks/use-price-list-currency-data.tsx    |  51 ++
 .../hooks/use-price-list-grid-columns.tsx     | 104 ++++
 .../src/routes/price-lists/common/schemas.ts  |  96 +++
 .../src/routes/price-lists/common/utils.ts    | 123 ++++
 .../price-list-configuration-form/index.ts    |   0
 .../price-list-configuration-form.tsx         | 307 ++++++++++
 .../price-list-configuration/index.ts         |   1 +
 .../price-list-configuration.tsx              |  68 +++
 .../price-list-create-form/index.ts           |   1 +
 .../price-list-create-form.tsx}               | 155 ++---
 .../price-list-details-form.tsx               | 326 +++++++++++
 .../price-list-prices-form.tsx}               |  63 +-
 .../price-list-products-form.tsx}             |  13 +-
 .../price-list-create-form}/schema.ts         |  15 +-
 .../price-lists/price-list-create/index.ts    |   1 +
 .../price-list-create/price-list-create.tsx   |  15 +
 .../price-list-configuration-section/index.ts |   1 +
 .../price-list-configuration-section.tsx      |  96 +++
 .../price-list-general-section/index.ts       |   1 +
 .../price-list-general-section.tsx}           |  46 +-
 .../price-list-product-section/index.ts       |   1 +
 .../price-list-product-section.tsx}           |  81 ++-
 .../price-lists/price-list-detail/index.ts    |   2 +
 .../price-list-detail}/loader.ts              |   4 +-
 .../price-list-detail/price-list-detail.tsx}  |  18 +-
 .../edit-price-list-form.tsx                  | 123 ++--
 .../components/price-list-edit-form}/index.ts |   0
 .../price-lists/price-list-edit/index.ts      |   1 +
 .../price-list-edit/price-list-edit.tsx}      |  10 +-
 .../components/price-list-list-table/index.ts |   1 +
 .../price-list-list-table-actions.tsx         |  42 ++
 .../price-list-list-table.tsx}                |  11 +-
 .../use-pricing-table-columns.tsx             |  17 +-
 .../use-pricing-table-filters.tsx             |   7 +
 .../use-pricing-table-query.tsx               |   8 +-
 .../price-lists/price-list-list/index.ts      |   1 +
 .../price-list-list/price-list-list.tsx}      |   6 +-
 .../price-list-prices-add-form/index.ts       |   1 +
 .../price-list-prices-add-form.tsx            | 296 ++++++++++
 .../price-list-prices-add-prices-form.tsx     |  87 +++
 ...price-list-prices-add-product-ids-form.tsx | 220 +++++++
 .../price-list-prices-add-form/schema.ts      |  27 +
 .../price-list-prices-add/index.ts            |   1 +
 .../price-list-prices-add.tsx                 |  30 +
 .../price-list-prices-edit-form/index.ts      |   1 +
 .../price-list-prices-edit-form.tsx           | 299 ++++++++++
 .../price-list-prices-edit/index.ts           |   1 +
 .../price-list-prices-edit.tsx}               |  20 +-
 .../hooks/use-price-list-grid-columns.tsx     |  77 ---
 .../src/routes/pricing/common/schemas.ts      |  31 -
 .../src/routes/pricing/common/utils.ts        |  59 --
 .../price-list-configuration-form.tsx         | 197 -------
 .../pricing/pricing-configuration/index.ts    |   1 -
 .../pricing-configuration.tsx                 |  28 -
 .../components/pricing-create-form/index.ts   |   1 -
 .../pricing-details-form.tsx                  | 553 ------------------
 .../routes/pricing/pricing-create/index.ts    |   1 -
 .../pricing/pricing-create/pricing-create.tsx |  10 -
 .../pricing-configuration-section/index.ts    |   1 -
 .../pricing-configuration-section.tsx         |  90 ---
 .../pricing-general-section/index.ts          |   1 -
 .../pricing-product-section/index.ts          |   1 -
 .../routes/pricing/pricing-detail/index.ts    |   2 -
 .../src/routes/pricing/pricing-edit/index.ts  |   1 -
 .../components/pricing-list-table/index.ts    |   1 -
 .../pricing-table-actions.tsx                 |  61 --
 .../use-pricing-table-filters.tsx             |  18 -
 .../src/routes/pricing/pricing-list/index.ts  |   1 -
 .../pricing-products-prices-form/index.ts     |   1 -
 .../pricing-products-prices-form.tsx          | 378 ------------
 .../pricing/pricing-products-prices/index.ts  |   1 -
 .../routes/pricing/pricing-products/index.ts  |   1 -
 .../pricing-products/pricing-products.tsx     |   5 -
 .../create-product-type-form.tsx              |   2 +-
 .../product-type-create.tsx                   |   2 +-
 .../edit-product-type-form.tsx                |   2 +-
 .../product-type-edit/product-type-edit.tsx   |   2 +-
 .../product-edit-variant-form.tsx             |   4 +-
 .../product-variant-edit.tsx                  |   4 +-
 .../manage-variant-inventory-items-form.tsx   |  20 +-
 ...product-variant-manage-inventory-items.tsx |   4 +-
 .../product-attributes-form.tsx               |   4 +-
 .../product-attributes/product-attributes.tsx |   4 +-
 .../create-product-option-form.tsx            |   4 +-
 .../product-create-option.tsx                 |   4 +-
 .../create-product-variant-form.tsx           |   4 +-
 .../product-create-variant.tsx                |   2 +-
 .../product-create-form.tsx                   |  12 +-
 .../product-create/product-create.tsx         |   6 +-
 .../edit-product-option-form.tsx              |   4 +-
 .../product-edit-option.tsx                   |   4 +-
 .../edit-product-form/edit-product-form.tsx   |   4 +-
 .../products/product-edit/product-edit.tsx    |   4 +-
 .../edit-product-media-form.tsx               |   8 +-
 .../product-media-gallery.tsx                 |   4 +-
 .../products/product-media/product-media.tsx  |   4 +-
 .../product-organization-form.tsx             |   2 +-
 .../product-organization.tsx                  |   2 +-
 .../products/product-prices/pricing-edit.tsx  |   9 +-
 .../product-prices/product-prices.tsx         |   2 +-
 .../edit-sales-channels-form.tsx              |   8 +-
 .../product-sales-channels.tsx                |   4 +-
 .../edit-profile-form/edit-profile-form.tsx   |   2 +-
 .../profile/profile-edit/profile-edit.tsx     |   2 +-
 .../edit-rules-form/edit-rules-form.tsx       |   2 +-
 .../edit-rules-wrapper/edit-rules-wrapper.tsx |   2 +-
 .../common/edit-rules/edit-rules.tsx          |   2 +-
 .../add-campaign-promotion-form.tsx           |   2 +-
 .../promotion-add-campaign.tsx                |   2 +-
 .../create-promotion-form.tsx                 |   2 +-
 .../promotion-create/promotion-create.tsx     |   2 +-
 .../edit-promotion-details-form.tsx           |   2 +-
 .../promotion-edit-details.tsx                |   2 +-
 .../add-countries-form/add-countries-form.tsx |   6 +-
 .../region-add-countries.tsx                  |   4 +-
 .../create-region-form/create-region-form.tsx |   2 +-
 .../regions/region-create/region-create.tsx   |   6 +-
 .../edit-region-form/edit-region-form.tsx     |   2 +-
 .../regions/region-edit/region-edit.tsx       |   8 +-
 .../components/edit-reservation-form.tsx      |  12 +-
 .../edit-reservation-modal.tsx                |  10 +-
 .../create-reservation-form.tsx               |   2 +-
 .../create-reservation-modal.tsx              |   4 +-
 .../add-products-to-sales-channel-form.tsx    |   7 +-
 .../sales-channel-add-products.tsx            |   2 +-
 .../create-sales-channel-form.tsx             |   2 +-
 .../sales-channel-create.tsx                  |   2 +-
 .../edit-sales-channel-form.tsx               |   2 +-
 .../sales-channel-edit/sales-channel-edit.tsx |   2 +-
 .../create-shipping-profile-form.tsx          |   2 +-
 .../shipping-profile-create.tsx               |   3 +-
 .../add-currencies-form.tsx                   |   4 +-
 .../store-add-currencies.tsx                  |   2 +-
 .../store-currency-section.tsx                |  13 +-
 .../store/store-detail/store-detail.tsx       |   2 +-
 .../edit-store-form/edit-store-form.tsx       |   4 +-
 .../routes/store/store-edit/store-edit.tsx    |   2 +-
 .../tax-region-create-form.tsx                |   6 +-
 .../tax-province-create.tsx                   |   2 +-
 .../tax-rate-create-form.tsx                  |   2 +-
 .../taxes/tax-rate-create/tax-rate-create.tsx |   2 +-
 .../tax-rate-edit-form/tax-rate-edit-form.tsx |  20 +-
 .../taxes/tax-rate-edit/tax-rate-edit.tsx     |   2 +-
 .../tax-region-create/tax-region-create.tsx   |   2 +-
 .../edit-user-form/edit-user-form.tsx         |   2 +-
 .../src/routes/users/user-edit/user-edit.tsx  |   2 +-
 .../invite-user-form/invite-user-form.tsx     |   8 +-
 .../routes/users/user-invite/user-invite.tsx  |   2 +-
 packages/core/js-sdk/src/admin/index.ts       |   3 +
 packages/core/js-sdk/src/admin/price-list.ts  |  89 +++
 packages/core/js-sdk/src/admin/store.ts       |  53 ++
 packages/core/types/src/common/common.ts      |   5 +
 .../types/src/http/currency/admin/entities.ts |  14 +
 .../types/src/http/currency/admin/index.ts    |   1 +
 .../core/types/src/http/currency/index.ts     |   1 +
 packages/core/types/src/http/index.ts         |   3 +
 .../src/http/price-list/admin/entities.ts     |  22 +
 .../types/src/http/price-list/admin/index.ts  |   4 +
 .../src/http/price-list/admin/payloads.ts     |  51 ++
 .../src/http/price-list/admin/queries.ts      |  16 +
 .../src/http/price-list/admin/responses.ts    |  14 +
 .../core/types/src/http/price-list/index.ts   |   1 +
 .../types/src/http/pricing/admin/entities.ts  |  16 -
 .../types/src/http/pricing/admin/index.ts     |   3 -
 .../types/src/http/pricing/admin/payloads.ts  |   3 -
 .../types/src/http/pricing/admin/queries.ts   |   3 -
 .../types/src/http/pricing/admin/responses.ts |   5 -
 .../types/src/http/store/admin/entities.ts    |  24 +
 .../core/types/src/http/store/admin/index.ts  |   4 +
 .../types/src/http/store/admin/payloads.ts    |  13 +
 .../types/src/http/store/admin/queries.ts     |  12 +
 .../types/src/http/store/admin/responses.ts   |  11 +
 packages/core/types/src/http/store/index.ts   |   1 +
 .../ui/src/components/button/button.tsx       |   2 +-
 .../components/date-picker/date-picker.tsx    |   8 +-
 .../ui/src/components/drawer/drawer.tsx       |  26 +-
 .../components/focus-modal/focus-modal.tsx    |  53 +-
 .../progress-tabs/progress-tabs.tsx           |   2 +-
 .../src/api/admin/price-lists/validators.ts   |   4 +-
 yarn.lock                                     | 379 +++++++++++-
 295 files changed, 4488 insertions(+), 2350 deletions(-)
 create mode 100644 packages/admin-next/dashboard/src/components/common/condition-block/condition-block.tsx
 create mode 100644 packages/admin-next/dashboard/src/components/common/date-range-display/date-range-display.tsx
 create mode 100644 packages/admin-next/dashboard/src/components/common/date-range-display/index.ts
 create mode 100644 packages/admin-next/dashboard/src/components/modals/index.ts
 rename packages/admin-next/dashboard/src/components/{route-modal => modals}/route-drawer/index.ts (100%)
 rename packages/admin-next/dashboard/src/components/{route-modal => modals}/route-drawer/route-drawer.tsx (62%)
 rename packages/admin-next/dashboard/src/components/{route-modal => modals}/route-focus-modal/index.ts (100%)
 rename packages/admin-next/dashboard/src/components/{route-modal => modals}/route-focus-modal/route-focus-modal.tsx (61%)
 create mode 100644 packages/admin-next/dashboard/src/components/modals/route-modal-form/index.ts
 rename packages/admin-next/dashboard/src/components/{route-modal/route-form/route-form.tsx => modals/route-modal-form/route-modal-form.tsx} (90%)
 create mode 100644 packages/admin-next/dashboard/src/components/modals/route-modal-provider/index.ts
 create mode 100644 packages/admin-next/dashboard/src/components/modals/route-modal-provider/route-modal-context.tsx
 rename packages/admin-next/dashboard/src/components/{route-modal => modals}/route-modal-provider/route-provider.tsx (53%)
 create mode 100644 packages/admin-next/dashboard/src/components/modals/route-modal-provider/use-route-modal.tsx
 create mode 100644 packages/admin-next/dashboard/src/components/modals/stacked-drawer/index.ts
 create mode 100644 packages/admin-next/dashboard/src/components/modals/stacked-drawer/stacked-drawer.tsx
 create mode 100644 packages/admin-next/dashboard/src/components/modals/stacked-focus-modal/index.ts
 create mode 100644 packages/admin-next/dashboard/src/components/modals/stacked-focus-modal/stacked-foucs-modal.tsx
 create mode 100644 packages/admin-next/dashboard/src/components/modals/stacked-modal-provider/index.ts
 create mode 100644 packages/admin-next/dashboard/src/components/modals/stacked-modal-provider/stacked-modal-context.tsx
 create mode 100644 packages/admin-next/dashboard/src/components/modals/stacked-modal-provider/stacked-modal-provider.tsx
 create mode 100644 packages/admin-next/dashboard/src/components/modals/stacked-modal-provider/use-stacked-modal.ts
 delete mode 100644 packages/admin-next/dashboard/src/components/route-modal/index.ts
 delete mode 100644 packages/admin-next/dashboard/src/components/route-modal/route-form/index.ts
 delete mode 100644 packages/admin-next/dashboard/src/components/route-modal/route-modal-provider/index.ts
 create mode 100644 packages/admin-next/dashboard/src/routes/price-lists/common/components/price-list-customer-group-rule-form/index.ts
 create mode 100644 packages/admin-next/dashboard/src/routes/price-lists/common/components/price-list-customer-group-rule-form/price-list-customer-group-rule-form.tsx
 rename packages/admin-next/dashboard/src/routes/{pricing => price-lists}/common/constants.ts (100%)
 create mode 100644 packages/admin-next/dashboard/src/routes/price-lists/common/hooks/use-delete-price-list-action.tsx
 create mode 100644 packages/admin-next/dashboard/src/routes/price-lists/common/hooks/use-price-list-currency-data.tsx
 create mode 100644 packages/admin-next/dashboard/src/routes/price-lists/common/hooks/use-price-list-grid-columns.tsx
 create mode 100644 packages/admin-next/dashboard/src/routes/price-lists/common/schemas.ts
 create mode 100644 packages/admin-next/dashboard/src/routes/price-lists/common/utils.ts
 rename packages/admin-next/dashboard/src/routes/{pricing/pricing-configuration => price-lists/price-list-configuration}/components/price-list-configuration-form/index.ts (100%)
 create mode 100644 packages/admin-next/dashboard/src/routes/price-lists/price-list-configuration/components/price-list-configuration-form/price-list-configuration-form.tsx
 create mode 100644 packages/admin-next/dashboard/src/routes/price-lists/price-list-configuration/index.ts
 create mode 100644 packages/admin-next/dashboard/src/routes/price-lists/price-list-configuration/price-list-configuration.tsx
 create mode 100644 packages/admin-next/dashboard/src/routes/price-lists/price-list-create/components/price-list-create-form/index.ts
 rename packages/admin-next/dashboard/src/routes/{pricing/pricing-create/components/pricing-create-form/pricing-create-form.tsx => price-lists/price-list-create/components/price-list-create-form/price-list-create-form.tsx} (70%)
 create mode 100644 packages/admin-next/dashboard/src/routes/price-lists/price-list-create/components/price-list-create-form/price-list-details-form.tsx
 rename packages/admin-next/dashboard/src/routes/{pricing/pricing-create/components/pricing-create-form/pricing-prices-form.tsx => price-lists/price-list-create/components/price-list-create-form/price-list-prices-form.tsx} (60%)
 rename packages/admin-next/dashboard/src/routes/{pricing/pricing-create/components/pricing-create-form/pricing-products-form.tsx => price-lists/price-list-create/components/price-list-create-form/price-list-products-form.tsx} (93%)
 rename packages/admin-next/dashboard/src/routes/{pricing/pricing-create/components/pricing-create-form => price-lists/price-list-create/components/price-list-create-form}/schema.ts (79%)
 create mode 100644 packages/admin-next/dashboard/src/routes/price-lists/price-list-create/index.ts
 create mode 100644 packages/admin-next/dashboard/src/routes/price-lists/price-list-create/price-list-create.tsx
 create mode 100644 packages/admin-next/dashboard/src/routes/price-lists/price-list-detail/components/price-list-configuration-section/index.ts
 create mode 100644 packages/admin-next/dashboard/src/routes/price-lists/price-list-detail/components/price-list-configuration-section/price-list-configuration-section.tsx
 create mode 100644 packages/admin-next/dashboard/src/routes/price-lists/price-list-detail/components/price-list-general-section/index.ts
 rename packages/admin-next/dashboard/src/routes/{pricing/pricing-detail/components/pricing-general-section/pricing-general-section.tsx => price-lists/price-list-detail/components/price-list-general-section/price-list-general-section.tsx} (67%)
 create mode 100644 packages/admin-next/dashboard/src/routes/price-lists/price-list-detail/components/price-list-product-section/index.ts
 rename packages/admin-next/dashboard/src/routes/{pricing/pricing-detail/components/pricing-product-section/pricing-product-section.tsx => price-lists/price-list-detail/components/price-list-product-section/price-list-product-section.tsx} (76%)
 create mode 100644 packages/admin-next/dashboard/src/routes/price-lists/price-list-detail/index.ts
 rename packages/admin-next/dashboard/src/routes/{pricing/pricing-detail => price-lists/price-list-detail}/loader.ts (85%)
 rename packages/admin-next/dashboard/src/routes/{pricing/pricing-detail/pricing-detail.tsx => price-lists/price-list-detail/price-list-detail.tsx} (76%)
 rename packages/admin-next/dashboard/src/routes/{pricing/pricing-edit/components/edit-price-list-form => price-lists/price-list-edit/components/price-list-edit-form}/edit-price-list-form.tsx (57%)
 rename packages/admin-next/dashboard/src/routes/{pricing/pricing-edit/components/edit-price-list-form => price-lists/price-list-edit/components/price-list-edit-form}/index.ts (100%)
 create mode 100644 packages/admin-next/dashboard/src/routes/price-lists/price-list-edit/index.ts
 rename packages/admin-next/dashboard/src/routes/{pricing/pricing-edit/pricing-edit.tsx => price-lists/price-list-edit/price-list-edit.tsx} (65%)
 create mode 100644 packages/admin-next/dashboard/src/routes/price-lists/price-list-list/components/price-list-list-table/index.ts
 create mode 100644 packages/admin-next/dashboard/src/routes/price-lists/price-list-list/components/price-list-list-table/price-list-list-table-actions.tsx
 rename packages/admin-next/dashboard/src/routes/{pricing/pricing-list/components/pricing-list-table/pricing-list-table.tsx => price-lists/price-list-list/components/price-list-list-table/price-list-list-table.tsx} (86%)
 rename packages/admin-next/dashboard/src/routes/{pricing/pricing-list/components/pricing-list-table => price-lists/price-list-list/components/price-list-list-table}/use-pricing-table-columns.tsx (68%)
 create mode 100644 packages/admin-next/dashboard/src/routes/price-lists/price-list-list/components/price-list-list-table/use-pricing-table-filters.tsx
 rename packages/admin-next/dashboard/src/routes/{pricing/pricing-list/components/pricing-list-table => price-lists/price-list-list/components/price-list-list-table}/use-pricing-table-query.tsx (54%)
 create mode 100644 packages/admin-next/dashboard/src/routes/price-lists/price-list-list/index.ts
 rename packages/admin-next/dashboard/src/routes/{pricing/pricing-list/pricing-list.tsx => price-lists/price-list-list/price-list-list.tsx} (80%)
 create mode 100644 packages/admin-next/dashboard/src/routes/price-lists/price-list-prices-add/components/price-list-prices-add-form/index.ts
 create mode 100644 packages/admin-next/dashboard/src/routes/price-lists/price-list-prices-add/components/price-list-prices-add-form/price-list-prices-add-form.tsx
 create mode 100644 packages/admin-next/dashboard/src/routes/price-lists/price-list-prices-add/components/price-list-prices-add-form/price-list-prices-add-prices-form.tsx
 create mode 100644 packages/admin-next/dashboard/src/routes/price-lists/price-list-prices-add/components/price-list-prices-add-form/price-list-prices-add-product-ids-form.tsx
 create mode 100644 packages/admin-next/dashboard/src/routes/price-lists/price-list-prices-add/components/price-list-prices-add-form/schema.ts
 create mode 100644 packages/admin-next/dashboard/src/routes/price-lists/price-list-prices-add/index.ts
 create mode 100644 packages/admin-next/dashboard/src/routes/price-lists/price-list-prices-add/price-list-prices-add.tsx
 create mode 100644 packages/admin-next/dashboard/src/routes/price-lists/price-list-prices-edit/components/price-list-prices-edit-form/index.ts
 create mode 100644 packages/admin-next/dashboard/src/routes/price-lists/price-list-prices-edit/components/price-list-prices-edit-form/price-list-prices-edit-form.tsx
 create mode 100644 packages/admin-next/dashboard/src/routes/price-lists/price-list-prices-edit/index.ts
 rename packages/admin-next/dashboard/src/routes/{pricing/pricing-products-prices/pricing-products-prices.tsx => price-lists/price-list-prices-edit/price-list-prices-edit.tsx} (58%)
 delete mode 100644 packages/admin-next/dashboard/src/routes/pricing/common/hooks/use-price-list-grid-columns.tsx
 delete mode 100644 packages/admin-next/dashboard/src/routes/pricing/common/schemas.ts
 delete mode 100644 packages/admin-next/dashboard/src/routes/pricing/common/utils.ts
 delete mode 100644 packages/admin-next/dashboard/src/routes/pricing/pricing-configuration/components/price-list-configuration-form/price-list-configuration-form.tsx
 delete mode 100644 packages/admin-next/dashboard/src/routes/pricing/pricing-configuration/index.ts
 delete mode 100644 packages/admin-next/dashboard/src/routes/pricing/pricing-configuration/pricing-configuration.tsx
 delete mode 100644 packages/admin-next/dashboard/src/routes/pricing/pricing-create/components/pricing-create-form/index.ts
 delete mode 100644 packages/admin-next/dashboard/src/routes/pricing/pricing-create/components/pricing-create-form/pricing-details-form.tsx
 delete mode 100644 packages/admin-next/dashboard/src/routes/pricing/pricing-create/index.ts
 delete mode 100644 packages/admin-next/dashboard/src/routes/pricing/pricing-create/pricing-create.tsx
 delete mode 100644 packages/admin-next/dashboard/src/routes/pricing/pricing-detail/components/pricing-configuration-section/index.ts
 delete mode 100644 packages/admin-next/dashboard/src/routes/pricing/pricing-detail/components/pricing-configuration-section/pricing-configuration-section.tsx
 delete mode 100644 packages/admin-next/dashboard/src/routes/pricing/pricing-detail/components/pricing-general-section/index.ts
 delete mode 100644 packages/admin-next/dashboard/src/routes/pricing/pricing-detail/components/pricing-product-section/index.ts
 delete mode 100644 packages/admin-next/dashboard/src/routes/pricing/pricing-detail/index.ts
 delete mode 100644 packages/admin-next/dashboard/src/routes/pricing/pricing-edit/index.ts
 delete mode 100644 packages/admin-next/dashboard/src/routes/pricing/pricing-list/components/pricing-list-table/index.ts
 delete mode 100644 packages/admin-next/dashboard/src/routes/pricing/pricing-list/components/pricing-list-table/pricing-table-actions.tsx
 delete mode 100644 packages/admin-next/dashboard/src/routes/pricing/pricing-list/components/pricing-list-table/use-pricing-table-filters.tsx
 delete mode 100644 packages/admin-next/dashboard/src/routes/pricing/pricing-list/index.ts
 delete mode 100644 packages/admin-next/dashboard/src/routes/pricing/pricing-products-prices/components/pricing-products-prices-form/index.ts
 delete mode 100644 packages/admin-next/dashboard/src/routes/pricing/pricing-products-prices/components/pricing-products-prices-form/pricing-products-prices-form.tsx
 delete mode 100644 packages/admin-next/dashboard/src/routes/pricing/pricing-products-prices/index.ts
 delete mode 100644 packages/admin-next/dashboard/src/routes/pricing/pricing-products/index.ts
 delete mode 100644 packages/admin-next/dashboard/src/routes/pricing/pricing-products/pricing-products.tsx
 create mode 100644 packages/core/js-sdk/src/admin/store.ts
 create mode 100644 packages/core/types/src/http/currency/admin/entities.ts
 create mode 100644 packages/core/types/src/http/currency/admin/index.ts
 create mode 100644 packages/core/types/src/http/currency/index.ts
 create mode 100644 packages/core/types/src/http/price-list/admin/entities.ts
 create mode 100644 packages/core/types/src/http/price-list/admin/index.ts
 create mode 100644 packages/core/types/src/http/price-list/admin/payloads.ts
 create mode 100644 packages/core/types/src/http/price-list/admin/queries.ts
 create mode 100644 packages/core/types/src/http/price-list/admin/responses.ts
 create mode 100644 packages/core/types/src/http/price-list/index.ts
 delete mode 100644 packages/core/types/src/http/pricing/admin/payloads.ts
 delete mode 100644 packages/core/types/src/http/pricing/admin/queries.ts
 delete mode 100644 packages/core/types/src/http/pricing/admin/responses.ts
 create mode 100644 packages/core/types/src/http/store/admin/entities.ts
 create mode 100644 packages/core/types/src/http/store/admin/index.ts
 create mode 100644 packages/core/types/src/http/store/admin/payloads.ts
 create mode 100644 packages/core/types/src/http/store/admin/queries.ts
 create mode 100644 packages/core/types/src/http/store/admin/responses.ts
 create mode 100644 packages/core/types/src/http/store/index.ts

diff --git a/packages/admin-next/dashboard/src/components/common/condition-block/condition-block.tsx b/packages/admin-next/dashboard/src/components/common/condition-block/condition-block.tsx
new file mode 100644
index 0000000000..fa9a230b94
--- /dev/null
+++ b/packages/admin-next/dashboard/src/components/common/condition-block/condition-block.tsx
@@ -0,0 +1,59 @@
+import { PropsWithChildren, createContext } from "react"
+
+type ConditionOperator =
+  | "eq"
+  | "ne"
+  | "gt"
+  | "lt"
+  | "gte"
+  | "lte"
+  | "in"
+  | "nin"
+
+type ConditionBlockValue<TValue> = {
+  attribute: string
+  operator: ConditionOperator
+  value: TValue
+}
+
+type ConditionBlockState<TValue> = {
+  defaultValue?: ConditionBlockValue<TValue>
+  value?: ConditionBlockValue<TValue>
+  onChange: (value: ConditionBlockValue<TValue>) => void
+}
+
+const ConditionBlockContext = createContext<ConditionBlockState<any> | null>(
+  null
+)
+
+const useConditionBlock = () => {
+  const context = ConditionBlockContext
+
+  if (!context) {
+    throw new Error("useConditionBlock must be used within a ConditionBlock")
+  }
+
+  return context
+}
+
+type ConditionBlockProps<TValue> = PropsWithChildren<
+  ConditionBlockState<TValue>
+>
+
+const Root = <TValue,>({ children, ...props }: ConditionBlockProps<TValue>) => {
+  return (
+    <ConditionBlockContext.Provider value={props}>
+      {children}
+    </ConditionBlockContext.Provider>
+  )
+}
+
+const Divider = () => {}
+
+const Operator = () => {}
+
+const Item = () => {}
+
+export const ConditionBlock = Object.assign(Root, {
+  Divider,
+})
diff --git a/packages/admin-next/dashboard/src/components/common/date-range-display/date-range-display.tsx b/packages/admin-next/dashboard/src/components/common/date-range-display/date-range-display.tsx
new file mode 100644
index 0000000000..8243e41b54
--- /dev/null
+++ b/packages/admin-next/dashboard/src/components/common/date-range-display/date-range-display.tsx
@@ -0,0 +1,73 @@
+import { Text, clx } from "@medusajs/ui"
+import { useTranslation } from "react-i18next"
+import { useDate } from "../../../hooks/use-date"
+
+type DateRangeDisplayProps = {
+  startsAt?: Date | string | null
+  endsAt?: Date | string | null
+  showTime?: boolean
+}
+
+export const DateRangeDisplay = ({
+  startsAt,
+  endsAt,
+  showTime = false,
+}: DateRangeDisplayProps) => {
+  const startDate = startsAt ? new Date(startsAt) : null
+  const endDate = endsAt ? new Date(endsAt) : null
+
+  const { t } = useTranslation()
+  const { getFullDate } = useDate()
+
+  return (
+    <div className="grid gap-3 md:grid-cols-2">
+      <div className="shadow-elevation-card-rest bg-ui-bg-component text-ui-fg-subtle flex items-center gap-x-3 rounded-md px-3 py-1.5">
+        <Bar date={startDate} />
+        <div>
+          <Text weight="plus" size="small">
+            {t("fields.startDate")}
+          </Text>
+          <Text size="small">
+            {startDate
+              ? getFullDate({
+                  date: startDate,
+                  includeTime: showTime,
+                })
+              : "-"}
+          </Text>
+        </div>
+      </div>
+
+      <div className="shadow-elevation-card-rest bg-ui-bg-component text-ui-fg-subtle flex items-center gap-x-3 rounded-md px-3 py-1.5">
+        <Bar date={endDate} />
+        <div>
+          <Text size="small" weight="plus">
+            {t("fields.endDate")}
+          </Text>
+          <Text size="small">
+            {endDate
+              ? getFullDate({
+                  date: endDate,
+                  includeTime: showTime,
+                })
+              : "-"}
+          </Text>
+        </div>
+      </div>
+    </div>
+  )
+}
+
+const Bar = ({ date }: { date: Date | null }) => {
+  const now = new Date()
+
+  const isDateInFuture = date && date > now
+
+  return (
+    <div
+      className={clx("bg-ui-tag-neutral-icon h-8 w-1 rounded-full", {
+        "bg-ui-tag-orange-icon": isDateInFuture,
+      })}
+    />
+  )
+}
diff --git a/packages/admin-next/dashboard/src/components/common/date-range-display/index.ts b/packages/admin-next/dashboard/src/components/common/date-range-display/index.ts
new file mode 100644
index 0000000000..f703c45152
--- /dev/null
+++ b/packages/admin-next/dashboard/src/components/common/date-range-display/index.ts
@@ -0,0 +1 @@
+export * from "./date-range-display"
diff --git a/packages/admin-next/dashboard/src/components/data-grid/data-grid-root/data-grid-root.tsx b/packages/admin-next/dashboard/src/components/data-grid/data-grid-root/data-grid-root.tsx
index c89b600add..e2767bbd52 100644
--- a/packages/admin-next/dashboard/src/components/data-grid/data-grid-root/data-grid-root.tsx
+++ b/packages/admin-next/dashboard/src/components/data-grid/data-grid-root/data-grid-root.tsx
@@ -7,11 +7,11 @@ import {
   useState,
 } from "react"
 
+import { Adjustments } from "@medusajs/icons"
 import { Button, DropdownMenu, clx } from "@medusajs/ui"
 import {
   CellContext,
   ColumnDef,
-  OnChangeFn,
   Row,
   VisibilityState,
   flexRender,
@@ -41,7 +41,7 @@ interface DataGridRootProps<
   data?: TData[]
   columns: ColumnDef<TData>[]
   state: UseFormReturn<TFieldValues>
-  getSubRows?: (row: TData) => TData[]
+  getSubRows?: (row: TData) => TData[] | undefined
 }
 
 const ARROW_KEYS = ["ArrowUp", "ArrowDown", "ArrowLeft", "ArrowRight"]
@@ -93,13 +93,6 @@ export const DataGridRoot = <
 
   const [columnVisibility, setColumnVisibility] = useState<VisibilityState>({})
 
-  const onColumnVisibilityChange: OnChangeFn<VisibilityState> = useCallback(
-    (next) => {
-      const update = typeof next === "function" ? next(columnVisibility) : next
-    },
-    [columnVisibility]
-  )
-
   const grid = useReactTable({
     data: data,
     columns,
@@ -663,7 +656,8 @@ export const DataGridRoot = <
           <DropdownMenu>
             <DropdownMenu.Trigger asChild>
               <Button size="small" variant="secondary">
-                Columns
+                <Adjustments />
+                Edit columns
               </Button>
             </DropdownMenu.Trigger>
             <DropdownMenu.Content>
@@ -799,6 +793,7 @@ export const DataGridRoot = <
                             {flexRender(cell.column.columnDef.cell, {
                               ...cell.getContext(),
                               columnIndex,
+                              rowIndex: virtualRow.index,
                             } as CellContext<TData, any>)}
                             {isAnchor && (
                               <div
diff --git a/packages/admin-next/dashboard/src/components/data-grid/hooks.tsx b/packages/admin-next/dashboard/src/components/data-grid/hooks.tsx
index 1a2f6bafdc..c8b7041657 100644
--- a/packages/admin-next/dashboard/src/components/data-grid/hooks.tsx
+++ b/packages/admin-next/dashboard/src/components/data-grid/hooks.tsx
@@ -29,11 +29,14 @@ export const useDataGridCell = <TData, TValue>({
   field,
   context,
 }: UseDataGridCellProps<TData, TValue>) => {
-  const { row, columnIndex } = context as DataGridCellContext<TData, TValue>
+  const { rowIndex, columnIndex } = context as DataGridCellContext<
+    TData,
+    TValue
+  >
 
   const coords: CellCoords = useMemo(
-    () => ({ row: row.index, col: columnIndex }),
-    [row, columnIndex]
+    () => ({ row: rowIndex, col: columnIndex }),
+    [rowIndex, columnIndex]
   )
   const id = generateCellId(coords)
 
diff --git a/packages/admin-next/dashboard/src/components/data-grid/types.ts b/packages/admin-next/dashboard/src/components/data-grid/types.ts
index eaccfee1be..7e73e24535 100644
--- a/packages/admin-next/dashboard/src/components/data-grid/types.ts
+++ b/packages/admin-next/dashboard/src/components/data-grid/types.ts
@@ -22,6 +22,10 @@ export interface DataGridCellContext<TData = unknown, TValue = any>
    * The index of the column in the grid.
    */
   columnIndex: number
+  /**
+   * The index of the row in the grid.
+   */
+  rowIndex: number
 }
 
 export interface DataGridCellContainerProps {
diff --git a/packages/admin-next/dashboard/src/components/layout/main-layout/main-layout.tsx b/packages/admin-next/dashboard/src/components/layout/main-layout/main-layout.tsx
index ece52d3190..ae4c3602a6 100644
--- a/packages/admin-next/dashboard/src/components/layout/main-layout/main-layout.tsx
+++ b/packages/admin-next/dashboard/src/components/layout/main-layout/main-layout.tsx
@@ -150,8 +150,8 @@ const useCoreRoutes = (): Omit<NavItemProps, "pathname">[] => {
     },
     {
       icon: <CurrencyDollar />,
-      label: t("pricing.domain"),
-      to: "/pricing",
+      label: t("priceLists.domain"),
+      to: "/price-lists",
     },
   ]
 }
diff --git a/packages/admin-next/dashboard/src/components/modals/index.ts b/packages/admin-next/dashboard/src/components/modals/index.ts
new file mode 100644
index 0000000000..566853b6d5
--- /dev/null
+++ b/packages/admin-next/dashboard/src/components/modals/index.ts
@@ -0,0 +1,7 @@
+export { RouteDrawer } from "./route-drawer"
+export { RouteFocusModal } from "./route-focus-modal"
+export { useRouteModal } from "./route-modal-provider"
+
+export { StackedDrawer } from "./stacked-drawer"
+export { StackedFocusModal } from "./stacked-focus-modal"
+export { useStackedModal } from "./stacked-modal-provider"
diff --git a/packages/admin-next/dashboard/src/components/route-modal/route-drawer/index.ts b/packages/admin-next/dashboard/src/components/modals/route-drawer/index.ts
similarity index 100%
rename from packages/admin-next/dashboard/src/components/route-modal/route-drawer/index.ts
rename to packages/admin-next/dashboard/src/components/modals/route-drawer/index.ts
diff --git a/packages/admin-next/dashboard/src/components/route-modal/route-drawer/route-drawer.tsx b/packages/admin-next/dashboard/src/components/modals/route-drawer/route-drawer.tsx
similarity index 62%
rename from packages/admin-next/dashboard/src/components/route-modal/route-drawer/route-drawer.tsx
rename to packages/admin-next/dashboard/src/components/modals/route-drawer/route-drawer.tsx
index cad73d9589..cf88f6d5b7 100644
--- a/packages/admin-next/dashboard/src/components/route-modal/route-drawer/route-drawer.tsx
+++ b/packages/admin-next/dashboard/src/components/modals/route-drawer/route-drawer.tsx
@@ -1,8 +1,9 @@
-import { Drawer } from "@medusajs/ui"
+import { Drawer, clx } from "@medusajs/ui"
 import { PropsWithChildren, useEffect, useState } from "react"
 import { useNavigate } from "react-router-dom"
-import { RouteForm } from "../route-form"
+import { RouteModalForm } from "../route-modal-form"
 import { RouteModalProvider } from "../route-modal-provider/route-provider"
+import { StackedModalProvider } from "../stacked-modal-provider"
 
 type RouteDrawerProps = PropsWithChildren<{
   prev?: string
@@ -11,6 +12,7 @@ type RouteDrawerProps = PropsWithChildren<{
 const Root = ({ prev = "..", children }: RouteDrawerProps) => {
   const navigate = useNavigate()
   const [open, setOpen] = useState(false)
+  const [stackedModalOpen, onStackedModalOpen] = useState(false)
 
   /**
    * Open the modal when the component mounts. This
@@ -18,6 +20,11 @@ const Root = ({ prev = "..", children }: RouteDrawerProps) => {
    */
   useEffect(() => {
     setOpen(true)
+
+    return () => {
+      setOpen(false)
+      onStackedModalOpen(false)
+    }
   }, [])
 
   const handleOpenChange = (open: boolean) => {
@@ -33,17 +40,27 @@ const Root = ({ prev = "..", children }: RouteDrawerProps) => {
   return (
     <Drawer open={open} onOpenChange={handleOpenChange}>
       <RouteModalProvider prev={prev}>
-        <Drawer.Content>{children}</Drawer.Content>
+        <StackedModalProvider onOpenChange={onStackedModalOpen}>
+          <Drawer.Content
+            className={clx({
+              "!bg-ui-bg-disabled !inset-y-5 !right-5": stackedModalOpen,
+            })}
+          >
+            {children}
+          </Drawer.Content>
+        </StackedModalProvider>
       </RouteModalProvider>
     </Drawer>
   )
 }
 
 const Header = Drawer.Header
+const Title = Drawer.Title
+const Description = Drawer.Description
 const Body = Drawer.Body
 const Footer = Drawer.Footer
 const Close = Drawer.Close
-const Form = RouteForm
+const Form = RouteModalForm
 
 /**
  * Drawer that is used to render a form on a separate route.
@@ -52,7 +69,9 @@ const Form = RouteForm
  */
 export const RouteDrawer = Object.assign(Root, {
   Header,
+  Title,
   Body,
+  Description,
   Footer,
   Close,
   Form,
diff --git a/packages/admin-next/dashboard/src/components/route-modal/route-focus-modal/index.ts b/packages/admin-next/dashboard/src/components/modals/route-focus-modal/index.ts
similarity index 100%
rename from packages/admin-next/dashboard/src/components/route-modal/route-focus-modal/index.ts
rename to packages/admin-next/dashboard/src/components/modals/route-focus-modal/index.ts
diff --git a/packages/admin-next/dashboard/src/components/route-modal/route-focus-modal/route-focus-modal.tsx b/packages/admin-next/dashboard/src/components/modals/route-focus-modal/route-focus-modal.tsx
similarity index 61%
rename from packages/admin-next/dashboard/src/components/route-modal/route-focus-modal/route-focus-modal.tsx
rename to packages/admin-next/dashboard/src/components/modals/route-focus-modal/route-focus-modal.tsx
index 006dbdaa61..f8443ae139 100644
--- a/packages/admin-next/dashboard/src/components/route-modal/route-focus-modal/route-focus-modal.tsx
+++ b/packages/admin-next/dashboard/src/components/modals/route-focus-modal/route-focus-modal.tsx
@@ -1,8 +1,9 @@
-import { FocusModal } from "@medusajs/ui"
+import { FocusModal, clx } from "@medusajs/ui"
 import { PropsWithChildren, useEffect, useState } from "react"
 import { useNavigate } from "react-router-dom"
-import { RouteForm } from "../route-form"
+import { RouteModalForm } from "../route-modal-form"
 import { RouteModalProvider } from "../route-modal-provider/route-provider"
+import { StackedModalProvider } from "../stacked-modal-provider"
 
 type RouteFocusModalProps = PropsWithChildren<{
   prev?: string
@@ -11,6 +12,7 @@ type RouteFocusModalProps = PropsWithChildren<{
 const Root = ({ prev = "..", children }: RouteFocusModalProps) => {
   const navigate = useNavigate()
   const [open, setOpen] = useState(false)
+  const [stackedModalOpen, onStackedModalOpen] = useState(false)
 
   /**
    * Open the modal when the component mounts. This
@@ -18,6 +20,11 @@ const Root = ({ prev = "..", children }: RouteFocusModalProps) => {
    */
   useEffect(() => {
     setOpen(true)
+
+    return () => {
+      setOpen(false)
+      onStackedModalOpen(false)
+    }
   }, [])
 
   const handleOpenChange = (open: boolean) => {
@@ -33,16 +40,27 @@ const Root = ({ prev = "..", children }: RouteFocusModalProps) => {
   return (
     <FocusModal open={open} onOpenChange={handleOpenChange}>
       <RouteModalProvider prev={prev}>
-        <FocusModal.Content>{children}</FocusModal.Content>
+        <StackedModalProvider onOpenChange={onStackedModalOpen}>
+          <FocusModal.Content
+            className={clx({
+              "!bg-ui-bg-disabled !inset-x-5 !inset-y-3": stackedModalOpen,
+            })}
+          >
+            {children}
+          </FocusModal.Content>
+        </StackedModalProvider>
       </RouteModalProvider>
     </FocusModal>
   )
 }
 
 const Header = FocusModal.Header
+const Title = FocusModal.Title
+const Description = FocusModal.Description
+const Footer = FocusModal.Footer
 const Body = FocusModal.Body
 const Close = FocusModal.Close
-const Form = RouteForm
+const Form = RouteModalForm
 
 /**
  * FocusModal that is used to render a form on a separate route.
@@ -52,7 +70,10 @@ const Form = RouteForm
  */
 export const RouteFocusModal = Object.assign(Root, {
   Header,
+  Title,
   Body,
+  Description,
+  Footer,
   Close,
   Form,
 })
diff --git a/packages/admin-next/dashboard/src/components/modals/route-modal-form/index.ts b/packages/admin-next/dashboard/src/components/modals/route-modal-form/index.ts
new file mode 100644
index 0000000000..0e1450edaf
--- /dev/null
+++ b/packages/admin-next/dashboard/src/components/modals/route-modal-form/index.ts
@@ -0,0 +1 @@
+export * from "./route-modal-form"
diff --git a/packages/admin-next/dashboard/src/components/route-modal/route-form/route-form.tsx b/packages/admin-next/dashboard/src/components/modals/route-modal-form/route-modal-form.tsx
similarity index 90%
rename from packages/admin-next/dashboard/src/components/route-modal/route-form/route-form.tsx
rename to packages/admin-next/dashboard/src/components/modals/route-modal-form/route-modal-form.tsx
index d008ae115c..8fbc01fa46 100644
--- a/packages/admin-next/dashboard/src/components/route-modal/route-form/route-form.tsx
+++ b/packages/admin-next/dashboard/src/components/modals/route-modal-form/route-modal-form.tsx
@@ -5,16 +5,16 @@ import { useTranslation } from "react-i18next"
 import { useBlocker } from "react-router-dom"
 import { Form } from "../../common/form"
 
-type RouteFormProps<TFieldValues extends FieldValues> = PropsWithChildren<{
+type RouteModalFormProps<TFieldValues extends FieldValues> = PropsWithChildren<{
   form: UseFormReturn<TFieldValues>
   blockSearch?: boolean
 }>
 
-export const RouteForm = <TFieldValues extends FieldValues = any>({
+export const RouteModalForm = <TFieldValues extends FieldValues = any>({
   form,
   blockSearch = false,
   children,
-}: RouteFormProps<TFieldValues>) => {
+}: RouteModalFormProps<TFieldValues>) => {
   const { t } = useTranslation()
 
   const {
diff --git a/packages/admin-next/dashboard/src/components/modals/route-modal-provider/index.ts b/packages/admin-next/dashboard/src/components/modals/route-modal-provider/index.ts
new file mode 100644
index 0000000000..f819a0196d
--- /dev/null
+++ b/packages/admin-next/dashboard/src/components/modals/route-modal-provider/index.ts
@@ -0,0 +1,2 @@
+export * from "./route-provider"
+export * from "./use-route-modal"
diff --git a/packages/admin-next/dashboard/src/components/modals/route-modal-provider/route-modal-context.tsx b/packages/admin-next/dashboard/src/components/modals/route-modal-provider/route-modal-context.tsx
new file mode 100644
index 0000000000..1f4fe25f0a
--- /dev/null
+++ b/packages/admin-next/dashboard/src/components/modals/route-modal-provider/route-modal-context.tsx
@@ -0,0 +1,8 @@
+import { createContext } from "react"
+
+type RouteModalProviderState = {
+  handleSuccess: (path?: string) => void
+}
+
+export const RouteModalProviderContext =
+  createContext<RouteModalProviderState | null>(null)
diff --git a/packages/admin-next/dashboard/src/components/route-modal/route-modal-provider/route-provider.tsx b/packages/admin-next/dashboard/src/components/modals/route-modal-provider/route-provider.tsx
similarity index 53%
rename from packages/admin-next/dashboard/src/components/route-modal/route-modal-provider/route-provider.tsx
rename to packages/admin-next/dashboard/src/components/modals/route-modal-provider/route-provider.tsx
index 84d8664944..b1b353431f 100644
--- a/packages/admin-next/dashboard/src/components/route-modal/route-modal-provider/route-provider.tsx
+++ b/packages/admin-next/dashboard/src/components/modals/route-modal-provider/route-provider.tsx
@@ -1,22 +1,6 @@
-import { PropsWithChildren, createContext, useContext } from "react"
+import { PropsWithChildren } from "react"
 import { useNavigate } from "react-router-dom"
-
-type RouteModalProviderContextType = {
-  handleSuccess: (path?: string) => void
-}
-
-const RouteModalProviderContext =
-  createContext<RouteModalProviderContextType | null>(null)
-
-export const useRouteModal = () => {
-  const context = useContext(RouteModalProviderContext)
-
-  if (!context) {
-    throw new Error("useRouteModal must be used within a RouteModalProvider")
-  }
-
-  return context
-}
+import { RouteModalProviderContext } from "./route-modal-context"
 
 type RouteModalProviderProps = PropsWithChildren<{
   prev: string
diff --git a/packages/admin-next/dashboard/src/components/modals/route-modal-provider/use-route-modal.tsx b/packages/admin-next/dashboard/src/components/modals/route-modal-provider/use-route-modal.tsx
new file mode 100644
index 0000000000..04dad573aa
--- /dev/null
+++ b/packages/admin-next/dashboard/src/components/modals/route-modal-provider/use-route-modal.tsx
@@ -0,0 +1,12 @@
+import { useContext } from "react"
+import { RouteModalProviderContext } from "./route-modal-context"
+
+export const useRouteModal = () => {
+  const context = useContext(RouteModalProviderContext)
+
+  if (!context) {
+    throw new Error("useRouteModal must be used within a RouteModalProvider")
+  }
+
+  return context
+}
diff --git a/packages/admin-next/dashboard/src/components/modals/stacked-drawer/index.ts b/packages/admin-next/dashboard/src/components/modals/stacked-drawer/index.ts
new file mode 100644
index 0000000000..2467d18d3b
--- /dev/null
+++ b/packages/admin-next/dashboard/src/components/modals/stacked-drawer/index.ts
@@ -0,0 +1 @@
+export * from "./stacked-drawer"
diff --git a/packages/admin-next/dashboard/src/components/modals/stacked-drawer/stacked-drawer.tsx b/packages/admin-next/dashboard/src/components/modals/stacked-drawer/stacked-drawer.tsx
new file mode 100644
index 0000000000..9c3c2091fd
--- /dev/null
+++ b/packages/admin-next/dashboard/src/components/modals/stacked-drawer/stacked-drawer.tsx
@@ -0,0 +1,85 @@
+import { Drawer, clx } from "@medusajs/ui"
+import {
+  ComponentPropsWithoutRef,
+  PropsWithChildren,
+  forwardRef,
+  useEffect,
+} from "react"
+import { useStackedModal } from "../stacked-modal-provider"
+
+type StackedDrawerProps = PropsWithChildren<{
+  /**
+   * A unique identifier for the modal. This is used to differentiate stacked modals,
+   * when multiple stacked modals are registered to the same parent modal.
+   */
+  id: string
+}>
+
+/**
+ * A stacked modal that can be rendered above a parent modal.
+ */
+export const Root = ({ id, children }: StackedDrawerProps) => {
+  const { register, unregister, getIsOpen, setIsOpen } = useStackedModal()
+
+  useEffect(() => {
+    register(id)
+
+    return () => unregister(id)
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [])
+
+  return (
+    <Drawer open={getIsOpen(id)} onOpenChange={(open) => setIsOpen(id, open)}>
+      {children}
+    </Drawer>
+  )
+}
+
+const Close = Drawer.Close
+Close.displayName = "StackedDrawer.Close"
+
+const Header = Drawer.Header
+Header.displayName = "StackedDrawer.Header"
+
+const Body = Drawer.Body
+Body.displayName = "StackedDrawer.Body"
+
+const Trigger = Drawer.Trigger
+Trigger.displayName = "StackedDrawer.Trigger"
+
+const Footer = Drawer.Footer
+Footer.displayName = "StackedDrawer.Footer"
+
+const Title = Drawer.Title
+Title.displayName = "StackedDrawer.Title"
+
+const Description = Drawer.Description
+Description.displayName = "StackedDrawer.Description"
+
+const Content = forwardRef<
+  HTMLDivElement,
+  ComponentPropsWithoutRef<typeof Drawer.Content>
+>(({ className, ...props }, ref) => {
+  return (
+    <Drawer.Content
+      ref={ref}
+      className={clx(className)}
+      overlayProps={{
+        className: "bg-transparent",
+      }}
+      {...props}
+    />
+  )
+})
+Content.displayName = "StackedDrawer.Content"
+
+export const StackedDrawer = Object.assign(Root, {
+  Close,
+  Header,
+  Body,
+  Content,
+  Trigger,
+  Footer,
+  Description,
+  Title,
+})
diff --git a/packages/admin-next/dashboard/src/components/modals/stacked-focus-modal/index.ts b/packages/admin-next/dashboard/src/components/modals/stacked-focus-modal/index.ts
new file mode 100644
index 0000000000..e130e6356a
--- /dev/null
+++ b/packages/admin-next/dashboard/src/components/modals/stacked-focus-modal/index.ts
@@ -0,0 +1 @@
+export * from "./stacked-foucs-modal"
diff --git a/packages/admin-next/dashboard/src/components/modals/stacked-focus-modal/stacked-foucs-modal.tsx b/packages/admin-next/dashboard/src/components/modals/stacked-focus-modal/stacked-foucs-modal.tsx
new file mode 100644
index 0000000000..9ab5f35190
--- /dev/null
+++ b/packages/admin-next/dashboard/src/components/modals/stacked-focus-modal/stacked-foucs-modal.tsx
@@ -0,0 +1,88 @@
+import { FocusModal, clx } from "@medusajs/ui"
+import {
+  ComponentPropsWithoutRef,
+  PropsWithChildren,
+  forwardRef,
+  useEffect,
+} from "react"
+import { useStackedModal } from "../stacked-modal-provider"
+
+type StackedFocusModalProps = PropsWithChildren<{
+  /**
+   * A unique identifier for the modal. This is used to differentiate stacked modals,
+   * when multiple stacked modals are registered to the same parent modal.
+   */
+  id: string
+}>
+
+/**
+ * A stacked modal that can be rendered above a parent modal.
+ */
+export const Root = ({ id, children }: StackedFocusModalProps) => {
+  const { register, unregister, getIsOpen, setIsOpen } = useStackedModal()
+
+  useEffect(() => {
+    register(id)
+
+    return () => unregister(id)
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [])
+
+  return (
+    <FocusModal
+      open={getIsOpen(id)}
+      onOpenChange={(open) => setIsOpen(id, open)}
+    >
+      {children}
+    </FocusModal>
+  )
+}
+
+const Close = FocusModal.Close
+Close.displayName = "StackedFocusModal.Close"
+
+const Header = FocusModal.Header
+Header.displayName = "StackedFocusModal.Header"
+
+const Body = FocusModal.Body
+Body.displayName = "StackedFocusModal.Body"
+
+const Trigger = FocusModal.Trigger
+Trigger.displayName = "StackedFocusModal.Trigger"
+
+const Footer = FocusModal.Footer
+Footer.displayName = "StackedFocusModal.Footer"
+
+const Title = FocusModal.Title
+Title.displayName = "StackedFocusModal.Title"
+
+const Description = FocusModal.Description
+Description.displayName = "StackedFocusModal.Description"
+
+const Content = forwardRef<
+  HTMLDivElement,
+  ComponentPropsWithoutRef<typeof FocusModal.Content>
+>(({ className, ...props }, ref) => {
+  return (
+    <FocusModal.Content
+      ref={ref}
+      className={clx("top-6", className)}
+      overlayProps={{
+        className: "bg-transparent",
+      }}
+      {...props}
+    />
+  )
+})
+Content.displayName = "StackedFocusModal.Content"
+
+export const StackedFocusModal = Object.assign(Root, {
+  Close,
+  Header,
+  Body,
+  Content,
+  Trigger,
+  Footer,
+  Description,
+  Title,
+})
diff --git a/packages/admin-next/dashboard/src/components/modals/stacked-modal-provider/index.ts b/packages/admin-next/dashboard/src/components/modals/stacked-modal-provider/index.ts
new file mode 100644
index 0000000000..998c3fbab9
--- /dev/null
+++ b/packages/admin-next/dashboard/src/components/modals/stacked-modal-provider/index.ts
@@ -0,0 +1,2 @@
+export * from "./stacked-modal-provider"
+export * from "./use-stacked-modal"
diff --git a/packages/admin-next/dashboard/src/components/modals/stacked-modal-provider/stacked-modal-context.tsx b/packages/admin-next/dashboard/src/components/modals/stacked-modal-provider/stacked-modal-context.tsx
new file mode 100644
index 0000000000..ebd50944d6
--- /dev/null
+++ b/packages/admin-next/dashboard/src/components/modals/stacked-modal-provider/stacked-modal-context.tsx
@@ -0,0 +1,10 @@
+import { createContext } from "react"
+
+type StackedModalState = {
+  getIsOpen: (id: string) => boolean
+  setIsOpen: (id: string, open: boolean) => void
+  register: (id: string) => void
+  unregister: (id: string) => void
+}
+
+export const StackedModalContext = createContext<StackedModalState | null>(null)
diff --git a/packages/admin-next/dashboard/src/components/modals/stacked-modal-provider/stacked-modal-provider.tsx b/packages/admin-next/dashboard/src/components/modals/stacked-modal-provider/stacked-modal-provider.tsx
new file mode 100644
index 0000000000..ca3799cc4a
--- /dev/null
+++ b/packages/admin-next/dashboard/src/components/modals/stacked-modal-provider/stacked-modal-provider.tsx
@@ -0,0 +1,54 @@
+import { PropsWithChildren, useState } from "react"
+import { StackedModalContext } from "./stacked-modal-context"
+
+type StackedModalProviderProps = PropsWithChildren<{
+  onOpenChange: (open: boolean) => void
+}>
+
+export const StackedModalProvider = ({
+  children,
+  onOpenChange,
+}: StackedModalProviderProps) => {
+  const [state, setState] = useState<Record<string, boolean>>({})
+
+  const getIsOpen = (id: string) => {
+    return state[id] || false
+  }
+
+  const setIsOpen = (id: string, open: boolean) => {
+    setState((prevState) => ({
+      ...prevState,
+      [id]: open,
+    }))
+
+    onOpenChange(open)
+  }
+
+  const register = (id: string) => {
+    setState((prevState) => ({
+      ...prevState,
+      [id]: false,
+    }))
+  }
+
+  const unregister = (id: string) => {
+    setState((prevState) => {
+      const newState = { ...prevState }
+      delete newState[id]
+      return newState
+    })
+  }
+
+  return (
+    <StackedModalContext.Provider
+      value={{
+        getIsOpen,
+        setIsOpen,
+        register,
+        unregister,
+      }}
+    >
+      {children}
+    </StackedModalContext.Provider>
+  )
+}
diff --git a/packages/admin-next/dashboard/src/components/modals/stacked-modal-provider/use-stacked-modal.ts b/packages/admin-next/dashboard/src/components/modals/stacked-modal-provider/use-stacked-modal.ts
new file mode 100644
index 0000000000..f246c0d065
--- /dev/null
+++ b/packages/admin-next/dashboard/src/components/modals/stacked-modal-provider/use-stacked-modal.ts
@@ -0,0 +1,14 @@
+import { useContext } from "react"
+import { StackedModalContext } from "./stacked-modal-context"
+
+export const useStackedModal = () => {
+  const context = useContext(StackedModalContext)
+
+  if (!context) {
+    throw new Error(
+      "useStackedModal must be used within a StackedModalProvider"
+    )
+  }
+
+  return context
+}
diff --git a/packages/admin-next/dashboard/src/components/route-modal/index.ts b/packages/admin-next/dashboard/src/components/route-modal/index.ts
deleted file mode 100644
index 2122e387de..0000000000
--- a/packages/admin-next/dashboard/src/components/route-modal/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { RouteDrawer } from "./route-drawer"
-export { RouteFocusModal } from "./route-focus-modal"
-export { useRouteModal } from "./route-modal-provider"
diff --git a/packages/admin-next/dashboard/src/components/route-modal/route-form/index.ts b/packages/admin-next/dashboard/src/components/route-modal/route-form/index.ts
deleted file mode 100644
index 684d9b013c..0000000000
--- a/packages/admin-next/dashboard/src/components/route-modal/route-form/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./route-form"
diff --git a/packages/admin-next/dashboard/src/components/route-modal/route-modal-provider/index.ts b/packages/admin-next/dashboard/src/components/route-modal/route-modal-provider/index.ts
deleted file mode 100644
index 0caf0a36b0..0000000000
--- a/packages/admin-next/dashboard/src/components/route-modal/route-modal-provider/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./route-provider"
diff --git a/packages/admin-next/dashboard/src/components/table/data-table/data-table-search/data-table-search.tsx b/packages/admin-next/dashboard/src/components/table/data-table/data-table-search/data-table-search.tsx
index f1bdb01027..763aa1dadd 100644
--- a/packages/admin-next/dashboard/src/components/table/data-table/data-table-search/data-table-search.tsx
+++ b/packages/admin-next/dashboard/src/components/table/data-table/data-table-search/data-table-search.tsx
@@ -46,6 +46,7 @@ export const DataTableSearch = ({
 
   return (
     <Input
+      autoComplete="off"
       name="q"
       type="search"
       size="small"
diff --git a/packages/admin-next/dashboard/src/hooks/api/customer-groups.tsx b/packages/admin-next/dashboard/src/hooks/api/customer-groups.tsx
index e08defc2a7..1fe62ff874 100644
--- a/packages/admin-next/dashboard/src/hooks/api/customer-groups.tsx
+++ b/packages/admin-next/dashboard/src/hooks/api/customer-groups.tsx
@@ -1,3 +1,4 @@
+import { HttpTypes, PaginatedResponse } from "@medusajs/types"
 import {
   QueryKey,
   UseMutationOptions,
@@ -12,7 +13,6 @@ import { queryKeysFactory } from "../../lib/query-key-factory"
 import { CreateCustomerGroupSchema } from "../../routes/customer-groups/customer-group-create/components/create-customer-group-form"
 import { EditCustomerGroupSchema } from "../../routes/customer-groups/customer-group-edit/components/edit-customer-group-form"
 import { customersQueryKeys } from "./customers"
-import { HttpTypes, PaginatedResponse } from "@medusajs/types"
 
 const CUSTOMER_GROUPS_QUERY_KEY = "customer_groups" as const
 export const customerGroupsQueryKeys = queryKeysFactory(
@@ -45,9 +45,9 @@ export const useCustomerGroups = (
   query?: Record<string, any>,
   options?: Omit<
     UseQueryOptions<
-      PaginatedResponse<HttpTypes.AdminCustomerGroup[]>,
+      PaginatedResponse<{ customer_groups: HttpTypes.AdminCustomerGroup[] }>,
       Error,
-      PaginatedResponse<HttpTypes.AdminCustomerGroup[]>,
+      PaginatedResponse<{ customer_groups: HttpTypes.AdminCustomerGroup[] }>,
       QueryKey
     >,
     "queryFn" | "queryKey"
diff --git a/packages/admin-next/dashboard/src/hooks/api/price-lists.tsx b/packages/admin-next/dashboard/src/hooks/api/price-lists.tsx
index afa00d6a37..a73aca7459 100644
--- a/packages/admin-next/dashboard/src/hooks/api/price-lists.tsx
+++ b/packages/admin-next/dashboard/src/hooks/api/price-lists.tsx
@@ -7,20 +7,10 @@ import {
   useMutation,
   useQuery,
 } from "@tanstack/react-query"
-import { client, sdk } from "../../lib/client"
+import { sdk } from "../../lib/client"
 import { queryClient } from "../../lib/query-client"
 import { queryKeysFactory } from "../../lib/query-key-factory"
-import {
-  AddPriceListPricesReq,
-  CreatePriceListReq,
-  DeletePriceListPricesReq,
-  UpdatePriceListReq,
-} from "../../types/api-payloads"
-import {
-  PriceListDeleteRes,
-  PriceListListRes,
-  PriceListRes,
-} from "../../types/api-responses"
+import { customerGroupsQueryKeys } from "./customer-groups"
 import { productsQueryKeys } from "./products"
 
 const PRICE_LISTS_QUERY_KEY = "price-lists" as const
@@ -28,14 +18,19 @@ export const priceListsQueryKeys = queryKeysFactory(PRICE_LISTS_QUERY_KEY)
 
 export const usePriceList = (
   id: string,
-  query?: Record<string, any>,
+  query?: HttpTypes.AdminPriceListListParams,
   options?: Omit<
-    UseQueryOptions<PriceListRes, Error, PriceListRes, QueryKey>,
+    UseQueryOptions<
+      HttpTypes.AdminPriceListResponse,
+      FetchError,
+      HttpTypes.AdminPriceListResponse,
+      QueryKey
+    >,
     "queryKey" | "queryFn"
   >
 ) => {
   const { data, ...rest } = useQuery({
-    queryFn: () => client.priceLists.retrieve(id, query),
+    queryFn: () => sdk.admin.priceList.retrieve(id, query),
     queryKey: priceListsQueryKeys.detail(id),
     ...options,
   })
@@ -44,14 +39,19 @@ export const usePriceList = (
 }
 
 export const usePriceLists = (
-  query?: Record<string, any>,
+  query?: HttpTypes.AdminPriceListListParams,
   options?: Omit<
-    UseQueryOptions<PriceListListRes, Error, PriceListListRes, QueryKey>,
+    UseQueryOptions<
+      HttpTypes.AdminPriceListListResponse,
+      FetchError,
+      HttpTypes.AdminPriceListListResponse,
+      QueryKey
+    >,
     "queryKey" | "queryFn"
   >
 ) => {
   const { data, ...rest } = useQuery({
-    queryFn: () => client.priceLists.list(query),
+    queryFn: () => sdk.admin.priceList.list(query),
     queryKey: priceListsQueryKeys.list(query),
     ...options,
   })
@@ -60,13 +60,20 @@ export const usePriceLists = (
 }
 
 export const useCreatePriceList = (
-  options?: UseMutationOptions<PriceListRes, Error, CreatePriceListReq>
+  query?: HttpTypes.AdminPriceListParams,
+  options?: UseMutationOptions<
+    HttpTypes.AdminPriceListResponse,
+    FetchError,
+    HttpTypes.AdminCreatePriceList
+  >
 ) => {
   return useMutation({
-    mutationFn: (payload) => client.priceLists.create(payload),
+    mutationFn: (payload) => sdk.admin.priceList.create(payload, query),
     onSuccess: (data, variables, context) => {
       queryClient.invalidateQueries({ queryKey: priceListsQueryKeys.list() })
 
+      queryClient.invalidateQueries({ queryKey: customerGroupsQueryKeys.all })
+
       options?.onSuccess?.(data, variables, context)
     },
     ...options,
@@ -75,16 +82,23 @@ export const useCreatePriceList = (
 
 export const useUpdatePriceList = (
   id: string,
-  options?: UseMutationOptions<PriceListRes, Error, UpdatePriceListReq>
+  query?: HttpTypes.AdminPriceListParams,
+  options?: UseMutationOptions<
+    HttpTypes.AdminPriceListResponse,
+    FetchError,
+    HttpTypes.AdminUpdatePriceList
+  >
 ) => {
   return useMutation({
-    mutationFn: (payload) => client.priceLists.update(id, payload),
+    mutationFn: (payload) => sdk.admin.priceList.update(id, payload, query),
     onSuccess: (data, variables, context) => {
       queryClient.invalidateQueries({ queryKey: priceListsQueryKeys.list() })
       queryClient.invalidateQueries({
         queryKey: priceListsQueryKeys.detail(id),
       })
 
+      queryClient.invalidateQueries({ queryKey: customerGroupsQueryKeys.all })
+
       options?.onSuccess?.(data, variables, context)
     },
     ...options,
@@ -93,10 +107,14 @@ export const useUpdatePriceList = (
 
 export const useDeletePriceList = (
   id: string,
-  options?: UseMutationOptions<PriceListDeleteRes, Error, void>
+  options?: UseMutationOptions<
+    HttpTypes.AdminPriceListDeleteResponse,
+    FetchError,
+    void
+  >
 ) => {
   return useMutation({
-    mutationFn: () => client.priceLists.delete(id),
+    mutationFn: () => sdk.admin.priceList.delete(id),
     onSuccess: (data, variables, context) => {
       queryClient.invalidateQueries({ queryKey: priceListsQueryKeys.list() })
 
@@ -106,17 +124,22 @@ export const useDeletePriceList = (
   })
 }
 
-export const usePriceListAddPrices = (
+export const useBatchPriceListPrices = (
   id: string,
-  options?: UseMutationOptions<PriceListRes, Error, AddPriceListPricesReq>
+  query?: HttpTypes.AdminPriceListParams,
+  options?: UseMutationOptions<
+    HttpTypes.AdminPriceListResponse,
+    FetchError,
+    HttpTypes.AdminBatchPriceListPrice
+  >
 ) => {
   return useMutation({
-    mutationFn: (payload) => client.priceLists.addPrices(id, payload),
+    mutationFn: (payload) =>
+      sdk.admin.priceList.batchPrices(id, payload, query),
     onSuccess: (data, variables, context) => {
       queryClient.invalidateQueries({
         queryKey: priceListsQueryKeys.detail(id),
       })
-      queryClient.invalidateQueries({ queryKey: priceListsQueryKeys.lists() })
       queryClient.invalidateQueries({ queryKey: productsQueryKeys.lists() })
 
       options?.onSuccess?.(data, variables, context)
@@ -125,24 +148,6 @@ export const usePriceListAddPrices = (
   })
 }
 
-export const usePriceListRemovePrices = (
-  id: string,
-  options?: UseMutationOptions<PriceListRes, Error, DeletePriceListPricesReq>
-) => {
-  return useMutation({
-    mutationFn: (payload) => client.priceLists.removePrices(id, payload),
-    onSuccess: (data, variables, context) => {
-      queryClient.invalidateQueries({
-        queryKey: priceListsQueryKeys.detail(id),
-      })
-      queryClient.invalidateQueries({ queryKey: priceListsQueryKeys.lists() })
-
-      options?.onSuccess?.(data, variables, context)
-    },
-    ...options,
-  })
-}
-
 export const usePriceListLinkProducts = (
   id: string,
   options?: UseMutationOptions<
diff --git a/packages/admin-next/dashboard/src/hooks/api/store.tsx b/packages/admin-next/dashboard/src/hooks/api/store.tsx
index 2e251e02d3..7bd3465e67 100644
--- a/packages/admin-next/dashboard/src/hooks/api/store.tsx
+++ b/packages/admin-next/dashboard/src/hooks/api/store.tsx
@@ -6,23 +6,46 @@ import {
   useQuery,
 } from "@tanstack/react-query"
 
-import { client } from "../../lib/client"
+import { FetchError } from "@medusajs/js-sdk"
+import { HttpTypes } from "@medusajs/types"
+import { sdk } from "../../lib/client"
 import { queryClient } from "../../lib/query-client"
 import { queryKeysFactory } from "../../lib/query-key-factory"
-import { UpdateStoreReq } from "../../types/api-payloads"
-import { StoreRes } from "../../types/api-responses"
 
 const STORE_QUERY_KEY = "store" as const
 export const storeQueryKeys = queryKeysFactory(STORE_QUERY_KEY)
 
+/**
+ * Workaround to keep the V1 version of retrieving the store.
+ */
+async function retrieveActiveStore(
+  query?: HttpTypes.AdminStoreParams
+): Promise<HttpTypes.AdminStoreResponse> {
+  const response = await sdk.admin.store.list(query)
+
+  const activeStore = response.stores?.[0]
+
+  if (!activeStore) {
+    throw new FetchError("No active store found", "Not Found", 404)
+  }
+
+  return { store: activeStore }
+}
+
 export const useStore = (
+  query?: Record<string, any>,
   options?: Omit<
-    UseQueryOptions<StoreRes, Error, StoreRes, QueryKey>,
+    UseQueryOptions<
+      HttpTypes.AdminStoreResponse,
+      FetchError,
+      HttpTypes.AdminStoreResponse,
+      QueryKey
+    >,
     "queryFn" | "queryKey"
   >
 ) => {
   const { data, ...rest } = useQuery({
-    queryFn: () => client.stores.retrieve(),
+    queryFn: () => retrieveActiveStore(query),
     queryKey: storeQueryKeys.details(),
     ...options,
   })
@@ -35,10 +58,14 @@ export const useStore = (
 
 export const useUpdateStore = (
   id: string,
-  options?: MutationOptions<StoreRes, Error, UpdateStoreReq>
+  options?: MutationOptions<
+    HttpTypes.AdminStoreResponse,
+    FetchError,
+    HttpTypes.AdminUpdateStore
+  >
 ) => {
   return useMutation({
-    mutationFn: (payload) => client.stores.update(id, payload),
+    mutationFn: (payload) => sdk.admin.store.update(id, payload),
     onSuccess: (data, variables, context) => {
       queryClient.invalidateQueries({ queryKey: storeQueryKeys.details() })
       options?.onSuccess?.(data, variables, context)
diff --git a/packages/admin-next/dashboard/src/i18n/translations/en.json b/packages/admin-next/dashboard/src/i18n/translations/en.json
index 73267e10a5..6c94142044 100644
--- a/packages/admin-next/dashboard/src/i18n/translations/en.json
+++ b/packages/admin-next/dashboard/src/i18n/translations/en.json
@@ -86,8 +86,12 @@
     "apply": "Apply",
     "add": "Add",
     "select": "Select",
+    "browse": "Browse",
     "logout": "Logout"
   },
+  "operators": {
+    "in": "In"
+  },
   "app": {
     "search": {
       "allAreas": "All areas",
@@ -1295,61 +1299,96 @@
     "deleteCampaignWarning": "You are about to delete the campaign {{name}}. This action cannot be undone.",
     "totalSpend": "<0>{{amount}}</0> <1>{{currency}}</1>"
   },
-  "pricing": {
-    "domain": "Pricing",
+  "priceLists": {
+    "domain": "Price Lists",
+    "delete": {
+      "confirmation": "You are about to delete the price list {{title}}. This action cannot be undone.",
+      "successToast": "Price list {{title}} was successfully deleted."
+    },
     "create": {
       "header": "Create Price List",
-      "hint": "Create a new price list to manage the prices of your products."
+      "subheader": "Create a new price list to manage the prices of your products.",
+      "tabs": {
+        "details": "Details",
+        "products": "Products",
+        "prices": "Prices"
+      },
+      "successToast": "Price list {{title}} was successfully created."
     },
     "edit": {
-      "header": "Edit Price List"
+      "header": "Edit Price List",
+      "successToast": "Price list {{title}} was successfully updated."
     },
     "configuration": {
       "header": "Configuration",
-      "editHeader": "Edit Price List Configuration"
-    },
-    "warnings": {
-      "delete": "You are about to delete the price list {{name}}. This action cannot be undone."
-    },
-    "status": {
-      "draft": "Draft",
-      "expired": "Expired",
-      "active": "Active",
-      "scheduled": "Scheduled"
-    },
-    "type": {
-      "sale": "Sale",
-      "override": "Override"
+      "edit": {
+        "header": "Edit Price List Configuration",
+        "description": "Edit the configuration of the price list.",
+        "successToast": "Price list configuration was successfully updated."
+      }
     },
     "products": {
-      "deleteProductsPricesWarning": "You are about to delete all prices of {{count}} product(s). This action cannot be undone."
-    },
-    "prices": {
-      "addPrices": "Add prices",
-      "editPrices": "Edit prices"
-    },
-    "table": {
-      "pricesHeader": "Prices"
+      "header": "Products",
+      "actions": {
+        "addProducts": "Add products",
+        "editPrices": "Edit prices"
+      },
+      "delete": {
+        "confirmation_one": "You are about to delete the prices for {{count}} product in the price list. This action cannot be undone.",
+        "confirmation_other": "You are about to delete the prices for {{count}} products in the price list. This action cannot be undone.",
+        "successToast_one": "Successfully deleted prices for {{count}} product.",
+        "successToast_other": "Successfully deleted prices for {{count}} products."
+      },
+      "add": {
+        "successToast": "Prices were successfully added to the price list."
+      },
+      "edit": {
+        "successToast": "Prices were successfully updated."
+      }
     },
     "fields": {
-      "statusTooltip": "Status can also be expired or scheduled depending on the start and end date.",
-      "typeHint": "Choose the type of price you want to create.",
-      "statusHint": "Choose if price should be published to users",
-      "draftTypeHint": "Prices will not be visible to users in a draft state",
-      "activeTypeHint": "Prices are visibile to users in an active state",
-      "saleTypeHint": "Sale prices are temporary price changes for products.",
-      "overrideTypeHint": "Overrides are usually used to create customer-specific prices.",
-      "startDateLabel": "Price list has a start date?",
-      "startDateHint": "Schedule the price list to activate in the future.",
-      "endDateLabel": "Price list has an expiry date?",
-      "endDateHint": "Schedule the price list to deactivate in the future.",
-      "customerAvailabilityLabel": "Customer availability",
-      "customerAvailabilityHint": "Choose which customer groups the price list should be applied to.",
-      "customerAvailabilityNoSelectionLabel": "No customer groups selected",
-      "priceOverridesLabel": "Price overrides"
-    },
-    "actions": {
-      "addCustomerGroups": "Add customer groups"
+      "priceOverrides": {
+        "label": "Price overrides",
+        "header": "Price Overrides"
+      },
+      "status": {
+        "label": "Status",
+        "options": {
+          "active": "Active",
+          "draft": "Draft",
+          "expired": "Expired",
+          "scheduled": "Scheduled"
+        }
+      },
+      "type": {
+        "label": "Type",
+        "hint": "Choose the type of price list you want to create.",
+        "options": {
+          "sale": {
+            "label": "Sale",
+            "description": "Sale prices are temporary price changes for products."
+          },
+          "override": {
+            "label": "Override",
+            "description": "Overrides are usually used to create customer-specific prices."
+          }
+        }
+      },
+      "startsAt": {
+        "label": "Price list has a start date?",
+        "hint": "Schedule the price list to activate in the future."
+      },
+      "endsAt": {
+        "label": "Price list has an expiry date?",
+        "hint": "Schedule the price list to deactivate in the future."
+      },
+      "customerAvailability": {
+        "header": "Choose customer groups",
+        "label": "Customer availability",
+        "hint": "Choose which customer groups the price list should be applied to.",
+        "placeholder": "Search for customer groups",
+        "attribute": "Customer groups"
+      }
     }
   },
   "profile": {
diff --git a/packages/admin-next/dashboard/src/providers/keybind-provider/hooks.tsx b/packages/admin-next/dashboard/src/providers/keybind-provider/hooks.tsx
index 0f7ebb1ad1..c6da202fa1 100644
--- a/packages/admin-next/dashboard/src/providers/keybind-provider/hooks.tsx
+++ b/packages/admin-next/dashboard/src/providers/keybind-provider/hooks.tsx
@@ -171,7 +171,7 @@ export const useGlobalShortcuts = () => {
       },
       label: t("app.keyboardShortcuts.goToPriceLists"),
       type: "pageShortcut",
-      callback: () => navigate("/pricing"),
+      callback: () => navigate("/price-lists"),
     },
     {
       keys: {
diff --git a/packages/admin-next/dashboard/src/providers/router-provider/route-map.tsx b/packages/admin-next/dashboard/src/providers/router-provider/route-map.tsx
index 7b6714b62d..2577816017 100644
--- a/packages/admin-next/dashboard/src/providers/router-provider/route-map.tsx
+++ b/packages/admin-next/dashboard/src/providers/router-provider/route-map.tsx
@@ -332,45 +332,51 @@ export const RouteMap: RouteObject[] = [
             ],
           },
           {
-            path: "/pricing",
+            path: "/price-lists",
             handle: {
-              crumb: () => "Pricing",
+              crumb: () => "Price Lists",
             },
             children: [
               {
                 path: "",
-                lazy: () => import("../../routes/pricing/pricing-list"),
+                lazy: () => import("../../routes/price-lists/price-list-list"),
                 children: [
                   {
                     path: "create",
-                    lazy: () => import("../../routes/pricing/pricing-create"),
+                    lazy: () =>
+                      import("../../routes/price-lists/price-list-create"),
                   },
                 ],
               },
               {
                 path: ":id",
-                lazy: () => import("../../routes/pricing/pricing-detail"),
+                lazy: () =>
+                  import("../../routes/price-lists/price-list-detail"),
                 handle: {
                   crumb: (data: PriceListRes) => data.price_list.title,
                 },
                 children: [
                   {
                     path: "edit",
-                    lazy: () => import("../../routes/pricing/pricing-edit"),
+                    lazy: () =>
+                      import("../../routes/price-lists/price-list-edit"),
                   },
                   {
                     path: "configuration",
                     lazy: () =>
-                      import("../../routes/pricing/pricing-configuration"),
+                      import(
+                        "../../routes/price-lists/price-list-configuration"
+                      ),
                   },
                   {
                     path: "products/add",
-                    lazy: () => import("../../routes/pricing/pricing-products"),
+                    lazy: () =>
+                      import("../../routes/price-lists/price-list-prices-add"),
                   },
                   {
                     path: "products/edit",
                     lazy: () =>
-                      import("../../routes/pricing/pricing-products-prices"),
+                      import("../../routes/price-lists/price-list-prices-edit"),
                   },
                 ],
               },
@@ -780,7 +786,8 @@ export const RouteMap: RouteObject[] = [
                   {
                     path: ":id",
                     handle: {
-                      crumb: (data) => data.shipping_profile.name,
+                      crumb: (data: HttpTypes.AdminShippingProfileResponse) =>
+                        data.shipping_profile.name,
                     },
                     lazy: () =>
                       import(
diff --git a/packages/admin-next/dashboard/src/providers/theme-provider/index.ts b/packages/admin-next/dashboard/src/providers/theme-provider/index.ts
index d12c36092f..17892d3c80 100644
--- a/packages/admin-next/dashboard/src/providers/theme-provider/index.ts
+++ b/packages/admin-next/dashboard/src/providers/theme-provider/index.ts
@@ -1,3 +1,3 @@
-export type { Theme } from "./theme-context";
-export * from "./theme-provider";
-export * from "./use-theme";
+export type { Theme } from "./theme-context"
+export * from "./theme-provider"
+export * from "./use-theme"
diff --git a/packages/admin-next/dashboard/src/providers/theme-provider/theme-provider.tsx b/packages/admin-next/dashboard/src/providers/theme-provider/theme-provider.tsx
index 0bb741620d..4460a1aa27 100644
--- a/packages/admin-next/dashboard/src/providers/theme-provider/theme-provider.tsx
+++ b/packages/admin-next/dashboard/src/providers/theme-provider/theme-provider.tsx
@@ -1,26 +1,26 @@
-import { PropsWithChildren, useEffect, useState } from "react";
-import { Theme, ThemeContext } from "./theme-context";
+import { PropsWithChildren, useEffect, useState } from "react"
+import { Theme, ThemeContext } from "./theme-context"
 
-const THEME_KEY = "medusa_admin_theme";
+const THEME_KEY = "medusa_admin_theme"
 
 export const ThemeProvider = ({ children }: PropsWithChildren) => {
   const [state, setState] = useState<Theme>(
     (localStorage?.getItem(THEME_KEY) as Theme) || "light"
-  );
+  )
 
   const setTheme = (theme: Theme) => {
-    localStorage.setItem(THEME_KEY, theme);
-    setState(theme);
-  };
+    localStorage.setItem(THEME_KEY, theme)
+    setState(theme)
+  }
 
   useEffect(() => {
-    const html = document.querySelector("html");
+    const html = document.querySelector("html")
     if (html) {
       /**
        * Temporarily disable transitions to prevent
        * the theme change from flashing.
        */
-      const css = document.createElement("style");
+      const css = document.createElement("style")
       css.appendChild(
         document.createTextNode(
           `* {
@@ -31,24 +31,24 @@ export const ThemeProvider = ({ children }: PropsWithChildren) => {
             transition: none !important;
           }`
         )
-      );
-      document.head.appendChild(css);
+      )
+      document.head.appendChild(css)
 
-      html.classList.remove(state === "light" ? "dark" : "light");
-      html.classList.add(state);
+      html.classList.remove(state === "light" ? "dark" : "light")
+      html.classList.add(state)
 
       /**
        * Re-enable transitions after the theme has been set,
        * and force the browser to repaint.
        */
-      window.getComputedStyle(css).opacity;
-      document.head.removeChild(css);
+      window.getComputedStyle(css).opacity
+      document.head.removeChild(css)
     }
-  }, [state]);
+  }, [state])
 
   return (
     <ThemeContext.Provider value={{ theme: state, setTheme }}>
       {children}
     </ThemeContext.Provider>
-  );
-};
+  )
+}
diff --git a/packages/admin-next/dashboard/src/providers/theme-provider/use-theme.tsx b/packages/admin-next/dashboard/src/providers/theme-provider/use-theme.tsx
index e272a578b4..c265a50271 100644
--- a/packages/admin-next/dashboard/src/providers/theme-provider/use-theme.tsx
+++ b/packages/admin-next/dashboard/src/providers/theme-provider/use-theme.tsx
@@ -1,10 +1,10 @@
-import { useContext } from "react";
-import { ThemeContext } from "./theme-context";
+import { useContext } from "react"
+import { ThemeContext } from "./theme-context"
 
 export const useTheme = () => {
-  const context = useContext(ThemeContext);
+  const context = useContext(ThemeContext)
   if (!context) {
-    throw new Error("useTheme must be used within a ThemeProvider");
+    throw new Error("useTheme must be used within a ThemeProvider")
   }
-  return context;
-};
+  return context
+}
diff --git a/packages/admin-next/dashboard/src/routes/api-key-management/api-key-management-create/api-key-management-create.tsx b/packages/admin-next/dashboard/src/routes/api-key-management/api-key-management-create/api-key-management-create.tsx
index 7763930475..33396ea0de 100644
--- a/packages/admin-next/dashboard/src/routes/api-key-management/api-key-management-create/api-key-management-create.tsx
+++ b/packages/admin-next/dashboard/src/routes/api-key-management/api-key-management-create/api-key-management-create.tsx
@@ -1,5 +1,5 @@
 import { useLocation } from "react-router-dom"
-import { RouteFocusModal } from "../../../components/route-modal"
+import { RouteFocusModal } from "../../../components/modals"
 import { getApiKeyTypeFromPathname } from "../common/utils"
 import { ApiKeyCreateForm } from "./components/api-key-create-form"
 
diff --git a/packages/admin-next/dashboard/src/routes/api-key-management/api-key-management-create/components/api-key-create-form/api-key-create-form.tsx b/packages/admin-next/dashboard/src/routes/api-key-management/api-key-management-create/components/api-key-create-form/api-key-create-form.tsx
index bf8ecbf03a..c0aeba9a51 100644
--- a/packages/admin-next/dashboard/src/routes/api-key-management/api-key-management-create/components/api-key-create-form/api-key-create-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/api-key-management/api-key-management-create/components/api-key-create-form/api-key-create-form.tsx
@@ -11,7 +11,7 @@ import { Form } from "../../../../../components/common/form"
 import {
   RouteFocusModal,
   useRouteModal,
-} from "../../../../../components/route-modal"
+} from "../../../../../components/modals"
 import { useCreateApiKey } from "../../../../../hooks/api/api-keys"
 import { ApiKeyType } from "../../../common/constants"
 
diff --git a/packages/admin-next/dashboard/src/routes/api-key-management/api-key-management-edit/api-key-management-edit.tsx b/packages/admin-next/dashboard/src/routes/api-key-management/api-key-management-edit/api-key-management-edit.tsx
index cdf2ea8e90..43ebb25378 100644
--- a/packages/admin-next/dashboard/src/routes/api-key-management/api-key-management-edit/api-key-management-edit.tsx
+++ b/packages/admin-next/dashboard/src/routes/api-key-management/api-key-management-edit/api-key-management-edit.tsx
@@ -1,7 +1,7 @@
 import { Heading } from "@medusajs/ui"
 import { useTranslation } from "react-i18next"
 import { useParams } from "react-router-dom"
-import { RouteDrawer } from "../../../components/route-modal"
+import { RouteDrawer } from "../../../components/modals"
 import { useApiKey } from "../../../hooks/api/api-keys"
 import { EditApiKeyForm } from "./components/edit-api-key-form"
 
diff --git a/packages/admin-next/dashboard/src/routes/api-key-management/api-key-management-edit/components/edit-api-key-form/edit-api-key-form.tsx b/packages/admin-next/dashboard/src/routes/api-key-management/api-key-management-edit/components/edit-api-key-form/edit-api-key-form.tsx
index 0cf3264c50..d60bc0b243 100644
--- a/packages/admin-next/dashboard/src/routes/api-key-management/api-key-management-edit/components/edit-api-key-form/edit-api-key-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/api-key-management/api-key-management-edit/components/edit-api-key-form/edit-api-key-form.tsx
@@ -9,7 +9,7 @@ import { Form } from "../../../../../components/common/form"
 import {
   RouteDrawer,
   useRouteModal,
-} from "../../../../../components/route-modal"
+} from "../../../../../components/modals"
 import { useUpdateApiKey } from "../../../../../hooks/api/api-keys"
 
 type EditApiKeyFormProps = {
diff --git a/packages/admin-next/dashboard/src/routes/api-key-management/api-key-management-sales-channels/api-key-management-sales-channels.tsx b/packages/admin-next/dashboard/src/routes/api-key-management/api-key-management-sales-channels/api-key-management-sales-channels.tsx
index 12c5d0bad3..8b2363b6c7 100644
--- a/packages/admin-next/dashboard/src/routes/api-key-management/api-key-management-sales-channels/api-key-management-sales-channels.tsx
+++ b/packages/admin-next/dashboard/src/routes/api-key-management/api-key-management-sales-channels/api-key-management-sales-channels.tsx
@@ -1,7 +1,7 @@
 import { useParams } from "react-router-dom"
 
 import { AdminApiKeyResponse, AdminSalesChannelResponse } from "@medusajs/types"
-import { RouteFocusModal } from "../../../components/route-modal"
+import { RouteFocusModal } from "../../../components/modals"
 import { useApiKey } from "../../../hooks/api/api-keys"
 import { ApiKeySalesChannelsForm } from "./components/api-key-sales-channels-form"
 
diff --git a/packages/admin-next/dashboard/src/routes/api-key-management/api-key-management-sales-channels/components/api-key-sales-channels-form/api-key-sales-channels-form.tsx b/packages/admin-next/dashboard/src/routes/api-key-management/api-key-management-sales-channels/components/api-key-sales-channels-form/api-key-sales-channels-form.tsx
index 95ebaacfba..14c84bd3b0 100644
--- a/packages/admin-next/dashboard/src/routes/api-key-management/api-key-management-sales-channels/components/api-key-sales-channels-form/api-key-sales-channels-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/api-key-management/api-key-management-sales-channels/components/api-key-sales-channels-form/api-key-sales-channels-form.tsx
@@ -14,7 +14,7 @@ import * as zod from "zod"
 import {
   RouteFocusModal,
   useRouteModal,
-} from "../../../../../components/route-modal"
+} from "../../../../../components/modals"
 import { DataTable } from "../../../../../components/table/data-table"
 import { useBatchAddSalesChannelsToApiKey } from "../../../../../hooks/api/api-keys"
 import { useSalesChannels } from "../../../../../hooks/api/sales-channels"
diff --git a/packages/admin-next/dashboard/src/routes/campaigns/add-campaign-promotions/add-campaign-promotions.tsx b/packages/admin-next/dashboard/src/routes/campaigns/add-campaign-promotions/add-campaign-promotions.tsx
index 910fb8166a..a760cf7ad1 100644
--- a/packages/admin-next/dashboard/src/routes/campaigns/add-campaign-promotions/add-campaign-promotions.tsx
+++ b/packages/admin-next/dashboard/src/routes/campaigns/add-campaign-promotions/add-campaign-promotions.tsx
@@ -1,5 +1,5 @@
 import { useParams } from "react-router-dom"
-import { RouteFocusModal } from "../../../components/route-modal"
+import { RouteFocusModal } from "../../../components/modals"
 import { useCampaign } from "../../../hooks/api/campaigns"
 import { AddCampaignPromotionsForm } from "./components"
 
diff --git a/packages/admin-next/dashboard/src/routes/campaigns/add-campaign-promotions/components/add-campaign-promotions-form.tsx b/packages/admin-next/dashboard/src/routes/campaigns/add-campaign-promotions/components/add-campaign-promotions-form.tsx
index ac1df29b16..6e701f01fb 100644
--- a/packages/admin-next/dashboard/src/routes/campaigns/add-campaign-promotions/components/add-campaign-promotions-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/campaigns/add-campaign-promotions/components/add-campaign-promotions-form.tsx
@@ -1,11 +1,11 @@
 import { zodResolver } from "@hookform/resolvers/zod"
 import { CampaignResponse, PromotionDTO } from "@medusajs/types"
-import { Button, Checkbox, Hint, toast, Tooltip } from "@medusajs/ui"
+import { Button, Checkbox, Hint, Tooltip, toast } from "@medusajs/ui"
 import { keepPreviousData } from "@tanstack/react-query"
 import {
-  createColumnHelper,
   OnChangeFn,
   RowSelectionState,
+  createColumnHelper,
 } from "@tanstack/react-table"
 import { useMemo, useState } from "react"
 import { useForm } from "react-hook-form"
@@ -14,7 +14,7 @@ import * as zod from "zod"
 import {
   RouteFocusModal,
   useRouteModal,
-} from "../../../../components/route-modal"
+} from "../../../../components/modals"
 import { DataTable } from "../../../../components/table/data-table"
 import { useAddOrRemoveCampaignPromotions } from "../../../../hooks/api/campaigns"
 import { usePromotions } from "../../../../hooks/api/promotions"
diff --git a/packages/admin-next/dashboard/src/routes/campaigns/campaign-budget-edit/campaign-budget-edit.tsx b/packages/admin-next/dashboard/src/routes/campaigns/campaign-budget-edit/campaign-budget-edit.tsx
index 286414017e..2508677dba 100644
--- a/packages/admin-next/dashboard/src/routes/campaigns/campaign-budget-edit/campaign-budget-edit.tsx
+++ b/packages/admin-next/dashboard/src/routes/campaigns/campaign-budget-edit/campaign-budget-edit.tsx
@@ -1,7 +1,7 @@
 import { Heading } from "@medusajs/ui"
 import { useTranslation } from "react-i18next"
 import { useParams } from "react-router-dom"
-import { RouteDrawer } from "../../../components/route-modal"
+import { RouteDrawer } from "../../../components/modals"
 import { useCampaign } from "../../../hooks/api/campaigns"
 import { EditCampaignBudgetForm } from "./components/edit-campaign-budget-form"
 
diff --git a/packages/admin-next/dashboard/src/routes/campaigns/campaign-budget-edit/components/edit-campaign-budget-form/edit-campaign-budget-form.tsx b/packages/admin-next/dashboard/src/routes/campaigns/campaign-budget-edit/components/edit-campaign-budget-form/edit-campaign-budget-form.tsx
index b22a3a8f5a..bb88fca79e 100644
--- a/packages/admin-next/dashboard/src/routes/campaigns/campaign-budget-edit/components/edit-campaign-budget-form/edit-campaign-budget-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/campaigns/campaign-budget-edit/components/edit-campaign-budget-form/edit-campaign-budget-form.tsx
@@ -8,7 +8,7 @@ import { Form } from "../../../../../components/common/form"
 import {
   RouteDrawer,
   useRouteModal,
-} from "../../../../../components/route-modal"
+} from "../../../../../components/modals"
 import { useUpdateCampaign } from "../../../../../hooks/api/campaigns"
 import { getCurrencySymbol } from "../../../../../lib/currencies"
 
diff --git a/packages/admin-next/dashboard/src/routes/campaigns/campaign-create/campaign-create.tsx b/packages/admin-next/dashboard/src/routes/campaigns/campaign-create/campaign-create.tsx
index d6a0a9e559..abfc24872b 100644
--- a/packages/admin-next/dashboard/src/routes/campaigns/campaign-create/campaign-create.tsx
+++ b/packages/admin-next/dashboard/src/routes/campaigns/campaign-create/campaign-create.tsx
@@ -1,4 +1,4 @@
-import { RouteFocusModal } from "../../../components/route-modal"
+import { RouteFocusModal } from "../../../components/modals"
 import { CreateCampaignForm } from "./components/create-campaign-form"
 
 export const CampaignCreate = () => {
diff --git a/packages/admin-next/dashboard/src/routes/campaigns/campaign-create/components/create-campaign-form/create-campaign-form.tsx b/packages/admin-next/dashboard/src/routes/campaigns/campaign-create/components/create-campaign-form/create-campaign-form.tsx
index 76cd8d50f6..0dbec8e81b 100644
--- a/packages/admin-next/dashboard/src/routes/campaigns/campaign-create/components/create-campaign-form/create-campaign-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/campaigns/campaign-create/components/create-campaign-form/create-campaign-form.tsx
@@ -8,7 +8,7 @@ import { CampaignBudgetTypeValues } from "@medusajs/types"
 import {
   RouteFocusModal,
   useRouteModal,
-} from "../../../../../components/route-modal"
+} from "../../../../../components/modals"
 import { useCreateCampaign } from "../../../../../hooks/api/campaigns"
 import { CreateCampaignFormFields } from "../../../common/components/create-campaign-form-fields"
 
diff --git a/packages/admin-next/dashboard/src/routes/campaigns/campaign-edit/campaign-edit.tsx b/packages/admin-next/dashboard/src/routes/campaigns/campaign-edit/campaign-edit.tsx
index 30ad9cf63e..80ee8355de 100644
--- a/packages/admin-next/dashboard/src/routes/campaigns/campaign-edit/campaign-edit.tsx
+++ b/packages/admin-next/dashboard/src/routes/campaigns/campaign-edit/campaign-edit.tsx
@@ -1,7 +1,7 @@
 import { Heading } from "@medusajs/ui"
 import { useTranslation } from "react-i18next"
 import { useParams } from "react-router-dom"
-import { RouteDrawer } from "../../../components/route-modal"
+import { RouteDrawer } from "../../../components/modals"
 import { useCampaign } from "../../../hooks/api/campaigns"
 import { EditCampaignForm } from "./components/edit-campaign-form"
 
diff --git a/packages/admin-next/dashboard/src/routes/campaigns/campaign-edit/components/edit-campaign-form/edit-campaign-form.tsx b/packages/admin-next/dashboard/src/routes/campaigns/campaign-edit/components/edit-campaign-form/edit-campaign-form.tsx
index 9a56ff8b35..6482bd74b9 100644
--- a/packages/admin-next/dashboard/src/routes/campaigns/campaign-edit/components/edit-campaign-form/edit-campaign-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/campaigns/campaign-edit/components/edit-campaign-form/edit-campaign-form.tsx
@@ -8,7 +8,7 @@ import { Form } from "../../../../../components/common/form"
 import {
   RouteDrawer,
   useRouteModal,
-} from "../../../../../components/route-modal"
+} from "../../../../../components/modals"
 import { useUpdateCampaign } from "../../../../../hooks/api/campaigns"
 
 type EditCampaignFormProps = {
diff --git a/packages/admin-next/dashboard/src/routes/categories/category-create/category-create.tsx b/packages/admin-next/dashboard/src/routes/categories/category-create/category-create.tsx
index b6575299dc..2e87050a57 100644
--- a/packages/admin-next/dashboard/src/routes/categories/category-create/category-create.tsx
+++ b/packages/admin-next/dashboard/src/routes/categories/category-create/category-create.tsx
@@ -1,6 +1,6 @@
 import { useSearchParams } from "react-router-dom"
 
-import { RouteFocusModal } from "../../../components/route-modal"
+import { RouteFocusModal } from "../../../components/modals"
 import { CreateCategoryForm } from "./components/create-category-form/create-category-form"
 
 export const CategoryCreate = () => {
diff --git a/packages/admin-next/dashboard/src/routes/categories/category-create/components/create-category-form/create-category-form.tsx b/packages/admin-next/dashboard/src/routes/categories/category-create/components/create-category-form/create-category-form.tsx
index 9e949a529a..0f7d6e47a2 100644
--- a/packages/admin-next/dashboard/src/routes/categories/category-create/components/create-category-form/create-category-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/categories/category-create/components/create-category-form/create-category-form.tsx
@@ -7,7 +7,7 @@ import { useState } from "react"
 import {
   RouteFocusModal,
   useRouteModal,
-} from "../../../../../components/route-modal"
+} from "../../../../../components/modals"
 import { useCreateProductCategory } from "../../../../../hooks/api/categories"
 import { CreateCategoryDetails } from "./create-category-details"
 import { CreateCategoryNesting } from "./create-category-nesting"
diff --git a/packages/admin-next/dashboard/src/routes/categories/category-edit/category-edit.tsx b/packages/admin-next/dashboard/src/routes/categories/category-edit/category-edit.tsx
index 7f32a09a32..51fa819638 100644
--- a/packages/admin-next/dashboard/src/routes/categories/category-edit/category-edit.tsx
+++ b/packages/admin-next/dashboard/src/routes/categories/category-edit/category-edit.tsx
@@ -1,7 +1,7 @@
 import { Heading } from "@medusajs/ui"
 
 import { useParams } from "react-router-dom"
-import { RouteDrawer } from "../../../components/route-modal"
+import { RouteDrawer } from "../../../components/modals"
 import { useProductCategory } from "../../../hooks/api/categories"
 import { EditCategoryForm } from "./components/edit-category-form"
 
diff --git a/packages/admin-next/dashboard/src/routes/categories/category-edit/components/edit-category-form/edit-category-form.tsx b/packages/admin-next/dashboard/src/routes/categories/category-edit/components/edit-category-form/edit-category-form.tsx
index 7725c1ccba..4edb2a6ede 100644
--- a/packages/admin-next/dashboard/src/routes/categories/category-edit/components/edit-category-form/edit-category-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/categories/category-edit/components/edit-category-form/edit-category-form.tsx
@@ -7,7 +7,7 @@ import { z } from "zod"
 import { HttpTypes } from "@medusajs/types"
 import { Form } from "../../../../../components/common/form"
 import { HandleInput } from "../../../../../components/inputs/handle-input"
-import { RouteDrawer } from "../../../../../components/route-modal"
+import { RouteDrawer } from "../../../../../components/modals"
 
 const EditCategorySchema = z.object({
   name: z.string().min(1),
diff --git a/packages/admin-next/dashboard/src/routes/categories/category-organize/category-organize.tsx b/packages/admin-next/dashboard/src/routes/categories/category-organize/category-organize.tsx
index 6ceb519680..f79439d7ff 100644
--- a/packages/admin-next/dashboard/src/routes/categories/category-organize/category-organize.tsx
+++ b/packages/admin-next/dashboard/src/routes/categories/category-organize/category-organize.tsx
@@ -1,4 +1,4 @@
-import { RouteFocusModal } from "../../../components/route-modal"
+import { RouteFocusModal } from "../../../components/modals"
 import { OrganizeCategoryForm } from "./components/organize-category-form/organize-category-form"
 
 export const CategoryOrganize = () => {
diff --git a/packages/admin-next/dashboard/src/routes/categories/category-organize/components/organize-category-form/organize-category-form.tsx b/packages/admin-next/dashboard/src/routes/categories/category-organize/components/organize-category-form/organize-category-form.tsx
index fbc738433e..71e7504924 100644
--- a/packages/admin-next/dashboard/src/routes/categories/category-organize/components/organize-category-form/organize-category-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/categories/category-organize/components/organize-category-form/organize-category-form.tsx
@@ -5,7 +5,7 @@ import { FetchError } from "@medusajs/js-sdk"
 import { HttpTypes } from "@medusajs/types"
 import { toast } from "@medusajs/ui"
 import { t } from "i18next"
-import { RouteFocusModal } from "../../../../../components/route-modal"
+import { RouteFocusModal } from "../../../../../components/modals"
 import {
   categoriesQueryKeys,
   useProductCategories,
diff --git a/packages/admin-next/dashboard/src/routes/categories/category-products/category-products.tsx b/packages/admin-next/dashboard/src/routes/categories/category-products/category-products.tsx
index 30134a45aa..eb0d0bc056 100644
--- a/packages/admin-next/dashboard/src/routes/categories/category-products/category-products.tsx
+++ b/packages/admin-next/dashboard/src/routes/categories/category-products/category-products.tsx
@@ -1,5 +1,5 @@
 import { useParams } from "react-router-dom"
-import { RouteFocusModal } from "../../../components/route-modal"
+import { RouteFocusModal } from "../../../components/modals"
 import { useProductCategory } from "../../../hooks/api/categories"
 import { EditCategoryProductsForm } from "./components/edit-category-products-form"
 
diff --git a/packages/admin-next/dashboard/src/routes/categories/category-products/components/edit-category-products-form/edit-category-products-form.tsx b/packages/admin-next/dashboard/src/routes/categories/category-products/components/edit-category-products-form/edit-category-products-form.tsx
index 1c4575026a..93f7312f81 100644
--- a/packages/admin-next/dashboard/src/routes/categories/category-products/components/edit-category-products-form/edit-category-products-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/categories/category-products/components/edit-category-products-form/edit-category-products-form.tsx
@@ -14,7 +14,7 @@ import { useTranslation } from "react-i18next"
 import {
   RouteFocusModal,
   useRouteModal,
-} from "../../../../../components/route-modal"
+} from "../../../../../components/modals"
 import { DataTable } from "../../../../../components/table/data-table"
 import { useUpdateProductCategoryProducts } from "../../../../../hooks/api/categories"
 import { useProducts } from "../../../../../hooks/api/products"
diff --git a/packages/admin-next/dashboard/src/routes/collections/collection-add-products/collection-add-products.tsx b/packages/admin-next/dashboard/src/routes/collections/collection-add-products/collection-add-products.tsx
index f339bfd353..884a163767 100644
--- a/packages/admin-next/dashboard/src/routes/collections/collection-add-products/collection-add-products.tsx
+++ b/packages/admin-next/dashboard/src/routes/collections/collection-add-products/collection-add-products.tsx
@@ -1,6 +1,6 @@
 import { useParams } from "react-router-dom"
 
-import { RouteFocusModal } from "../../../components/route-modal"
+import { RouteFocusModal } from "../../../components/modals"
 import { useCollection } from "../../../hooks/api/collections"
 import { AddProductsToCollectionForm } from "./components/add-products-to-collection-form"
 
diff --git a/packages/admin-next/dashboard/src/routes/collections/collection-add-products/components/add-products-to-collection-form/add-products-to-collection-form.tsx b/packages/admin-next/dashboard/src/routes/collections/collection-add-products/components/add-products-to-collection-form/add-products-to-collection-form.tsx
index 4658a6f537..fbeb6745fc 100644
--- a/packages/admin-next/dashboard/src/routes/collections/collection-add-products/components/add-products-to-collection-form/add-products-to-collection-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/collections/collection-add-products/components/add-products-to-collection-form/add-products-to-collection-form.tsx
@@ -14,7 +14,7 @@ import * as zod from "zod"
 import {
   RouteFocusModal,
   useRouteModal,
-} from "../../../../../components/route-modal/index.ts"
+} from "../../../../../components/modals/index.ts"
 import { DataTable } from "../../../../../components/table/data-table/data-table.tsx"
 import { useUpdateCollectionProducts } from "../../../../../hooks/api/collections.tsx"
 import { useProducts } from "../../../../../hooks/api/products.tsx"
diff --git a/packages/admin-next/dashboard/src/routes/collections/collection-create/collection-create.tsx b/packages/admin-next/dashboard/src/routes/collections/collection-create/collection-create.tsx
index e5f50dd664..59796e2ad2 100644
--- a/packages/admin-next/dashboard/src/routes/collections/collection-create/collection-create.tsx
+++ b/packages/admin-next/dashboard/src/routes/collections/collection-create/collection-create.tsx
@@ -1,4 +1,4 @@
-import { RouteFocusModal } from "../../../components/route-modal"
+import { RouteFocusModal } from "../../../components/modals"
 import { CreateCollectionForm } from "./components/create-collection-form"
 
 export const CollectionCreate = () => {
diff --git a/packages/admin-next/dashboard/src/routes/collections/collection-create/components/create-collection-form/create-collection-form.tsx b/packages/admin-next/dashboard/src/routes/collections/collection-create/components/create-collection-form/create-collection-form.tsx
index 4b4a057b4f..4807527706 100644
--- a/packages/admin-next/dashboard/src/routes/collections/collection-create/components/create-collection-form/create-collection-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/collections/collection-create/components/create-collection-form/create-collection-form.tsx
@@ -9,7 +9,7 @@ import { HandleInput } from "../../../../../components/inputs/handle-input"
 import {
   RouteFocusModal,
   useRouteModal,
-} from "../../../../../components/route-modal"
+} from "../../../../../components/modals"
 import { useCreateCollection } from "../../../../../hooks/api/collections"
 
 const CreateCollectionSchema = zod.object({
diff --git a/packages/admin-next/dashboard/src/routes/collections/collection-edit/collection-edit.tsx b/packages/admin-next/dashboard/src/routes/collections/collection-edit/collection-edit.tsx
index 690c44bed6..7bdac8da5c 100644
--- a/packages/admin-next/dashboard/src/routes/collections/collection-edit/collection-edit.tsx
+++ b/packages/admin-next/dashboard/src/routes/collections/collection-edit/collection-edit.tsx
@@ -1,7 +1,7 @@
 import { Heading } from "@medusajs/ui"
 import { useTranslation } from "react-i18next"
 import { useParams } from "react-router-dom"
-import { RouteDrawer } from "../../../components/route-modal"
+import { RouteDrawer } from "../../../components/modals"
 import { useCollection } from "../../../hooks/api/collections"
 import { EditCollectionForm } from "./components/edit-collection-form"
 
diff --git a/packages/admin-next/dashboard/src/routes/collections/collection-edit/components/edit-collection-form/edit-collection-form.tsx b/packages/admin-next/dashboard/src/routes/collections/collection-edit/components/edit-collection-form/edit-collection-form.tsx
index 285d92cefc..3047423c8c 100644
--- a/packages/admin-next/dashboard/src/routes/collections/collection-edit/components/edit-collection-form/edit-collection-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/collections/collection-edit/components/edit-collection-form/edit-collection-form.tsx
@@ -4,13 +4,13 @@ import { useForm } from "react-hook-form"
 import { useTranslation } from "react-i18next"
 import * as zod from "zod"
 
+import { HttpTypes } from "@medusajs/types"
 import { Form } from "../../../../../components/common/form"
 import {
   RouteDrawer,
   useRouteModal,
-} from "../../../../../components/route-modal"
+} from "../../../../../components/modals"
 import { useUpdateCollection } from "../../../../../hooks/api/collections"
-import { HttpTypes } from "@medusajs/types"
 
 type EditCollectionFormProps = {
   collection: HttpTypes.AdminCollection
diff --git a/packages/admin-next/dashboard/src/routes/customer-groups/customer-group-add-customers/components/add-customers-form/add-customers-form.tsx b/packages/admin-next/dashboard/src/routes/customer-groups/customer-group-add-customers/components/add-customers-form/add-customers-form.tsx
index 48fdfbfed2..5ec526e3b6 100644
--- a/packages/admin-next/dashboard/src/routes/customer-groups/customer-group-add-customers/components/add-customers-form/add-customers-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/customer-groups/customer-group-add-customers/components/add-customers-form/add-customers-form.tsx
@@ -10,10 +10,11 @@ import { useForm } from "react-hook-form"
 import { useTranslation } from "react-i18next"
 import * as zod from "zod"
 
+import { HttpTypes } from "@medusajs/types"
 import {
   RouteFocusModal,
   useRouteModal,
-} from "../../../../../components/route-modal"
+} from "../../../../../components/modals"
 import { DataTable } from "../../../../../components/table/data-table"
 import { useAddCustomersToGroup } from "../../../../../hooks/api/customer-groups"
 import { useCustomers } from "../../../../../hooks/api/customers"
@@ -21,7 +22,6 @@ import { useCustomerTableColumns } from "../../../../../hooks/table/columns/use-
 import { useCustomerTableFilters } from "../../../../../hooks/table/filters/use-customer-table-filters"
 import { useCustomerTableQuery } from "../../../../../hooks/table/query/use-customer-table-query"
 import { useDataTable } from "../../../../../hooks/use-data-table"
-import { HttpTypes } from "@medusajs/types"
 
 type AddCustomersFormProps = {
   customerGroupId: string
diff --git a/packages/admin-next/dashboard/src/routes/customer-groups/customer-group-add-customers/customer-group-add-customers.tsx b/packages/admin-next/dashboard/src/routes/customer-groups/customer-group-add-customers/customer-group-add-customers.tsx
index ab29d0b1ab..6eede341fd 100644
--- a/packages/admin-next/dashboard/src/routes/customer-groups/customer-group-add-customers/customer-group-add-customers.tsx
+++ b/packages/admin-next/dashboard/src/routes/customer-groups/customer-group-add-customers/customer-group-add-customers.tsx
@@ -1,5 +1,5 @@
 import { useParams } from "react-router-dom"
-import { RouteFocusModal } from "../../../components/route-modal"
+import { RouteFocusModal } from "../../../components/modals"
 import { AddCustomersForm } from "./components/add-customers-form"
 
 export const CustomerGroupAddCustomers = () => {
diff --git a/packages/admin-next/dashboard/src/routes/customer-groups/customer-group-create/components/create-customer-group-form/create-customer-group-form.tsx b/packages/admin-next/dashboard/src/routes/customer-groups/customer-group-create/components/create-customer-group-form/create-customer-group-form.tsx
index b6858d1aeb..8db2aced8e 100644
--- a/packages/admin-next/dashboard/src/routes/customer-groups/customer-group-create/components/create-customer-group-form/create-customer-group-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/customer-groups/customer-group-create/components/create-customer-group-form/create-customer-group-form.tsx
@@ -8,7 +8,7 @@ import { Form } from "../../../../../components/common/form"
 import {
   RouteFocusModal,
   useRouteModal,
-} from "../../../../../components/route-modal"
+} from "../../../../../components/modals"
 import { useCreateCustomerGroup } from "../../../../../hooks/api/customer-groups"
 
 export const CreateCustomerGroupSchema = zod.object({
diff --git a/packages/admin-next/dashboard/src/routes/customer-groups/customer-group-create/customer-group-create.tsx b/packages/admin-next/dashboard/src/routes/customer-groups/customer-group-create/customer-group-create.tsx
index 50d763a27f..a9ab7b7b23 100644
--- a/packages/admin-next/dashboard/src/routes/customer-groups/customer-group-create/customer-group-create.tsx
+++ b/packages/admin-next/dashboard/src/routes/customer-groups/customer-group-create/customer-group-create.tsx
@@ -1,4 +1,4 @@
-import { RouteFocusModal } from "../../../components/route-modal"
+import { RouteFocusModal } from "../../../components/modals"
 import { CreateCustomerGroupForm } from "./components/create-customer-group-form"
 
 export const CustomerGroupCreate = () => {
diff --git a/packages/admin-next/dashboard/src/routes/customer-groups/customer-group-edit/components/edit-customer-group-form/edit-customer-group-form.tsx b/packages/admin-next/dashboard/src/routes/customer-groups/customer-group-edit/components/edit-customer-group-form/edit-customer-group-form.tsx
index ac7a5fd218..f063344393 100644
--- a/packages/admin-next/dashboard/src/routes/customer-groups/customer-group-edit/components/edit-customer-group-form/edit-customer-group-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/customer-groups/customer-group-edit/components/edit-customer-group-form/edit-customer-group-form.tsx
@@ -1,4 +1,5 @@
 import { zodResolver } from "@hookform/resolvers/zod"
+import { HttpTypes } from "@medusajs/types"
 import { Button, Input, toast } from "@medusajs/ui"
 import { useForm } from "react-hook-form"
 import { useTranslation } from "react-i18next"
@@ -7,9 +8,8 @@ import { Form } from "../../../../../components/common/form"
 import {
   RouteDrawer,
   useRouteModal,
-} from "../../../../../components/route-modal"
+} from "../../../../../components/modals"
 import { useUpdateCustomerGroup } from "../../../../../hooks/api/customer-groups"
-import { HttpTypes } from "@medusajs/types"
 
 type EditCustomerGroupFormProps = {
   group: HttpTypes.AdminCustomerGroup
diff --git a/packages/admin-next/dashboard/src/routes/customer-groups/customer-group-edit/customer-group-edit.tsx b/packages/admin-next/dashboard/src/routes/customer-groups/customer-group-edit/customer-group-edit.tsx
index 72c90d3943..0b92d402b2 100644
--- a/packages/admin-next/dashboard/src/routes/customer-groups/customer-group-edit/customer-group-edit.tsx
+++ b/packages/admin-next/dashboard/src/routes/customer-groups/customer-group-edit/customer-group-edit.tsx
@@ -1,7 +1,7 @@
 import { Heading } from "@medusajs/ui"
 import { useTranslation } from "react-i18next"
 import { useParams } from "react-router-dom"
-import { RouteDrawer } from "../../../components/route-modal"
+import { RouteDrawer } from "../../../components/modals"
 import { useCustomerGroup } from "../../../hooks/api/customer-groups"
 import { EditCustomerGroupForm } from "./components/edit-customer-group-form"
 
diff --git a/packages/admin-next/dashboard/src/routes/customers/customer-create/components/create-customer-form/create-customer-form.tsx b/packages/admin-next/dashboard/src/routes/customers/customer-create/components/create-customer-form/create-customer-form.tsx
index 820f621971..cb7ea9de2a 100644
--- a/packages/admin-next/dashboard/src/routes/customers/customer-create/components/create-customer-form/create-customer-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/customers/customer-create/components/create-customer-form/create-customer-form.tsx
@@ -8,7 +8,7 @@ import { Form } from "../../../../../components/common/form"
 import {
   RouteFocusModal,
   useRouteModal,
-} from "../../../../../components/route-modal"
+} from "../../../../../components/modals"
 import { useCreateCustomer } from "../../../../../hooks/api/customers"
 
 const CreateCustomerSchema = zod.object({
diff --git a/packages/admin-next/dashboard/src/routes/customers/customer-create/customer-create.tsx b/packages/admin-next/dashboard/src/routes/customers/customer-create/customer-create.tsx
index 61b826834d..0d57ca3734 100644
--- a/packages/admin-next/dashboard/src/routes/customers/customer-create/customer-create.tsx
+++ b/packages/admin-next/dashboard/src/routes/customers/customer-create/customer-create.tsx
@@ -1,4 +1,4 @@
-import { RouteFocusModal } from "../../../components/route-modal"
+import { RouteFocusModal } from "../../../components/modals"
 import { CreateCustomerForm } from "./components/create-customer-form"
 
 export const CustomerCreate = () => {
diff --git a/packages/admin-next/dashboard/src/routes/customers/customer-edit/components/edit-customer-form/edit-customer-form.tsx b/packages/admin-next/dashboard/src/routes/customers/customer-edit/components/edit-customer-form/edit-customer-form.tsx
index 353b896fe5..3ea9c7e97d 100644
--- a/packages/admin-next/dashboard/src/routes/customers/customer-edit/components/edit-customer-form/edit-customer-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/customers/customer-edit/components/edit-customer-form/edit-customer-form.tsx
@@ -1,4 +1,5 @@
 import { zodResolver } from "@hookform/resolvers/zod"
+import { HttpTypes } from "@medusajs/types"
 import { Button, Input, toast } from "@medusajs/ui"
 import { useForm } from "react-hook-form"
 import { useTranslation } from "react-i18next"
@@ -9,14 +10,13 @@ import { Metadata } from "../../../../../components/forms/metadata/index.ts"
 import {
   RouteDrawer,
   useRouteModal,
-} from "../../../../../components/route-modal/index.ts"
+} from "../../../../../components/modals/index.ts"
 import { useUpdateCustomer } from "../../../../../hooks/api/customers.tsx"
 import {
   formValuesToMetadata,
   metadataToFormValues,
 } from "../../../../../lib/metadata.ts"
 import { metadataFormSchema } from "../../../../../lib/validation.ts"
-import { HttpTypes } from "@medusajs/types"
 
 type EditCustomerFormProps = {
   customer: HttpTypes.AdminCustomer
diff --git a/packages/admin-next/dashboard/src/routes/customers/customer-edit/customer-edit.tsx b/packages/admin-next/dashboard/src/routes/customers/customer-edit/customer-edit.tsx
index 8834b8cbfd..c77bec0a83 100644
--- a/packages/admin-next/dashboard/src/routes/customers/customer-edit/customer-edit.tsx
+++ b/packages/admin-next/dashboard/src/routes/customers/customer-edit/customer-edit.tsx
@@ -1,7 +1,7 @@
 import { Heading } from "@medusajs/ui"
 import { useTranslation } from "react-i18next"
 import { useParams } from "react-router-dom"
-import { RouteDrawer } from "../../../components/route-modal"
+import { RouteDrawer } from "../../../components/modals"
 import { useCustomer } from "../../../hooks/api/customers"
 import { EditCustomerForm } from "./components/edit-customer-form"
 
diff --git a/packages/admin-next/dashboard/src/routes/customers/customer-transfer-ownership/components/transfer-customer-order-ownership-form/transfer-customer-order-ownership-form.tsx b/packages/admin-next/dashboard/src/routes/customers/customer-transfer-ownership/components/transfer-customer-order-ownership-form/transfer-customer-order-ownership-form.tsx
index 42051cd595..a9afde1924 100644
--- a/packages/admin-next/dashboard/src/routes/customers/customer-transfer-ownership/components/transfer-customer-order-ownership-form/transfer-customer-order-ownership-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/customers/customer-transfer-ownership/components/transfer-customer-order-ownership-form/transfer-customer-order-ownership-form.tsx
@@ -8,7 +8,7 @@ import { TransferOwnerShipForm } from "../../../../../components/forms/transfer-
 import {
   RouteDrawer,
   useRouteModal,
-} from "../../../../../components/route-modal"
+} from "../../../../../components/modals"
 import { TransferOwnershipSchema } from "../../../../../lib/schemas"
 
 type TransferCustomerOrderOwnershipFormProps = {
diff --git a/packages/admin-next/dashboard/src/routes/customers/customer-transfer-ownership/customer-transfer-ownership.tsx b/packages/admin-next/dashboard/src/routes/customers/customer-transfer-ownership/customer-transfer-ownership.tsx
index 631c7ae808..d9e17738c9 100644
--- a/packages/admin-next/dashboard/src/routes/customers/customer-transfer-ownership/customer-transfer-ownership.tsx
+++ b/packages/admin-next/dashboard/src/routes/customers/customer-transfer-ownership/customer-transfer-ownership.tsx
@@ -2,7 +2,7 @@ import { Heading } from "@medusajs/ui"
 import { useTranslation } from "react-i18next"
 import { useParams } from "react-router-dom"
 
-import { RouteDrawer } from "../../../components/route-modal"
+import { RouteDrawer } from "../../../components/modals"
 import { useOrder } from "../../../hooks/api/orders"
 import { TransferCustomerOrderOwnershipForm } from "./components/transfer-customer-order-ownership-form"
 
diff --git a/packages/admin-next/dashboard/src/routes/customers/customers-add-customer-group/components/add-customers-form/add-customer-groups-form.tsx b/packages/admin-next/dashboard/src/routes/customers/customers-add-customer-group/components/add-customers-form/add-customer-groups-form.tsx
index a526ce1d30..70b1456b6a 100644
--- a/packages/admin-next/dashboard/src/routes/customers/customers-add-customer-group/components/add-customers-form/add-customer-groups-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/customers/customers-add-customer-group/components/add-customers-form/add-customer-groups-form.tsx
@@ -13,7 +13,7 @@ import * as zod from "zod"
 import {
   RouteFocusModal,
   useRouteModal,
-} from "../../../../../components/route-modal"
+} from "../../../../../components/modals"
 import { DataTable } from "../../../../../components/table/data-table"
 import {
   customerGroupsQueryKeys,
diff --git a/packages/admin-next/dashboard/src/routes/customers/customers-add-customer-group/customer-add-customer-groups.tsx b/packages/admin-next/dashboard/src/routes/customers/customers-add-customer-group/customer-add-customer-groups.tsx
index 3f4ad3fa9b..6da36ab035 100644
--- a/packages/admin-next/dashboard/src/routes/customers/customers-add-customer-group/customer-add-customer-groups.tsx
+++ b/packages/admin-next/dashboard/src/routes/customers/customers-add-customer-group/customer-add-customer-groups.tsx
@@ -1,5 +1,5 @@
 import { useParams } from "react-router-dom"
-import { RouteFocusModal } from "../../../components/route-modal"
+import { RouteFocusModal } from "../../../components/modals"
 import { AddCustomerGroupsForm } from "./components/add-customers-form"
 
 export const CustomerAddCustomerGroups = () => {
diff --git a/packages/admin-next/dashboard/src/routes/inventory/inventory-create/components/create-inventory-item-form/create-inventory-item-form.tsx b/packages/admin-next/dashboard/src/routes/inventory/inventory-create/components/create-inventory-item-form/create-inventory-item-form.tsx
index b9ab2268b6..f159a1ce7d 100644
--- a/packages/admin-next/dashboard/src/routes/inventory/inventory-create/components/create-inventory-item-form/create-inventory-item-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/inventory/inventory-create/components/create-inventory-item-form/create-inventory-item-form.tsx
@@ -6,30 +6,30 @@ import * as zod from "zod"
 import {
   Button,
   Heading,
+  Input,
   ProgressStatus,
   ProgressTabs,
-  clx,
-  Input,
-  Textarea,
   Switch,
+  Textarea,
+  clx,
   toast,
 } from "@medusajs/ui"
 import { useTranslation } from "react-i18next"
 
+import { Form } from "../../../../../components/common/form"
+import { CountrySelect } from "../../../../../components/inputs/country-select"
 import {
   RouteFocusModal,
   useRouteModal,
-} from "../../../../../components/route-modal"
-import { CreateInventoryAvailabilityForm } from "./create-inventory-availability-form"
-import { CountrySelect } from "../../../../../components/inputs/country-select"
-import { Form } from "../../../../../components/common/form"
+} from "../../../../../components/modals"
 import {
   inventoryItemsQueryKeys,
   useCreateInventoryItem,
 } from "../../../../../hooks/api/inventory"
 import { sdk } from "../../../../../lib/client"
-import { optionalInt } from "../../../../../lib/validation"
 import { queryClient } from "../../../../../lib/query-client"
+import { optionalInt } from "../../../../../lib/validation"
+import { CreateInventoryAvailabilityForm } from "./create-inventory-availability-form"
 
 enum Tab {
   DETAILS = "details",
diff --git a/packages/admin-next/dashboard/src/routes/inventory/inventory-create/inventory-create.tsx b/packages/admin-next/dashboard/src/routes/inventory/inventory-create/inventory-create.tsx
index 2091a981c1..0b083ed9fd 100644
--- a/packages/admin-next/dashboard/src/routes/inventory/inventory-create/inventory-create.tsx
+++ b/packages/admin-next/dashboard/src/routes/inventory/inventory-create/inventory-create.tsx
@@ -1,4 +1,4 @@
-import { RouteFocusModal } from "../../../components/route-modal"
+import { RouteFocusModal } from "../../../components/modals"
 import { CreateInventoryItemForm } from "./components/create-inventory-item-form"
 
 export function InventoryCreate() {
diff --git a/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/adjust-inventory/adjust-inventory-drawer.tsx b/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/adjust-inventory/adjust-inventory-drawer.tsx
index d66385af8a..5fe7809a62 100644
--- a/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/adjust-inventory/adjust-inventory-drawer.tsx
+++ b/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/adjust-inventory/adjust-inventory-drawer.tsx
@@ -1,11 +1,11 @@
-import { AdjustInventoryForm } from "./components/adjust-inventory-form"
-import { Heading } from "@medusajs/ui"
 import { InventoryTypes } from "@medusajs/types"
-import { RouteDrawer } from "../../../../../components/route-modal"
-import { useInventoryItem } from "../../../../../hooks/api/inventory"
-import { useParams } from "react-router-dom"
-import { useStockLocation } from "../../../../../hooks/api/stock-locations"
+import { Heading } from "@medusajs/ui"
 import { useTranslation } from "react-i18next"
+import { useParams } from "react-router-dom"
+import { RouteDrawer } from "../../../../../components/modals"
+import { useInventoryItem } from "../../../../../hooks/api/inventory"
+import { useStockLocation } from "../../../../../hooks/api/stock-locations"
+import { AdjustInventoryForm } from "./components/adjust-inventory-form"
 
 export const AdjustInventoryDrawer = () => {
   const { id, location_id } = useParams()
diff --git a/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/adjust-inventory/components/adjust-inventory-form.tsx b/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/adjust-inventory/components/adjust-inventory-form.tsx
index 5d5e75698e..53905d578e 100644
--- a/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/adjust-inventory/components/adjust-inventory-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/adjust-inventory/components/adjust-inventory-form.tsx
@@ -1,16 +1,16 @@
-import * as zod from "zod"
 import { zodResolver } from "@hookform/resolvers/zod"
+import * as zod from "zod"
 
+import { HttpTypes, InventoryLevelDTO, StockLocationDTO } from "@medusajs/types"
 import { Button, Input, Text, toast } from "@medusajs/ui"
-import { InventoryLevelDTO, StockLocationDTO, HttpTypes } from "@medusajs/types"
 import {
   RouteDrawer,
   useRouteModal,
-} from "../../../../../../components/route-modal"
+} from "../../../../../../components/modals"
 
-import { Form } from "../../../../../../components/common/form"
 import { useForm } from "react-hook-form"
 import { useTranslation } from "react-i18next"
+import { Form } from "../../../../../../components/common/form"
 import { useUpdateInventoryLevel } from "../../../../../../hooks/api/inventory"
 
 type AdjustInventoryFormProps = {
diff --git a/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/edit-inventory-item-attributes/components/edit-item-attributes-form.tsx b/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/edit-inventory-item-attributes/components/edit-item-attributes-form.tsx
index f75f5b4528..52e940d948 100644
--- a/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/edit-inventory-item-attributes/components/edit-item-attributes-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/edit-inventory-item-attributes/components/edit-item-attributes-form.tsx
@@ -4,7 +4,7 @@ import { Button, Input, toast } from "@medusajs/ui"
 import {
   RouteDrawer,
   useRouteModal,
-} from "../../../../../../components/route-modal"
+} from "../../../../../../components/modals"
 
 import { zodResolver } from "@hookform/resolvers/zod"
 import { InventoryTypes } from "@medusajs/types"
diff --git a/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/edit-inventory-item-attributes/edit-item-attributes-drawer.tsx b/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/edit-inventory-item-attributes/edit-item-attributes-drawer.tsx
index fe9f4eb9c3..9784783085 100644
--- a/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/edit-inventory-item-attributes/edit-item-attributes-drawer.tsx
+++ b/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/edit-inventory-item-attributes/edit-item-attributes-drawer.tsx
@@ -1,9 +1,9 @@
-import { EditInventoryItemAttributesForm } from "./components/edit-item-attributes-form"
 import { Heading } from "@medusajs/ui"
-import { RouteDrawer } from "../../../../../components/route-modal"
-import { useInventoryItem } from "../../../../../hooks/api/inventory"
-import { useParams } from "react-router-dom"
 import { useTranslation } from "react-i18next"
+import { useParams } from "react-router-dom"
+import { RouteDrawer } from "../../../../../components/modals"
+import { useInventoryItem } from "../../../../../hooks/api/inventory"
+import { EditInventoryItemAttributesForm } from "./components/edit-item-attributes-form"
 
 export const InventoryItemAttributesEdit = () => {
   const { id } = useParams()
diff --git a/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/edit-inventory-item/components/edit-item-form.tsx b/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/edit-inventory-item/components/edit-item-form.tsx
index 2de7b4492a..3bc2c6438e 100644
--- a/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/edit-inventory-item/components/edit-item-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/edit-inventory-item/components/edit-item-form.tsx
@@ -4,15 +4,15 @@ import { Button, Input, toast } from "@medusajs/ui"
 import {
   RouteDrawer,
   useRouteModal,
-} from "../../../../../../components/route-modal"
+} from "../../../../../../components/modals"
 
-import { Form } from "../../../../../../components/common/form"
+import { zodResolver } from "@hookform/resolvers/zod"
 import { InventoryTypes } from "@medusajs/types"
 import { useForm } from "react-hook-form"
 import { useTranslation } from "react-i18next"
-import { useUpdateInventoryItem } from "../../../../../../hooks/api/inventory"
 import { z } from "zod"
-import { zodResolver } from "@hookform/resolvers/zod"
+import { Form } from "../../../../../../components/common/form"
+import { useUpdateInventoryItem } from "../../../../../../hooks/api/inventory"
 
 type EditInventoryItemFormProps = {
   item: InventoryTypes.InventoryItemDTO
diff --git a/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/edit-inventory-item/edit-item-drawer.tsx b/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/edit-inventory-item/edit-item-drawer.tsx
index 7d4996f2b7..89635fbcd1 100644
--- a/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/edit-inventory-item/edit-item-drawer.tsx
+++ b/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/edit-inventory-item/edit-item-drawer.tsx
@@ -1,9 +1,9 @@
-import { EditInventoryItemForm } from "./components/edit-item-form"
 import { Heading } from "@medusajs/ui"
-import { RouteDrawer } from "../../../../../components/route-modal"
-import { useInventoryItem } from "../../../../../hooks/api/inventory"
-import { useParams } from "react-router-dom"
 import { useTranslation } from "react-i18next"
+import { useParams } from "react-router-dom"
+import { RouteDrawer } from "../../../../../components/modals"
+import { useInventoryItem } from "../../../../../hooks/api/inventory"
+import { EditInventoryItemForm } from "./components/edit-item-form"
 
 export const InventoryItemEdit = () => {
   const { id } = useParams()
diff --git a/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/manage-locations/components/manage-locations-form.tsx b/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/manage-locations/components/manage-locations-form.tsx
index 03acfa2334..17a8b7b35a 100644
--- a/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/manage-locations/components/manage-locations-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/manage-locations/components/manage-locations-form.tsx
@@ -1,16 +1,16 @@
 import * as zod from "zod"
 
-import { Button, Text, toast } from "@medusajs/ui"
+import { zodResolver } from "@hookform/resolvers/zod"
 import { AdminInventoryItem, AdminStockLocation } from "@medusajs/types"
+import { Button, Text, toast } from "@medusajs/ui"
+import { useFieldArray, useForm } from "react-hook-form"
 import { useTranslation } from "react-i18next"
 import { z } from "zod"
-import { zodResolver } from "@hookform/resolvers/zod"
 import {
   RouteDrawer,
   useRouteModal,
-} from "../../../../../../components/route-modal"
+} from "../../../../../../components/modals"
 import { useBatchUpdateInventoryLevels } from "../../../../../../hooks/api/inventory"
-import { useFieldArray, useForm } from "react-hook-form"
 
 import { LocationItem } from "./location-item"
 import { useEffect, useMemo } from "react"
diff --git a/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/manage-locations/manage-locations-drawer.tsx b/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/manage-locations/manage-locations-drawer.tsx
index 22800bf6d0..b5d0a14916 100644
--- a/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/manage-locations/manage-locations-drawer.tsx
+++ b/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/manage-locations/manage-locations-drawer.tsx
@@ -1,11 +1,11 @@
 import { Heading } from "@medusajs/ui"
 import { useTranslation } from "react-i18next"
 
-import { ManageLocationsForm } from "./components/manage-locations-form"
-import { RouteDrawer } from "../../../../../components/route-modal"
-import { useInventoryItem } from "../../../../../hooks/api/inventory"
 import { useParams } from "react-router-dom"
+import { RouteDrawer } from "../../../../../components/modals"
+import { useInventoryItem } from "../../../../../hooks/api/inventory"
 import { useStockLocations } from "../../../../../hooks/api/stock-locations"
+import { ManageLocationsForm } from "./components/manage-locations-form"
 
 export const ManageLocationsDrawer = () => {
   const { id } = useParams()
diff --git a/packages/admin-next/dashboard/src/routes/locations/location-create/components/create-location-form/create-location-form.tsx b/packages/admin-next/dashboard/src/routes/locations/location-create/components/create-location-form/create-location-form.tsx
index 503392c70c..6ddf8b3d8b 100644
--- a/packages/admin-next/dashboard/src/routes/locations/location-create/components/create-location-form/create-location-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/locations/location-create/components/create-location-form/create-location-form.tsx
@@ -8,7 +8,7 @@ import { CountrySelect } from "../../../../../components/inputs/country-select"
 import {
   RouteFocusModal,
   useRouteModal,
-} from "../../../../../components/route-modal"
+} from "../../../../../components/modals"
 import { useCreateStockLocation } from "../../../../../hooks/api/stock-locations"
 
 const CreateLocationSchema = zod.object({
diff --git a/packages/admin-next/dashboard/src/routes/locations/location-create/location-create.tsx b/packages/admin-next/dashboard/src/routes/locations/location-create/location-create.tsx
index 5d6a290e16..71cdb3455f 100644
--- a/packages/admin-next/dashboard/src/routes/locations/location-create/location-create.tsx
+++ b/packages/admin-next/dashboard/src/routes/locations/location-create/location-create.tsx
@@ -1,4 +1,4 @@
-import { RouteFocusModal } from "../../../components/route-modal"
+import { RouteFocusModal } from "../../../components/modals"
 import { CreateLocationForm } from "./components/create-location-form"
 
 export const LocationCreate = () => {
diff --git a/packages/admin-next/dashboard/src/routes/locations/location-edit/components/edit-location-form/edit-location-form.tsx b/packages/admin-next/dashboard/src/routes/locations/location-edit/components/edit-location-form/edit-location-form.tsx
index 3be9c1a3b7..38228b9309 100644
--- a/packages/admin-next/dashboard/src/routes/locations/location-edit/components/edit-location-form/edit-location-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/locations/location-edit/components/edit-location-form/edit-location-form.tsx
@@ -10,7 +10,7 @@ import { CountrySelect } from "../../../../../components/inputs/country-select"
 import {
   RouteDrawer,
   useRouteModal,
-} from "../../../../../components/route-modal"
+} from "../../../../../components/modals"
 import { useUpdateStockLocation } from "../../../../../hooks/api/stock-locations"
 
 type EditLocationFormProps = {
diff --git a/packages/admin-next/dashboard/src/routes/locations/location-edit/location-edit.tsx b/packages/admin-next/dashboard/src/routes/locations/location-edit/location-edit.tsx
index 2701bae9f6..3fdc78e82c 100644
--- a/packages/admin-next/dashboard/src/routes/locations/location-edit/location-edit.tsx
+++ b/packages/admin-next/dashboard/src/routes/locations/location-edit/location-edit.tsx
@@ -1,7 +1,7 @@
 import { Heading } from "@medusajs/ui"
 import { useTranslation } from "react-i18next"
 import { useParams } from "react-router-dom"
-import { RouteDrawer } from "../../../components/route-modal"
+import { RouteDrawer } from "../../../components/modals"
 import { useStockLocation } from "../../../hooks/api/stock-locations"
 import { EditLocationForm } from "./components/edit-location-form"
 
diff --git a/packages/admin-next/dashboard/src/routes/locations/location-sales-channels/components/edit-sales-channels-form/edit-sales-channels-form.tsx b/packages/admin-next/dashboard/src/routes/locations/location-sales-channels/components/edit-sales-channels-form/edit-sales-channels-form.tsx
index eb691d9f07..ee6aef799f 100644
--- a/packages/admin-next/dashboard/src/routes/locations/location-sales-channels/components/edit-sales-channels-form/edit-sales-channels-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/locations/location-sales-channels/components/edit-sales-channels-form/edit-sales-channels-form.tsx
@@ -11,7 +11,7 @@ import { useForm } from "react-hook-form"
 import {
   RouteFocusModal,
   useRouteModal,
-} from "../../../../../components/route-modal"
+} from "../../../../../components/modals"
 import { DataTable } from "../../../../../components/table/data-table"
 import { useSalesChannels } from "../../../../../hooks/api/sales-channels"
 import { useUpdateStockLocationSalesChannels } from "../../../../../hooks/api/stock-locations"
diff --git a/packages/admin-next/dashboard/src/routes/locations/location-sales-channels/location-sales-channels.tsx b/packages/admin-next/dashboard/src/routes/locations/location-sales-channels/location-sales-channels.tsx
index 816ffb7880..9bf4fa38b5 100644
--- a/packages/admin-next/dashboard/src/routes/locations/location-sales-channels/location-sales-channels.tsx
+++ b/packages/admin-next/dashboard/src/routes/locations/location-sales-channels/location-sales-channels.tsx
@@ -1,6 +1,6 @@
 import { useParams } from "react-router-dom"
 
-import { RouteFocusModal } from "../../../components/route-modal"
+import { RouteFocusModal } from "../../../components/modals"
 import { useStockLocation } from "../../../hooks/api/stock-locations"
 import { LocationEditSalesChannelsForm } from "./components/edit-sales-channels-form"
 
diff --git a/packages/admin-next/dashboard/src/routes/locations/location-service-zone-create/components/create-service-zone-form/create-service-zone-form.tsx b/packages/admin-next/dashboard/src/routes/locations/location-service-zone-create/components/create-service-zone-form/create-service-zone-form.tsx
index 2305d9550b..d117d7be0a 100644
--- a/packages/admin-next/dashboard/src/routes/locations/location-service-zone-create/components/create-service-zone-form/create-service-zone-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/locations/location-service-zone-create/components/create-service-zone-form/create-service-zone-form.tsx
@@ -12,7 +12,7 @@ import { SplitView } from "../../../../../components/layout/split-view"
 import {
   RouteFocusModal,
   useRouteModal,
-} from "../../../../../components/route-modal"
+} from "../../../../../components/modals"
 import { useCreateFulfillmentSetServiceZone } from "../../../../../hooks/api/fulfillment-sets"
 import { GeoZoneForm } from "../../../common/components/geo-zone-form"
 import { FulfillmentSetType } from "../../../common/constants"
diff --git a/packages/admin-next/dashboard/src/routes/locations/location-service-zone-create/location-service-zone-create.tsx b/packages/admin-next/dashboard/src/routes/locations/location-service-zone-create/location-service-zone-create.tsx
index 671fa693b5..3e11712f0e 100644
--- a/packages/admin-next/dashboard/src/routes/locations/location-service-zone-create/location-service-zone-create.tsx
+++ b/packages/admin-next/dashboard/src/routes/locations/location-service-zone-create/location-service-zone-create.tsx
@@ -1,6 +1,6 @@
 import { json, useLoaderData, useParams } from "react-router-dom"
 
-import { RouteFocusModal } from "../../../components/route-modal"
+import { RouteFocusModal } from "../../../components/modals"
 import { useStockLocation } from "../../../hooks/api/stock-locations"
 import { FulfillmentSetType } from "../common/constants"
 import { CreateServiceZoneForm } from "./components/create-service-zone-form"
diff --git a/packages/admin-next/dashboard/src/routes/locations/location-service-zone-edit/components/edit-region-form/edit-service-zone-form.tsx b/packages/admin-next/dashboard/src/routes/locations/location-service-zone-edit/components/edit-region-form/edit-service-zone-form.tsx
index 8296835969..a82fcaf7e3 100644
--- a/packages/admin-next/dashboard/src/routes/locations/location-service-zone-edit/components/edit-region-form/edit-service-zone-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/locations/location-service-zone-edit/components/edit-region-form/edit-service-zone-form.tsx
@@ -9,7 +9,7 @@ import { InlineTip } from "../../../../../components/common/inline-tip"
 import {
   RouteDrawer,
   useRouteModal,
-} from "../../../../../components/route-modal"
+} from "../../../../../components/modals"
 import { useUpdateFulfillmentSetServiceZone } from "../../../../../hooks/api/fulfillment-sets"
 
 type EditServiceZoneFormProps = {
diff --git a/packages/admin-next/dashboard/src/routes/locations/location-service-zone-edit/location-service-zone-edit.tsx b/packages/admin-next/dashboard/src/routes/locations/location-service-zone-edit/location-service-zone-edit.tsx
index 21bfce7524..db7c1854f3 100644
--- a/packages/admin-next/dashboard/src/routes/locations/location-service-zone-edit/location-service-zone-edit.tsx
+++ b/packages/admin-next/dashboard/src/routes/locations/location-service-zone-edit/location-service-zone-edit.tsx
@@ -2,7 +2,7 @@ import { Heading } from "@medusajs/ui"
 import { useTranslation } from "react-i18next"
 import { json, useParams } from "react-router-dom"
 
-import { RouteDrawer } from "../../../components/route-modal"
+import { RouteDrawer } from "../../../components/modals"
 import { useStockLocation } from "../../../hooks/api/stock-locations"
 import { EditServiceZoneForm } from "./components/edit-region-form"
 
diff --git a/packages/admin-next/dashboard/src/routes/locations/location-service-zone-manage-areas/components/edit-region-areas-form/edit-service-zone-areas-form.tsx b/packages/admin-next/dashboard/src/routes/locations/location-service-zone-manage-areas/components/edit-region-areas-form/edit-service-zone-areas-form.tsx
index 79d486f7e5..affd197c2d 100644
--- a/packages/admin-next/dashboard/src/routes/locations/location-service-zone-manage-areas/components/edit-region-areas-form/edit-service-zone-areas-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/locations/location-service-zone-manage-areas/components/edit-region-areas-form/edit-service-zone-areas-form.tsx
@@ -10,7 +10,7 @@ import { SplitView } from "../../../../../components/layout/split-view"
 import {
   RouteFocusModal,
   useRouteModal,
-} from "../../../../../components/route-modal"
+} from "../../../../../components/modals"
 import { useUpdateFulfillmentSetServiceZone } from "../../../../../hooks/api/fulfillment-sets"
 import { countries } from "../../../../../lib/countries"
 import { GeoZoneForm } from "../../../common/components/geo-zone-form"
diff --git a/packages/admin-next/dashboard/src/routes/locations/location-service-zone-manage-areas/location-service-zone-manage-areas.tsx b/packages/admin-next/dashboard/src/routes/locations/location-service-zone-manage-areas/location-service-zone-manage-areas.tsx
index 13b6b385aa..5ddc73aa1e 100644
--- a/packages/admin-next/dashboard/src/routes/locations/location-service-zone-manage-areas/location-service-zone-manage-areas.tsx
+++ b/packages/admin-next/dashboard/src/routes/locations/location-service-zone-manage-areas/location-service-zone-manage-areas.tsx
@@ -1,6 +1,6 @@
 import { json, useParams } from "react-router-dom"
 
-import { RouteFocusModal } from "../../../components/route-modal"
+import { RouteFocusModal } from "../../../components/modals"
 import { useStockLocation } from "../../../hooks/api/stock-locations"
 import { EditServiceZoneAreasForm } from "./components/edit-region-areas-form"
 
diff --git a/packages/admin-next/dashboard/src/routes/locations/location-service-zone-shipping-option-create/components/create-shipping-options-form/create-shipping-options-form.tsx b/packages/admin-next/dashboard/src/routes/locations/location-service-zone-shipping-option-create/components/create-shipping-options-form/create-shipping-options-form.tsx
index 698958a235..dcdca698a2 100644
--- a/packages/admin-next/dashboard/src/routes/locations/location-service-zone-shipping-option-create/components/create-shipping-options-form/create-shipping-options-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/locations/location-service-zone-shipping-option-create/components/create-shipping-options-form/create-shipping-options-form.tsx
@@ -8,7 +8,7 @@ import { useState } from "react"
 import {
   RouteFocusModal,
   useRouteModal,
-} from "../../../../../components/route-modal"
+} from "../../../../../components/modals"
 import { useCreateShippingOptions } from "../../../../../hooks/api/shipping-options"
 import { castNumber } from "../../../../../lib/cast-number"
 import { ShippingOptionPriceType } from "../../../common/constants"
diff --git a/packages/admin-next/dashboard/src/routes/locations/location-service-zone-shipping-option-create/location-service-zone-shipping-option-create.tsx b/packages/admin-next/dashboard/src/routes/locations/location-service-zone-shipping-option-create/location-service-zone-shipping-option-create.tsx
index 4164dfbbc0..7381b181d2 100644
--- a/packages/admin-next/dashboard/src/routes/locations/location-service-zone-shipping-option-create/location-service-zone-shipping-option-create.tsx
+++ b/packages/admin-next/dashboard/src/routes/locations/location-service-zone-shipping-option-create/location-service-zone-shipping-option-create.tsx
@@ -5,7 +5,7 @@ import {
   useSearchParams,
 } from "react-router-dom"
 
-import { RouteFocusModal } from "../../../components/route-modal"
+import { RouteFocusModal } from "../../../components/modals"
 import { useStockLocation } from "../../../hooks/api/stock-locations"
 import { CreateShippingOptionsForm } from "./components/create-shipping-options-form"
 import { LOC_CREATE_SHIPPING_OPTION_FIELDS } from "./constants"
diff --git a/packages/admin-next/dashboard/src/routes/locations/location-service-zone-shipping-option-edit/components/edit-region-form/edit-shipping-option-form.tsx b/packages/admin-next/dashboard/src/routes/locations/location-service-zone-shipping-option-edit/components/edit-region-form/edit-shipping-option-form.tsx
index 006b32038a..50b9f8c0d3 100644
--- a/packages/admin-next/dashboard/src/routes/locations/location-service-zone-shipping-option-edit/components/edit-region-form/edit-shipping-option-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/locations/location-service-zone-shipping-option-edit/components/edit-region-form/edit-shipping-option-form.tsx
@@ -11,7 +11,7 @@ import { Combobox } from "../../../../../components/inputs/combobox"
 import {
   RouteDrawer,
   useRouteModal,
-} from "../../../../../components/route-modal"
+} from "../../../../../components/modals"
 import { useUpdateShippingOptions } from "../../../../../hooks/api/shipping-options"
 import { useComboboxData } from "../../../../../hooks/use-combobox-data"
 import { sdk } from "../../../../../lib/client"
diff --git a/packages/admin-next/dashboard/src/routes/locations/location-service-zone-shipping-option-edit/location-service-zone-shipping-option-edit.tsx b/packages/admin-next/dashboard/src/routes/locations/location-service-zone-shipping-option-edit/location-service-zone-shipping-option-edit.tsx
index df0187371d..9447ae7282 100644
--- a/packages/admin-next/dashboard/src/routes/locations/location-service-zone-shipping-option-edit/location-service-zone-shipping-option-edit.tsx
+++ b/packages/admin-next/dashboard/src/routes/locations/location-service-zone-shipping-option-edit/location-service-zone-shipping-option-edit.tsx
@@ -2,7 +2,7 @@ import { Heading } from "@medusajs/ui"
 import { useTranslation } from "react-i18next"
 import { json, useParams } from "react-router-dom"
 
-import { RouteDrawer } from "../../../components/route-modal"
+import { RouteDrawer } from "../../../components/modals"
 import { useShippingOptions } from "../../../hooks/api/shipping-options"
 import { EditShippingOptionForm } from "./components/edit-region-form"
 
diff --git a/packages/admin-next/dashboard/src/routes/locations/location-service-zone-shipping-option-pricing/components/create-shipping-options-form/edit-shipping-options-pricing-form.tsx b/packages/admin-next/dashboard/src/routes/locations/location-service-zone-shipping-option-pricing/components/create-shipping-options-form/edit-shipping-options-pricing-form.tsx
index 099196ff7a..ff0ee54f2a 100644
--- a/packages/admin-next/dashboard/src/routes/locations/location-service-zone-shipping-option-pricing/components/create-shipping-options-form/edit-shipping-options-pricing-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/locations/location-service-zone-shipping-option-pricing/components/create-shipping-options-form/edit-shipping-options-pricing-form.tsx
@@ -11,7 +11,7 @@ import { DataGridRoot } from "../../../../../components/data-grid/data-grid-root
 import {
   RouteFocusModal,
   useRouteModal,
-} from "../../../../../components/route-modal/index"
+} from "../../../../../components/modals/index"
 import { useRegions } from "../../../../../hooks/api/regions"
 import { useUpdateShippingOptions } from "../../../../../hooks/api/shipping-options"
 import { useStore } from "../../../../../hooks/api/store"
diff --git a/packages/admin-next/dashboard/src/routes/locations/location-service-zone-shipping-option-pricing/location-service-zone-shipping-option-pricing.tsx b/packages/admin-next/dashboard/src/routes/locations/location-service-zone-shipping-option-pricing/location-service-zone-shipping-option-pricing.tsx
index 0ce1247d7a..695658a1c6 100644
--- a/packages/admin-next/dashboard/src/routes/locations/location-service-zone-shipping-option-pricing/location-service-zone-shipping-option-pricing.tsx
+++ b/packages/admin-next/dashboard/src/routes/locations/location-service-zone-shipping-option-pricing/location-service-zone-shipping-option-pricing.tsx
@@ -1,6 +1,6 @@
 import { json, useParams } from "react-router-dom"
 
-import { RouteFocusModal } from "../../../components/route-modal"
+import { RouteFocusModal } from "../../../components/modals"
 import { useShippingOptions } from "../../../hooks/api/shipping-options"
 import { EditShippingOptionsPricingForm } from "./components/create-shipping-options-form"
 
diff --git a/packages/admin-next/dashboard/src/routes/orders/order-create-fulfillment/components/order-create-fulfillment-form/order-create-fulfillment-form.tsx b/packages/admin-next/dashboard/src/routes/orders/order-create-fulfillment/components/order-create-fulfillment-form/order-create-fulfillment-form.tsx
index 2870f13e1a..d71c6dada6 100644
--- a/packages/admin-next/dashboard/src/routes/orders/order-create-fulfillment/components/order-create-fulfillment-form/order-create-fulfillment-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/orders/order-create-fulfillment/components/order-create-fulfillment-form/order-create-fulfillment-form.tsx
@@ -11,13 +11,13 @@ import { Form } from "../../../../../components/common/form"
 import {
   RouteFocusModal,
   useRouteModal,
-} from "../../../../../components/route-modal"
+} from "../../../../../components/modals"
 import { useFulfillmentProviders } from "../../../../../hooks/api/fulfillment-providers"
+import { useCreateOrderFulfillment } from "../../../../../hooks/api/orders"
 import { useStockLocations } from "../../../../../hooks/api/stock-locations"
 import { getFulfillableQuantity } from "../../../../../lib/order-item"
-import { OrderCreateFulfillmentItem } from "./order-create-fulfillment-item"
-import { useCreateOrderFulfillment } from "../../../../../hooks/api/orders"
 import { CreateFulfillmentSchema } from "./constants"
+import { OrderCreateFulfillmentItem } from "./order-create-fulfillment-item"
 
 type OrderCreateFulfillmentFormProps = {
   order: AdminOrder
diff --git a/packages/admin-next/dashboard/src/routes/orders/order-create-fulfillment/order-create-fulfillments.tsx b/packages/admin-next/dashboard/src/routes/orders/order-create-fulfillment/order-create-fulfillments.tsx
index 4ff8cd4cd6..10f725df9e 100644
--- a/packages/admin-next/dashboard/src/routes/orders/order-create-fulfillment/order-create-fulfillments.tsx
+++ b/packages/admin-next/dashboard/src/routes/orders/order-create-fulfillment/order-create-fulfillments.tsx
@@ -1,8 +1,8 @@
 import { useParams } from "react-router-dom"
 
-import { RouteFocusModal } from "../../../components/route-modal"
-import { OrderCreateFulfillmentForm } from "./components/order-create-fulfillment-form"
+import { RouteFocusModal } from "../../../components/modals"
 import { useOrder } from "../../../hooks/api/orders"
+import { OrderCreateFulfillmentForm } from "./components/order-create-fulfillment-form"
 
 export function OrderCreateFulfillment() {
   const { id } = useParams()
diff --git a/packages/admin-next/dashboard/src/routes/price-lists/common/components/price-list-customer-group-rule-form/index.ts b/packages/admin-next/dashboard/src/routes/price-lists/common/components/price-list-customer-group-rule-form/index.ts
new file mode 100644
index 0000000000..3276802054
--- /dev/null
+++ b/packages/admin-next/dashboard/src/routes/price-lists/common/components/price-list-customer-group-rule-form/index.ts
@@ -0,0 +1 @@
+export * from "./price-list-customer-group-rule-form"
diff --git a/packages/admin-next/dashboard/src/routes/price-lists/common/components/price-list-customer-group-rule-form/price-list-customer-group-rule-form.tsx b/packages/admin-next/dashboard/src/routes/price-lists/common/components/price-list-customer-group-rule-form/price-list-customer-group-rule-form.tsx
new file mode 100644
index 0000000000..89ac742325
--- /dev/null
+++ b/packages/admin-next/dashboard/src/routes/price-lists/common/components/price-list-customer-group-rule-form/price-list-customer-group-rule-form.tsx
@@ -0,0 +1,187 @@
+import { HttpTypes } from "@medusajs/types"
+import { Button, Checkbox } from "@medusajs/ui"
+import { keepPreviousData } from "@tanstack/react-query"
+import {
+  OnChangeFn,
+  RowSelectionState,
+  createColumnHelper,
+} from "@tanstack/react-table"
+import { useEffect, useMemo, useState } from "react"
+import { useTranslation } from "react-i18next"
+import { StackedDrawer } from "../../../../../components/modals/stacked-drawer"
+import { StackedFocusModal } from "../../../../../components/modals/stacked-focus-modal"
+import { DataTable } from "../../../../../components/table/data-table"
+import { useCustomerGroups } from "../../../../../hooks/api/customer-groups"
+import { useCustomerGroupTableColumns } from "../../../../../hooks/table/columns/use-customer-group-table-columns"
+import { useCustomerGroupTableFilters } from "../../../../../hooks/table/filters/use-customer-group-table-filters"
+import { useCustomerGroupTableQuery } from "../../../../../hooks/table/query/use-customer-group-table-query"
+import { useDataTable } from "../../../../../hooks/use-data-table"
+import { PriceListCustomerGroup } from "../../schemas"
+
+const PAGE_SIZE = 50
+const PREFIX = "cg"
+
+type PriceListCustomerGroupRuleFormProps = {
+  type: "focus" | "drawer"
+  state: PriceListCustomerGroup[]
+  setState: (state: PriceListCustomerGroup[]) => void
+}
+
+const initRowSelection = (state: PriceListCustomerGroup[]) => {
+  return state.reduce((acc, group) => {
+    acc[group.id] = true
+    return acc
+  }, {} as RowSelectionState)
+}
+
+export const PriceListCustomerGroupRuleForm = ({
+  state,
+  setState,
+  type,
+}: PriceListCustomerGroupRuleFormProps) => {
+  const { t } = useTranslation()
+
+  const [rowSelection, setRowSelection] = useState<RowSelectionState>(
+    initRowSelection(state)
+  )
+  const [intermediate, setIntermediate] =
+    useState<PriceListCustomerGroup[]>(state)
+
+  useEffect(() => {
+    // If the selected customer groups change outside of the drawer,
+    // update the row selection state and intermediate state
+    setRowSelection(initRowSelection(state))
+    setIntermediate(state)
+  }, [state])
+
+  const { searchParams, raw } = useCustomerGroupTableQuery({
+    pageSize: PAGE_SIZE,
+    prefix: PREFIX,
+  })
+  const { customer_groups, count, isLoading, isError, error } =
+    useCustomerGroups(searchParams, {
+      placeholderData: keepPreviousData,
+    })
+
+  const updater: OnChangeFn<RowSelectionState> = (value) => {
+    const state = typeof value === "function" ? value(rowSelection) : value
+    const currentIds = Object.keys(rowSelection)
+
+    const ids = Object.keys(state)
+
+    const newIds = ids.filter((id) => !currentIds.includes(id))
+    const removedIds = currentIds.filter((id) => !ids.includes(id))
+
+    const newCustomerGroups =
+      customer_groups
+        ?.filter((cg) => newIds.includes(cg.id))
+        .map((cg) => ({ id: cg.id, name: cg.name! })) || []
+
+    const filteredIntermediate = intermediate.filter(
+      (cg) => !removedIds.includes(cg.id)
+    )
+
+    setIntermediate([...filteredIntermediate, ...newCustomerGroups])
+    setRowSelection(state)
+  }
+
+  const handleSave = () => {
+    setState(intermediate)
+  }
+
+  const filters = useCustomerGroupTableFilters()
+  const columns = useColumns()
+
+  const { table } = useDataTable({
+    data: customer_groups || [],
+    columns,
+    count,
+    enablePagination: true,
+    enableRowSelection: true,
+    getRowId: (row) => row.id,
+    rowSelection: {
+      state: rowSelection,
+      updater,
+    },
+    pageSize: PAGE_SIZE,
+    prefix: PREFIX,
+  })
+
+  const Component = type === "focus" ? StackedFocusModal : StackedDrawer
+
+  if (isError) {
+    throw error
+  }
+
+  return (
+    <div className="flex size-full flex-col overflow-hidden">
+      <Component.Body className="min-h-0 p-0">
+        <DataTable
+          table={table}
+          columns={columns}
+          pageSize={PAGE_SIZE}
+          count={count}
+          isLoading={isLoading}
+          filters={filters}
+          orderBy={["name", "created_at", "updated_at"]}
+          layout="fill"
+          pagination
+          search
+          prefix={PREFIX}
+          queryObject={raw}
+        />
+      </Component.Body>
+      <Component.Footer>
+        <Component.Close asChild>
+          <Button variant="secondary" size="small" type="button">
+            {t("actions.cancel")}
+          </Button>
+        </Component.Close>
+        <Button type="button" size="small" onClick={handleSave}>
+          {t("actions.save")}
+        </Button>
+      </Component.Footer>
+    </div>
+  )
+}
+
+const columnHelper = createColumnHelper<HttpTypes.AdminCustomerGroup>()
+
+const useColumns = () => {
+  const base = useCustomerGroupTableColumns()
+
+  return useMemo(
+    () => [
+      columnHelper.display({
+        id: "select",
+        header: ({ table }) => {
+          return (
+            <Checkbox
+              checked={
+                table.getIsSomePageRowsSelected()
+                  ? "indeterminate"
+                  : table.getIsAllPageRowsSelected()
+              }
+              onCheckedChange={(value) =>
+                table.toggleAllPageRowsSelected(!!value)
+              }
+            />
+          )
+        },
+        cell: ({ row }) => {
+          return (
+            <Checkbox
+              checked={row.getIsSelected()}
+              onCheckedChange={(value) => row.toggleSelected(!!value)}
+              onClick={(e) => {
+                e.stopPropagation()
+              }}
+            />
+          )
+        },
+      }),
+      ...base,
+    ],
+    [base]
+  )
+}
diff --git a/packages/admin-next/dashboard/src/routes/pricing/common/constants.ts b/packages/admin-next/dashboard/src/routes/price-lists/common/constants.ts
similarity index 100%
rename from packages/admin-next/dashboard/src/routes/pricing/common/constants.ts
rename to packages/admin-next/dashboard/src/routes/price-lists/common/constants.ts
diff --git a/packages/admin-next/dashboard/src/routes/price-lists/common/hooks/use-delete-price-list-action.tsx b/packages/admin-next/dashboard/src/routes/price-lists/common/hooks/use-delete-price-list-action.tsx
new file mode 100644
index 0000000000..0619bd1061
--- /dev/null
+++ b/packages/admin-next/dashboard/src/routes/price-lists/common/hooks/use-delete-price-list-action.tsx
@@ -0,0 +1,56 @@
+import { HttpTypes } from "@medusajs/types"
+import { toast, usePrompt } from "@medusajs/ui"
+import { useTranslation } from "react-i18next"
+import { useNavigate } from "react-router-dom"
+
+import { useDeletePriceList } from "../../../../hooks/api/price-lists"
+
+export const useDeletePriceListAction = ({
+  priceList,
+}: {
+  priceList: HttpTypes.AdminPriceList
+}) => {
+  const { t } = useTranslation()
+  const prompt = usePrompt()
+  const navigate = useNavigate()
+
+  const { mutateAsync } = useDeletePriceList(priceList.id)
+
+  const handleDelete = async () => {
+    const res = await prompt({
+      title: t("general.areYouSure"),
+      description: t("priceLists.delete.confirmation", {
+        title: priceList.title,
+      }),
+      confirmText: t("actions.delete"),
+      cancelText: t("actions.cancel"),
+    })
+
+    if (!res) {
+      return
+    }
+
+    await mutateAsync(undefined, {
+      onSuccess: () => {
+        toast.success(t("general.success"), {
+          description: t("priceLists.delete.successToast", {
+            name: priceList.title,
+          }),
+          dismissable: true,
+          dismissLabel: t("actions.close"),
+        })
+
+        navigate("/price-lists")
+      },
+      onError: (e) => {
+        toast.error(t("general.error"), {
+          description: e.message,
+          dismissable: true,
+          dismissLabel: t("actions.close"),
+        })
+      },
+    })
+  }
+
+  return handleDelete
+}
diff --git a/packages/admin-next/dashboard/src/routes/price-lists/common/hooks/use-price-list-currency-data.tsx b/packages/admin-next/dashboard/src/routes/price-lists/common/hooks/use-price-list-currency-data.tsx
new file mode 100644
index 0000000000..91a83d66ef
--- /dev/null
+++ b/packages/admin-next/dashboard/src/routes/price-lists/common/hooks/use-price-list-currency-data.tsx
@@ -0,0 +1,51 @@
+import { HttpTypes } from "@medusajs/types"
+import { useRegions } from "../../../../hooks/api/regions"
+import { useStore } from "../../../../hooks/api/store"
+
+type UsePriceListCurrencyDataReturn =
+  | { isReady: false; currencies: undefined; regions: undefined }
+  | {
+      isReady: true
+      currencies: HttpTypes.AdminStoreCurrency[]
+      regions: HttpTypes.AdminRegion[]
+    }
+
+export const usePriceListCurrencyData = (): UsePriceListCurrencyDataReturn => {
+  const {
+    store,
+    isPending: isStorePending,
+    isError: isStoreError,
+    error: storeError,
+  } = useStore({
+    fields: "+supported_currencies",
+  })
+
+  const currencies = store?.supported_currencies
+
+  const {
+    regions,
+    isPending: isRegionsPending,
+    isError: isRegionsError,
+    error: regionsError,
+  } = useRegions({
+    fields: "id,name,currency_code",
+    limit: 999,
+  })
+
+  const isReady =
+    !!currencies && !!regions && !isStorePending && !isRegionsPending
+
+  if (isRegionsError) {
+    throw regionsError
+  }
+
+  if (isStoreError) {
+    throw storeError
+  }
+
+  if (!isReady) {
+    return { regions: undefined, currencies: undefined, isReady: false }
+  }
+
+  return { regions, currencies, isReady }
+}
diff --git a/packages/admin-next/dashboard/src/routes/price-lists/common/hooks/use-price-list-grid-columns.tsx b/packages/admin-next/dashboard/src/routes/price-lists/common/hooks/use-price-list-grid-columns.tsx
new file mode 100644
index 0000000000..7dc9254804
--- /dev/null
+++ b/packages/admin-next/dashboard/src/routes/price-lists/common/hooks/use-price-list-grid-columns.tsx
@@ -0,0 +1,104 @@
+import { HttpTypes, StoreCurrencyDTO } from "@medusajs/types"
+import { ColumnDef } from "@tanstack/react-table"
+import { useMemo } from "react"
+import { useTranslation } from "react-i18next"
+
+import { Thumbnail } from "../../../../components/common/thumbnail"
+import { DataGridCurrencyCell } from "../../../../components/data-grid/data-grid-cells/data-grid-currency-cell"
+import { DataGridReadOnlyCell } from "../../../../components/data-grid/data-grid-cells/data-grid-readonly-cell"
+import { createDataGridHelper } from "../../../../components/data-grid/utils"
+import { isProductRow } from "../utils"
+
+const columnHelper = createDataGridHelper<
+  HttpTypes.AdminProduct | HttpTypes.AdminProductVariant
+>()
+
+export const usePriceListGridColumns = ({
+  currencies = [],
+  regions = [],
+}: {
+  currencies?: StoreCurrencyDTO[]
+  regions?: HttpTypes.AdminRegion[]
+}) => {
+  const { t } = useTranslation()
+
+  const colDefs: ColumnDef<
+    HttpTypes.AdminProduct | HttpTypes.AdminProductVariant
+  >[] = useMemo(() => {
+    return [
+      columnHelper.column({
+        id: t("fields.title"),
+        header: t("fields.title"),
+        cell: ({ row }) => {
+          const entity = row.original
+
+          if (isProductRow(entity)) {
+            return (
+              <DataGridReadOnlyCell>
+                <div className="flex h-full w-full items-center gap-x-2 overflow-hidden">
+                  <Thumbnail src={entity.thumbnail} />
+                  <span className="truncate">{entity.title}</span>
+                </div>
+              </DataGridReadOnlyCell>
+            )
+          }
+
+          return (
+            <DataGridReadOnlyCell>
+              <div className="flex h-full w-full items-center gap-x-2 overflow-hidden">
+                <span className="truncate">{entity.title}</span>
+              </div>
+            </DataGridReadOnlyCell>
+          )
+        },
+        disableHiding: true,
+      }),
+      ...currencies.map((currency) => {
+        return columnHelper.column({
+          id: `currency-price-${currency.currency_code}`,
+          name: `Price ${currency.currency_code.toUpperCase()}`,
+          header: `Price ${currency.currency_code.toUpperCase()}`,
+          cell: (context) => {
+            const entity = context.row.original
+
+            if (isProductRow(entity)) {
+              return <DataGridReadOnlyCell />
+            }
+
+            return (
+              <DataGridCurrencyCell
+                context={context}
+                code={currency.currency_code}
+                field={`products.${entity.product_id}.variants.${entity.id}.currency_prices.${currency.currency_code}.amount`}
+              />
+            )
+          },
+        })
+      }),
+      ...regions.map((region) => {
+        return columnHelper.column({
+          id: `region-price-${region.id}`,
+          name: `Price ${region.name}`,
+          header: `Price ${region.name}`,
+          cell: (context) => {
+            const entity = context.row.original
+
+            if (isProductRow(entity)) {
+              return <DataGridReadOnlyCell />
+            }
+
+            return (
+              <DataGridCurrencyCell
+                context={context}
+                code={region.currency_code}
+                field={`products.${entity.product_id}.variants.${entity.id}.region_prices.${region.id}.amount`}
+              />
+            )
+          },
+        })
+      }),
+    ]
+  }, [t, currencies, regions])
+
+  return colDefs
+}
diff --git a/packages/admin-next/dashboard/src/routes/price-lists/common/schemas.ts b/packages/admin-next/dashboard/src/routes/price-lists/common/schemas.ts
new file mode 100644
index 0000000000..344e43eb88
--- /dev/null
+++ b/packages/admin-next/dashboard/src/routes/price-lists/common/schemas.ts
@@ -0,0 +1,96 @@
+import { z } from "zod"
+
+const PriceListCustomerGroupSchema = z.object({
+  id: z.string(),
+  name: z.string(),
+})
+
+export type PriceListCustomerGroup = z.infer<
+  typeof PriceListCustomerGroupSchema
+>
+
+export const PriceListRulesSchema = z.object({
+  customer_group_id: z.array(PriceListCustomerGroupSchema).nullish(),
+})
+
+const PriceListCreateCurrencyPriceSchema = z.object({
+  amount: z.string().optional(),
+})
+
+export type PriceListCreateCurrencyPrice = z.infer<
+  typeof PriceListCreateCurrencyPriceSchema
+>
+
+const PriceListCreateRegionPriceSchema = z.object({
+  amount: z.string().optional(),
+})
+
+export type PriceListCreateRegionPriceSchema = z.infer<
+  typeof PriceListCreateRegionPriceSchema
+>
+
+const PriceListCreateProductVariantSchema = z.object({
+  currency_prices: z.record(PriceListCreateCurrencyPriceSchema.optional()),
+  region_prices: z.record(PriceListCreateRegionPriceSchema.optional()),
+})
+
+export type PriceListCreateProductVariantSchema = z.infer<
+  typeof PriceListCreateProductVariantSchema
+>
+
+const PriceListCreateProductVariantsSchema = z.record(
+  PriceListCreateProductVariantSchema
+)
+
+export type PriceListCreateProductVariantsSchema = z.infer<
+  typeof PriceListCreateProductVariantsSchema
+>
+
+export const PriceListCreateProductsSchema = z.record(
+  z.object({
+    variants: PriceListCreateProductVariantsSchema,
+  })
+)
+
+export type PriceListCreateProductsSchema = z.infer<
+  typeof PriceListCreateProductsSchema
+>
+
+export const PriceListUpdateCurrencyPriceSchema = z.object({
+  amount: z.string().nullish(),
+  id: z.string().nullish(),
+})
+
+export type PriceListUpdateCurrencyPrice = z.infer<
+  typeof PriceListUpdateCurrencyPriceSchema
+>
+
+export const PriceListUpdateRegionPriceSchema = z.object({
+  amount: z.string().nullish(),
+  id: z.string().nullish(),
+})
+
+export type PriceListUpdateRegionPrice = z.infer<
+  typeof PriceListUpdateRegionPriceSchema
+>
+
+export const PriceListUpdateProductVariantsSchema = z.record(
+  z.object({
+    currency_prices: z.record(PriceListUpdateCurrencyPriceSchema.optional()),
+    region_prices: z.record(PriceListUpdateRegionPriceSchema.optional()),
+  })
+)
+
+export type PriceListUpdateProductVariantsSchema = z.infer<
+  typeof PriceListUpdateProductVariantsSchema
+>
+
+export const PriceListUpdateProductsSchema = z.record(
+  z.object({
+    variants: PriceListUpdateProductVariantsSchema,
+  })
+)
+
+export type PriceListUpdateProductsSchema = z.infer<
+  typeof PriceListUpdateProductsSchema
+>
diff --git a/packages/admin-next/dashboard/src/routes/price-lists/common/utils.ts b/packages/admin-next/dashboard/src/routes/price-lists/common/utils.ts
new file mode 100644
index 0000000000..4660da8336
--- /dev/null
+++ b/packages/admin-next/dashboard/src/routes/price-lists/common/utils.ts
@@ -0,0 +1,123 @@
+import { HttpTypes } from "@medusajs/types"
+import { TFunction } from "i18next"
+import { json } from "react-router-dom"
+import { castNumber } from "../../../lib/cast-number"
+import { PriceListDateStatus, PriceListStatus } from "./constants"
+import {
+  PriceListCreateCurrencyPrice,
+  PriceListCreateProductVariantSchema,
+  PriceListCreateProductsSchema,
+} from "./schemas"
+
+const getValues = (priceList: HttpTypes.AdminPriceList) => {
+  const startsAt = priceList.starts_at
+  const endsAt = priceList.ends_at
+
+  const isExpired = endsAt ? new Date(endsAt) < new Date() : false
+  const isScheduled = startsAt ? new Date(startsAt) > new Date() : false
+  const isDraft = priceList.status === PriceListStatus.DRAFT
+
+  return {
+    isExpired,
+    isScheduled,
+    isDraft,
+  }
+}
+
+export const getPriceListStatus = (
+  t: TFunction<"translation">,
+  priceList: HttpTypes.AdminPriceList
+) => {
+  const { isExpired, isScheduled, isDraft } = getValues(priceList)
+
+  let text = t("priceLists.fields.status.options.active")
+  let color: "red" | "grey" | "orange" | "green" = "green"
+  let status: string = PriceListStatus.ACTIVE
+
+  if (isDraft) {
+    color = "grey"
+    text = t("priceLists.fields.status.options.draft")
+    status = PriceListStatus.DRAFT
+  }
+
+  if (isExpired) {
+    color = "red"
+    text = t("priceLists.fields.status.options.expired")
+    status = PriceListDateStatus.EXPIRED
+  }
+
+  if (isScheduled) {
+    color = "orange"
+    text = t("priceLists.fields.status.options.scheduled")
+    status = PriceListDateStatus.SCHEDULED
+  }
+
+  return {
+    color,
+    text,
+    status,
+  }
+}
+
+export const isProductRow = (
+  row: HttpTypes.AdminProduct | HttpTypes.AdminProductVariant
+): row is HttpTypes.AdminProduct => {
+  return "variants" in row
+}
+
+const extractPricesFromVariants = (
+  variantId: string,
+  variant: PriceListCreateProductVariantSchema,
+  regions: HttpTypes.AdminRegion[]
+) => {
+  const extractPriceDetails = (
+    price: PriceListCreateCurrencyPrice,
+    priceType: "region" | "currency",
+    id: string
+  ) => {
+    const currencyCode =
+      priceType === "currency"
+        ? id
+        : regions.find((r) => r.id === id)?.currency_code
+
+    if (!currencyCode) {
+      throw json({ message: "Currency code not found" }, 400)
+    }
+
+    return {
+      amount: castNumber(price.amount!),
+      ...(priceType === "region" ? { rules: { region_id: id } } : {}),
+      currency_code: currencyCode,
+      variant_id: variantId,
+    }
+  }
+
+  const currencyPrices = Object.entries(variant.currency_prices || {}).flatMap(
+    ([currencyCode, currencyPrice]) => {
+      return currencyPrice?.amount
+        ? [extractPriceDetails(currencyPrice, "currency", currencyCode)]
+        : []
+    }
+  )
+
+  const regionPrices = Object.entries(variant.region_prices || {}).flatMap(
+    ([regionId, regionPrice]) => {
+      return regionPrice?.amount
+        ? [extractPriceDetails(regionPrice, "region", regionId)]
+        : []
+    }
+  )
+
+  return [...currencyPrices, ...regionPrices]
+}
+
+export const exctractPricesFromProducts = (
+  products: PriceListCreateProductsSchema,
+  regions: HttpTypes.AdminRegion[]
+) => {
+  return Object.values(products).flatMap(({ variants }) =>
+    Object.entries(variants).flatMap(([variantId, variant]) =>
+      extractPricesFromVariants(variantId, variant, regions)
+    )
+  )
+}
diff --git a/packages/admin-next/dashboard/src/routes/pricing/pricing-configuration/components/price-list-configuration-form/index.ts b/packages/admin-next/dashboard/src/routes/price-lists/price-list-configuration/components/price-list-configuration-form/index.ts
similarity index 100%
rename from packages/admin-next/dashboard/src/routes/pricing/pricing-configuration/components/price-list-configuration-form/index.ts
rename to packages/admin-next/dashboard/src/routes/price-lists/price-list-configuration/components/price-list-configuration-form/index.ts
diff --git a/packages/admin-next/dashboard/src/routes/price-lists/price-list-configuration/components/price-list-configuration-form/price-list-configuration-form.tsx b/packages/admin-next/dashboard/src/routes/price-lists/price-list-configuration/components/price-list-configuration-form/price-list-configuration-form.tsx
new file mode 100644
index 0000000000..f26d34a69f
--- /dev/null
+++ b/packages/admin-next/dashboard/src/routes/price-lists/price-list-configuration/components/price-list-configuration-form/price-list-configuration-form.tsx
@@ -0,0 +1,307 @@
+import { zodResolver } from "@hookform/resolvers/zod"
+import { MagnifyingGlass, XMark } from "@medusajs/icons"
+import { HttpTypes } from "@medusajs/types"
+import {
+  Button,
+  DatePicker,
+  Heading,
+  IconButton,
+  Text,
+  clx,
+  toast,
+} from "@medusajs/ui"
+import { useFieldArray, useForm } from "react-hook-form"
+import { useTranslation } from "react-i18next"
+import { z } from "zod"
+
+import { Divider } from "../../../../../components/common/divider"
+import { Form } from "../../../../../components/common/form"
+import { RouteDrawer, useRouteModal } from "../../../../../components/modals"
+import { StackedDrawer } from "../../../../../components/modals/stacked-drawer"
+import { useStackedModal } from "../../../../../components/modals/stacked-modal-provider"
+import { useUpdatePriceList } from "../../../../../hooks/api/price-lists"
+import { PriceListCustomerGroupRuleForm } from "../../../common/components/price-list-customer-group-rule-form"
+import { PricingCustomerGroupsArrayType } from "../../../price-list-create/components/price-list-create-form/schema"
+
+type PriceListConfigurationFormProps = {
+  priceList: HttpTypes.AdminPriceList
+  customerGroups: { id: string; name: string }[]
+}
+
+const PriceListConfigurationSchema = z.object({
+  ends_at: z.date().nullable(),
+  starts_at: z.date().nullable(),
+  customer_group_id: z.array(
+    z.object({
+      id: z.string(),
+      name: z.string(),
+    })
+  ),
+})
+
+const STACKED_MODAL_ID = "cg"
+
+// TODO: Fix DatePickers once new version is merged.
+export const PriceListConfigurationForm = ({
+  priceList,
+  customerGroups,
+}: PriceListConfigurationFormProps) => {
+  const { t } = useTranslation()
+  const { handleSuccess } = useRouteModal()
+  const { setIsOpen } = useStackedModal()
+
+  const form = useForm<z.infer<typeof PriceListConfigurationSchema>>({
+    defaultValues: {
+      ends_at: priceList.ends_at ? new Date(priceList.ends_at) : null,
+      starts_at: priceList.starts_at ? new Date(priceList.starts_at) : null,
+      customer_group_id: customerGroups,
+    },
+    resolver: zodResolver(PriceListConfigurationSchema),
+  })
+
+  const { fields, remove, append } = useFieldArray({
+    control: form.control,
+    name: "customer_group_id",
+    keyName: "cg_id",
+  })
+
+  const handleAddCustomerGroup = (groups: PricingCustomerGroupsArrayType) => {
+    if (!groups.length) {
+      form.setValue("customer_group_id", [])
+      setIsOpen(STACKED_MODAL_ID, false)
+      return
+    }
+
+    const newIds = groups.map((group) => group.id)
+
+    const fieldsToAdd = groups.filter(
+      (group) => !fields.some((field) => field.id === group.id)
+    )
+
+    for (const field of fields) {
+      if (!newIds.includes(field.id)) {
+        remove(fields.indexOf(field))
+      }
+    }
+
+    append(fieldsToAdd)
+    setIsOpen(STACKED_MODAL_ID, false)
+  }
+
+  const { mutateAsync } = useUpdatePriceList(priceList.id)
+
+  const handleSubmit = form.handleSubmit(async (values) => {
+    await mutateAsync(
+      {
+        starts_at: values.starts_at?.toISOString() || null,
+        ends_at: values.ends_at?.toISOString() || null,
+        rules: {
+          customer_group_id: values.customer_group_id.map((group) => group.id),
+        },
+      },
+      {
+        onSuccess: () => {
+          toast.success(t("priceLists.configuration.edit.successToast"))
+          handleSuccess()
+        },
+        onError: (error) => toast.error(error.message),
+      }
+    )
+  })
+
+  return (
+    <RouteDrawer.Form form={form}>
+      <RouteDrawer.Description className="sr-only">
+        {t("priceLists.configuration.edit.description")}
+      </RouteDrawer.Description>
+      <form
+        className="flex flex-1 flex-col overflow-hidden"
+        onSubmit={handleSubmit}
+      >
+        <RouteDrawer.Body className="flex flex-1 flex-col gap-y-8 overflow-auto">
+          <Form.Field
+            control={form.control}
+            name="starts_at"
+            render={({ field: { value, onChange, ...field } }) => {
+              return (
+                <Form.Item>
+                  <div className="grid grid-cols-1 gap-3">
+                    <div className="flex flex-col">
+                      <Form.Label optional>
+                        {t("priceLists.fields.startsAt.label")}
+                      </Form.Label>
+                      <Form.Hint>
+                        {t("priceLists.fields.startsAt.hint")}
+                      </Form.Hint>
+                    </div>
+                    <Form.Control>
+                      {/* TODO: Add timepicker see CORE-2382 */}
+                      <DatePicker
+                        mode="single"
+                        {...field}
+                        onChange={(value) => onChange(value ?? null)}
+                        value={value ?? undefined}
+                      />
+                    </Form.Control>
+                  </div>
+                  <Form.ErrorMessage />
+                </Form.Item>
+              )
+            }}
+          />
+          <Divider />
+          <Form.Field
+            control={form.control}
+            name="ends_at"
+            render={({ field: { value, onChange, ...field } }) => {
+              return (
+                <Form.Item>
+                  <div className="grid grid-cols-1 gap-3">
+                    <div className="flex flex-col">
+                      <Form.Label optional>
+                        {t("priceLists.fields.endsAt.label")}
+                      </Form.Label>
+                      <Form.Hint>
+                        {t("priceLists.fields.endsAt.hint")}
+                      </Form.Hint>
+                    </div>
+                    <Form.Control>
+                      <DatePicker
+                        mode="single"
+                        {...field}
+                        onChange={(value) => onChange(value ?? null)}
+                        value={value ?? undefined}
+                      />
+                    </Form.Control>
+                  </div>
+                  <Form.ErrorMessage />
+                </Form.Item>
+              )
+            }}
+          />
+          <Divider />
+          <Form.Field
+            control={form.control}
+            name="customer_group_id"
+            render={({ field }) => {
+              return (
+                <Form.Item>
+                  <div>
+                    <Form.Label optional>
+                      {t("priceLists.fields.customerAvailability.label")}
+                    </Form.Label>
+                    <Form.Hint>
+                      {t("priceLists.fields.customerAvailability.hint")}
+                    </Form.Hint>
+                  </div>
+                  <Form.Control>
+                    <div
+                      className={clx(
+                        "bg-ui-bg-component shadow-elevation-card-rest transition-fg grid gap-1.5 rounded-xl py-1.5",
+                        "aria-[invalid='true']:shadow-borders-error"
+                      )}
+                      role="application"
+                      ref={field.ref}
+                    >
+                      <div className="text-ui-fg-subtle grid gap-1.5 px-1.5 md:grid-cols-2">
+                        <div className="bg-ui-bg-field shadow-borders-base txt-compact-small rounded-md px-2 py-1.5">
+                          {t(
+                            "priceLists.fields.customerAvailability.attribute"
+                          )}
+                        </div>
+                        <div className="bg-ui-bg-field shadow-borders-base txt-compact-small rounded-md px-2 py-1.5">
+                          {t("operators.in")}
+                        </div>
+                      </div>
+                      <div className="flex items-center gap-1.5 px-1.5">
+                        <StackedDrawer id={STACKED_MODAL_ID}>
+                          <StackedDrawer.Trigger asChild>
+                            <button
+                              type="button"
+                              className="bg-ui-bg-field shadow-borders-base txt-compact-small text-ui-fg-muted flex flex-1 items-center gap-x-2 rounded-md px-2 py-1.5"
+                            >
+                              <MagnifyingGlass />
+                              {t(
+                                "priceLists.fields.customerAvailability.placeholder"
+                              )}
+                            </button>
+                          </StackedDrawer.Trigger>
+                          <StackedDrawer.Trigger asChild>
+                            <Button variant="secondary">
+                              {t("actions.browse")}
+                            </Button>
+                          </StackedDrawer.Trigger>
+                          <StackedDrawer.Content>
+                            <StackedDrawer.Header>
+                              <StackedDrawer.Title asChild>
+                                <Heading>
+                                  {t(
+                                    "priceLists.fields.customerAvailability.header"
+                                  )}
+                                </Heading>
+                              </StackedDrawer.Title>
+                              <StackedDrawer.Description className="sr-only">
+                                {t(
+                                  "priceLists.fields.customerAvailability.hint"
+                                )}
+                              </StackedDrawer.Description>
+                            </StackedDrawer.Header>
+                            <PriceListCustomerGroupRuleForm
+                              type="drawer"
+                              setState={handleAddCustomerGroup}
+                              state={fields}
+                            />
+                          </StackedDrawer.Content>
+                        </StackedDrawer>
+                      </div>
+                      {fields.length > 0 ? (
+                        <div className="flex flex-col gap-y-1.5">
+                          <Divider variant="dashed" />
+                          <div className="flex flex-col gap-y-1.5 px-1.5">
+                            {fields.map((field, index) => {
+                              return (
+                                <div
+                                  key={field.cg_id}
+                                  className="bg-ui-bg-field-component shadow-borders-base flex items-center justify-between gap-2 rounded-md px-2 py-0.5"
+                                >
+                                  <Text size="small" leading="compact">
+                                    {field.name}
+                                  </Text>
+                                  <IconButton
+                                    size="small"
+                                    variant="transparent"
+                                    type="button"
+                                    onClick={() => remove(index)}
+                                  >
+                                    <XMark />
+                                  </IconButton>
+                                </div>
+                              )
+                            })}
+                          </div>
+                        </div>
+                      ) : null}
+                    </div>
+                  </Form.Control>
+                  <Form.ErrorMessage />
+                </Form.Item>
+              )
+            }}
+          />
+        </RouteDrawer.Body>
+        <RouteDrawer.Footer className="shrink-0">
+          <div className="flex items-center justify-end gap-x-2">
+            <RouteDrawer.Close asChild>
+              <Button size="small" variant="secondary">
+                {t("actions.cancel")}
+              </Button>
+            </RouteDrawer.Close>
+            <Button size="small" type="submit">
+              {t("actions.save")}
+            </Button>
+          </div>
+        </RouteDrawer.Footer>
+      </form>
+    </RouteDrawer.Form>
+  )
+}
diff --git a/packages/admin-next/dashboard/src/routes/price-lists/price-list-configuration/index.ts b/packages/admin-next/dashboard/src/routes/price-lists/price-list-configuration/index.ts
new file mode 100644
index 0000000000..1efb849021
--- /dev/null
+++ b/packages/admin-next/dashboard/src/routes/price-lists/price-list-configuration/index.ts
@@ -0,0 +1 @@
+export { PriceListConfiguration as Component } from "./price-list-configuration"
diff --git a/packages/admin-next/dashboard/src/routes/price-lists/price-list-configuration/price-list-configuration.tsx b/packages/admin-next/dashboard/src/routes/price-lists/price-list-configuration/price-list-configuration.tsx
new file mode 100644
index 0000000000..3caa060904
--- /dev/null
+++ b/packages/admin-next/dashboard/src/routes/price-lists/price-list-configuration/price-list-configuration.tsx
@@ -0,0 +1,68 @@
+import { Heading } from "@medusajs/ui"
+import { useTranslation } from "react-i18next"
+import { useParams } from "react-router-dom"
+import { RouteDrawer } from "../../../components/modals"
+import { useCustomerGroups } from "../../../hooks/api/customer-groups"
+import { usePriceList } from "../../../hooks/api/price-lists"
+import { PriceListConfigurationForm } from "./components/price-list-configuration-form"
+
+export const PriceListConfiguration = () => {
+  const { t } = useTranslation()
+  const { id } = useParams()
+
+  const { price_list, isPending, isError, error } = usePriceList(id!)
+
+  const customerGroupIds = price_list?.rules.customer_group_id as
+    | string[]
+    | undefined
+
+  const {
+    customer_groups,
+    isPending: isCustomerGroupsPending,
+    isError: isCustomerGroupsError,
+    error: customerGroupsError,
+  } = useCustomerGroups(
+    {
+      id: customerGroupIds,
+    },
+    { enabled: !!customerGroupIds?.length }
+  )
+
+  const initialCustomerGroups =
+    customer_groups?.map((group) => ({
+      id: group.id,
+      name: group.name!,
+    })) || []
+
+  const isCustomerGroupsReady = isPending
+    ? false
+    : !!customerGroupIds?.length && isCustomerGroupsPending
+    ? false
+    : true
+
+  const ready = !isPending && !!price_list && isCustomerGroupsReady
+
+  if (isError) {
+    throw error
+  }
+
+  if (isCustomerGroupsError) {
+    throw customerGroupsError
+  }
+
+  return (
+    <RouteDrawer>
+      <RouteDrawer.Header>
+        <RouteDrawer.Title asChild>
+          <Heading>{t("priceLists.configuration.edit.header")}</Heading>
+        </RouteDrawer.Title>
+      </RouteDrawer.Header>
+      {ready && (
+        <PriceListConfigurationForm
+          priceList={price_list}
+          customerGroups={initialCustomerGroups}
+        />
+      )}
+    </RouteDrawer>
+  )
+}
diff --git a/packages/admin-next/dashboard/src/routes/price-lists/price-list-create/components/price-list-create-form/index.ts b/packages/admin-next/dashboard/src/routes/price-lists/price-list-create/components/price-list-create-form/index.ts
new file mode 100644
index 0000000000..aa9655069f
--- /dev/null
+++ b/packages/admin-next/dashboard/src/routes/price-lists/price-list-create/components/price-list-create-form/index.ts
@@ -0,0 +1 @@
+export * from "./price-list-create-form"
diff --git a/packages/admin-next/dashboard/src/routes/pricing/pricing-create/components/pricing-create-form/pricing-create-form.tsx b/packages/admin-next/dashboard/src/routes/price-lists/price-list-create/components/price-list-create-form/price-list-create-form.tsx
similarity index 70%
rename from packages/admin-next/dashboard/src/routes/pricing/pricing-create/components/pricing-create-form/pricing-create-form.tsx
rename to packages/admin-next/dashboard/src/routes/price-lists/price-list-create/components/price-list-create-form/price-list-create-form.tsx
index f4b580f29b..2476028c72 100644
--- a/packages/admin-next/dashboard/src/routes/pricing/pricing-create/components/pricing-create-form/pricing-create-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/price-lists/price-list-create/components/price-list-create-form/price-list-create-form.tsx
@@ -1,20 +1,20 @@
 import { zodResolver } from "@hookform/resolvers/zod"
-import { Button, ProgressStatus, ProgressTabs } from "@medusajs/ui"
+import { Button, ProgressStatus, ProgressTabs, toast } from "@medusajs/ui"
 import { FieldPath, useForm } from "react-hook-form"
 import { useTranslation } from "react-i18next"
 
-import { CreatePriceListDTO, CreatePriceListPriceDTO } from "@medusajs/types"
+import { HttpTypes, PriceListStatus, PriceListType } from "@medusajs/types"
 import { useState } from "react"
 import { z } from "zod"
 import {
   RouteFocusModal,
   useRouteModal,
-} from "../../../../../components/route-modal"
+} from "../../../../../components/modals"
 import { useCreatePriceList } from "../../../../../hooks/api/price-lists"
-import { castNumber } from "../../../../../lib/cast-number"
-import { PricingDetailsForm } from "./pricing-details-form"
-import { PricingPricesForm } from "./pricing-prices-form"
-import { PricingProductsForm } from "./pricing-products-form"
+import { exctractPricesFromProducts } from "../../../common/utils"
+import { PriceListDetailsForm } from "./price-list-details-form"
+import { PriceListPricesForm } from "./price-list-prices-form"
+import { PriceListProductsForm } from "./price-list-products-form"
 import {
   PricingCreateSchema,
   PricingCreateSchemaType,
@@ -41,7 +41,16 @@ const initialTabState: TabState = {
   [Tab.PRICE]: "not-started",
 }
 
-export const PricingCreateForm = () => {
+type PriceListCreateFormProps = {
+  regions: HttpTypes.AdminRegion[]
+  currencies: HttpTypes.AdminStoreCurrency[]
+}
+
+// TODO: Fix DatePickers once new version is merged.
+export const PriceListCreateForm = ({
+  regions,
+  currencies,
+}: PriceListCreateFormProps) => {
   const [tab, setTab] = useState<Tab>(Tab.DETAIL)
   const [tabState, setTabState] = useState<TabState>(initialTabState)
 
@@ -51,71 +60,57 @@ export const PricingCreateForm = () => {
   const form = useForm<PricingCreateSchemaType>({
     defaultValues: {
       type: "sale",
+      status: "active",
       title: "",
       description: "",
       starts_at: null,
       ends_at: null,
-      customer_group_ids: [],
       product_ids: [],
       products: {},
+      rules: {
+        customer_group_id: [],
+      },
     },
     resolver: zodResolver(PricingCreateSchema),
   })
 
   const { mutateAsync, isPending } = useCreatePriceList()
 
-  const handleSubmit = form.handleSubmit(
-    async (data) => {
-      const { customer_group_ids, products } = data
+  const handleSubmit = form.handleSubmit(async (data) => {
+    const { rules, products } = data
 
-      const rules = customer_group_ids?.length
-        ? { customer_group_id: customer_group_ids.map((cg) => cg.id) }
-        : undefined
+    const rulesPayload = rules?.customer_group_id?.length
+      ? { customer_group_id: rules.customer_group_id.map((cg) => cg.id) }
+      : undefined
 
-      const prices: CreatePriceListPriceDTO[] = []
+    const prices = exctractPricesFromProducts(products, regions)
 
-      for (const [_, product] of Object.entries(products)) {
-        const { variants } = product
-
-        for (const [variantId, variant] of Object.entries(variants)) {
-          const { currency_prices } = variant
-
-          for (const [currencyCode, currencyPrice] of Object.entries(
-            currency_prices
-          )) {
-            if (!currencyPrice?.amount) {
-              continue
-            }
-
-            prices.push({
-              amount: castNumber(currencyPrice.amount),
-              currency_code: currencyCode,
-              // @ts-expect-error type is wrong
-              variant_id: variantId,
+    await mutateAsync(
+      {
+        title: data.title,
+        type: data.type as PriceListType,
+        status: data.status as PriceListStatus,
+        description: data.description,
+        starts_at: data.starts_at ? data.starts_at.toISOString() : null,
+        ends_at: data.ends_at ? data.ends_at.toISOString() : null,
+        rules: rulesPayload,
+        prices,
+      },
+      {
+        onSuccess: ({ price_list }) => {
+          toast.success(
+            t("priceLists.create.successToast", {
+              title: price_list.title,
             })
-          }
-        }
-      }
-
-      await mutateAsync(
-        {
-          title: data.title,
-          type: data.type as CreatePriceListDTO["type"],
-          description: data.description,
-          starts_at: data.starts_at ? data.starts_at.toISOString() : null,
-          ends_at: data.ends_at ? data.ends_at.toISOString() : null,
-          rules,
-          prices: prices,
+          )
+          handleSuccess(`../${price_list.id}`)
         },
-        {
-          onSuccess: ({ price_list }) => {
-            handleSuccess(`../${price_list.id}`)
-          },
-        }
-      )
-    },
-    (error) => console.error(error)
-  )
+        onError: (error) => {
+          toast.error(error.message)
+        },
+      }
+    )
+  })
 
   const partialFormValidation = (
     fields: FieldPath<PricingCreateSchemaType>[],
@@ -131,9 +126,9 @@ export const PricingCreateForm = () => {
     const validationResult = schema.safeParse(values)
 
     if (!validationResult.success) {
-      validationResult.error.errors.forEach(({ path, message }) => {
+      validationResult.error.errors.forEach(({ path, message, code }) => {
         form.setError(path.join(".") as keyof PricingCreateSchemaType, {
-          type: "manual",
+          type: code,
           message,
         })
       })
@@ -256,40 +251,28 @@ export const PricingCreateForm = () => {
         <form onSubmit={handleSubmit} className="flex h-full flex-col">
           <RouteFocusModal.Header>
             <div className="flex w-full items-center justify-between gap-x-4">
-              <div className="-my-2 w-full max-w-[400px] border-l">
+              <div className="-my-2 w-full max-w-[600px] border-l">
                 <ProgressTabs.List className="grid w-full grid-cols-3">
                   <ProgressTabs.Trigger
                     status={tabState.detail}
                     value={Tab.DETAIL}
                   >
-                    Details
+                    {t("priceLists.create.tabs.details")}
                   </ProgressTabs.Trigger>
                   <ProgressTabs.Trigger
                     status={tabState.product}
                     value={Tab.PRODUCT}
                   >
-                    Products
+                    {t("priceLists.create.tabs.products")}
                   </ProgressTabs.Trigger>
                   <ProgressTabs.Trigger
                     status={tabState.price}
                     value={Tab.PRICE}
                   >
-                    Prices
+                    {t("priceLists.create.tabs.prices")}
                   </ProgressTabs.Trigger>
                 </ProgressTabs.List>
               </div>
-              <div className="flex items-center justify-end gap-x-2">
-                <RouteFocusModal.Close asChild>
-                  <Button variant="secondary" size="small">
-                    {t("actions.cancel")}
-                  </Button>
-                </RouteFocusModal.Close>
-                <PrimaryButton
-                  tab={tab}
-                  next={handleNextTab}
-                  isLoading={isPending}
-                />
-              </div>
             </div>
           </RouteFocusModal.Header>
           <RouteFocusModal.Body className="size-full overflow-hidden">
@@ -297,21 +280,39 @@ export const PricingCreateForm = () => {
               className="size-full overflow-y-auto"
               value={Tab.DETAIL}
             >
-              <PricingDetailsForm form={form} />
+              <PriceListDetailsForm form={form} />
             </ProgressTabs.Content>
             <ProgressTabs.Content
               className="size-full overflow-y-auto"
               value={Tab.PRODUCT}
             >
-              <PricingProductsForm form={form} />
+              <PriceListProductsForm form={form} />
             </ProgressTabs.Content>
             <ProgressTabs.Content
               className="size-full overflow-hidden"
               value={Tab.PRICE}
             >
-              <PricingPricesForm form={form} />
+              <PriceListPricesForm
+                form={form}
+                regions={regions}
+                currencies={currencies}
+              />
             </ProgressTabs.Content>
           </RouteFocusModal.Body>
+          <RouteFocusModal.Footer>
+            <div className="flex items-center justify-end gap-x-2">
+              <RouteFocusModal.Close asChild>
+                <Button variant="secondary" size="small">
+                  {t("actions.cancel")}
+                </Button>
+              </RouteFocusModal.Close>
+              <PrimaryButton
+                tab={tab}
+                next={handleNextTab}
+                isLoading={isPending}
+              />
+            </div>
+          </RouteFocusModal.Footer>
         </form>
       </ProgressTabs>
     </RouteFocusModal.Form>
diff --git a/packages/admin-next/dashboard/src/routes/price-lists/price-list-create/components/price-list-create-form/price-list-details-form.tsx b/packages/admin-next/dashboard/src/routes/price-lists/price-list-create/components/price-list-create-form/price-list-details-form.tsx
new file mode 100644
index 0000000000..63631690de
--- /dev/null
+++ b/packages/admin-next/dashboard/src/routes/price-lists/price-list-create/components/price-list-create-form/price-list-details-form.tsx
@@ -0,0 +1,326 @@
+import { MagnifyingGlass, XMarkMini } from "@medusajs/icons"
+import {
+  Button,
+  DatePicker,
+  Heading,
+  IconButton,
+  Input,
+  RadioGroup,
+  Select,
+  Text,
+  Textarea,
+  clx,
+} from "@medusajs/ui"
+import { useFieldArray, type UseFormReturn } from "react-hook-form"
+import { useTranslation } from "react-i18next"
+
+import { Divider } from "../../../../../components/common/divider"
+import { Form } from "../../../../../components/common/form"
+import { StackedFocusModal } from "../../../../../components/modals/stacked-focus-modal"
+import { useStackedModal } from "../../../../../components/modals/stacked-modal-provider"
+import { PriceListCustomerGroupRuleForm } from "../../../common/components/price-list-customer-group-rule-form"
+import type {
+  PricingCreateSchemaType,
+  PricingCustomerGroupsArrayType,
+} from "./schema"
+
+type PriceListDetailsFormProps = {
+  form: UseFormReturn<PricingCreateSchemaType>
+}
+
+export const PriceListDetailsForm = ({ form }: PriceListDetailsFormProps) => {
+  const { t } = useTranslation()
+
+  const { fields, remove, append } = useFieldArray({
+    control: form.control,
+    name: "rules.customer_group_id",
+    keyName: "cg_id",
+  })
+
+  const { setIsOpen } = useStackedModal()
+
+  const handleAddCustomerGroup = (groups: PricingCustomerGroupsArrayType) => {
+    const newIds = groups.map((group) => group.id)
+
+    const fieldsToAdd = groups.filter(
+      (group) => !fields.some((field) => field.id === group.id)
+    )
+
+    for (const field of fields) {
+      if (!newIds.includes(field.id)) {
+        remove(fields.indexOf(field))
+      }
+    }
+
+    append(fieldsToAdd)
+    setIsOpen("cg", false)
+  }
+
+  return (
+    <div className="flex flex-1 flex-col items-center overflow-y-auto">
+      <div className="flex w-full max-w-[720px] flex-col gap-y-8 px-8 py-16">
+        <div>
+          <Heading>{t("priceLists.create.header")}</Heading>
+          <Text size="small" className="text-ui-fg-subtle">
+            {t("priceLists.create.subheader")}
+          </Text>
+        </div>
+        <Form.Field
+          control={form.control}
+          name="type"
+          render={({ field: { onChange, ...rest } }) => {
+            return (
+              <Form.Item>
+                <div className="flex flex-col gap-y-4">
+                  <div>
+                    <Form.Label>{t("priceLists.fields.type.label")}</Form.Label>
+                    <Form.Hint>{t("priceLists.fields.type.hint")}</Form.Hint>
+                  </div>
+                  <Form.Control>
+                    <RadioGroup
+                      onValueChange={onChange}
+                      {...rest}
+                      className="grid grid-cols-1 gap-4 md:grid-cols-2"
+                    >
+                      <RadioGroup.ChoiceBox
+                        value={"sale"}
+                        label={t("priceLists.fields.type.options.sale.label")}
+                        description={t(
+                          "priceLists.fields.type.options.sale.description"
+                        )}
+                      />
+                      <RadioGroup.ChoiceBox
+                        value={"override"}
+                        label={t(
+                          "priceLists.fields.type.options.override.label"
+                        )}
+                        description={t(
+                          "priceLists.fields.type.options.override.description"
+                        )}
+                      />
+                    </RadioGroup>
+                  </Form.Control>
+                </div>
+                <Form.ErrorMessage />
+              </Form.Item>
+            )
+          }}
+        />
+        <div className="flex flex-col gap-y-4">
+          <div className="grid grid-cols-1  gap-4 md:grid-cols-2">
+            <Form.Field
+              control={form.control}
+              name="title"
+              render={({ field }) => {
+                return (
+                  <Form.Item>
+                    <Form.Label>{t("fields.title")}</Form.Label>
+                    <Form.Control>
+                      <Input {...field} />
+                    </Form.Control>
+                    <Form.ErrorMessage />
+                  </Form.Item>
+                )
+              }}
+            />
+            <Form.Field
+              control={form.control}
+              name="status"
+              render={({ field: { onChange, ref, ...field } }) => {
+                return (
+                  <Form.Item>
+                    <Form.Label>
+                      {t("priceLists.fields.status.label")}
+                    </Form.Label>
+                    <Form.Control>
+                      <Select {...field} onValueChange={onChange}>
+                        <Select.Trigger ref={ref}>
+                          <Select.Value />
+                        </Select.Trigger>
+                        <Select.Content>
+                          <Select.Item value="active">
+                            {t("priceLists.fields.status.options.active")}
+                          </Select.Item>
+                          <Select.Item value="draft">
+                            {t("priceLists.fields.status.options.draft")}
+                          </Select.Item>
+                        </Select.Content>
+                      </Select>
+                    </Form.Control>
+                    <Form.ErrorMessage />
+                  </Form.Item>
+                )
+              }}
+            />
+          </div>
+          <Form.Field
+            control={form.control}
+            name="description"
+            render={({ field }) => {
+              return (
+                <Form.Item>
+                  <Form.Label>{t("fields.description")}</Form.Label>
+                  <Form.Control>
+                    <Textarea {...field} />
+                  </Form.Control>
+                  <Form.ErrorMessage />
+                </Form.Item>
+              )
+            }}
+          />
+        </div>
+        <Divider />
+        <Form.Field
+          control={form.control}
+          name="starts_at"
+          render={({ field: { value, ...field } }) => {
+            return (
+              <Form.Item>
+                <div className="grid grid-cols-1 gap-3 md:grid-cols-2">
+                  <div className="flex flex-col">
+                    <Form.Label optional>
+                      {t("priceLists.fields.startsAt.label")}
+                    </Form.Label>
+                    <Form.Hint>
+                      {t("priceLists.fields.startsAt.hint")}
+                    </Form.Hint>
+                  </div>
+                  <Form.Control>
+                    {/* TODO: Add timepicker see CORE-2382 */}
+                    <DatePicker
+                      mode="single"
+                      {...field}
+                      value={value ?? undefined}
+                    />
+                  </Form.Control>
+                </div>
+                <Form.ErrorMessage />
+              </Form.Item>
+            )
+          }}
+        />
+        <Divider />
+        <Form.Field
+          control={form.control}
+          name="ends_at"
+          render={({ field: { value, ...field } }) => {
+            return (
+              <Form.Item>
+                <div className="grid grid-cols-1 gap-3 md:grid-cols-2">
+                  <div className="flex flex-col">
+                    <Form.Label optional>
+                      {t("priceLists.fields.endsAt.label")}
+                    </Form.Label>
+                    <Form.Hint>{t("priceLists.fields.endsAt.hint")}</Form.Hint>
+                  </div>
+                  <Form.Control>
+                    <DatePicker
+                      mode="single"
+                      {...field}
+                      value={value ?? undefined}
+                    />
+                  </Form.Control>
+                </div>
+                <Form.ErrorMessage />
+              </Form.Item>
+            )
+          }}
+        />
+        <Divider />
+        <Form.Field
+          control={form.control}
+          name="rules.customer_group_id"
+          render={({ field }) => {
+            return (
+              <Form.Item>
+                <div>
+                  <Form.Label optional>
+                    {t("priceLists.fields.customerAvailability.label")}
+                  </Form.Label>
+                  <Form.Hint>
+                    {t("priceLists.fields.customerAvailability.hint")}
+                  </Form.Hint>
+                </div>
+                <Form.Control>
+                  <div
+                    className={clx(
+                      "bg-ui-bg-component shadow-elevation-card-rest transition-fg grid gap-1.5 rounded-xl py-1.5",
+                      "aria-[invalid='true']:shadow-borders-error"
+                    )}
+                    role="application"
+                    ref={field.ref}
+                  >
+                    <div className="text-ui-fg-subtle grid gap-1.5 px-1.5 md:grid-cols-2">
+                      <div className="bg-ui-bg-field shadow-borders-base txt-compact-small rounded-md px-2 py-1.5">
+                        {t("priceLists.fields.customerAvailability.attribute")}
+                      </div>
+                      <div className="bg-ui-bg-field shadow-borders-base txt-compact-small rounded-md px-2 py-1.5">
+                        {t("operators.in")}
+                      </div>
+                    </div>
+                    <div className="flex items-center gap-1.5 px-1.5">
+                      <StackedFocusModal id="cg">
+                        <StackedFocusModal.Trigger asChild>
+                          <button
+                            type="button"
+                            className="bg-ui-bg-field shadow-borders-base txt-compact-small text-ui-fg-muted flex flex-1 items-center gap-x-2 rounded-md px-2 py-1.5"
+                          >
+                            <MagnifyingGlass />
+                            {t(
+                              "priceLists.fields.customerAvailability.placeholder"
+                            )}
+                          </button>
+                        </StackedFocusModal.Trigger>
+                        <StackedFocusModal.Trigger asChild>
+                          <Button variant="secondary">
+                            {t("actions.browse")}
+                          </Button>
+                        </StackedFocusModal.Trigger>
+                        <StackedFocusModal.Content>
+                          <StackedFocusModal.Header />
+                          <PriceListCustomerGroupRuleForm
+                            state={fields}
+                            setState={handleAddCustomerGroup}
+                            type="focus"
+                          />
+                        </StackedFocusModal.Content>
+                      </StackedFocusModal>
+                    </div>
+                    {fields.length > 0 ? (
+                      <div className="flex flex-col gap-y-1.5">
+                        <Divider variant="dashed" />
+                        <div className="flex flex-col gap-y-1.5 px-1.5">
+                          {fields.map((field, index) => {
+                            return (
+                              <div
+                                key={field.cg_id}
+                                className="bg-ui-bg-field-component shadow-borders-base flex items-center justify-between gap-2 rounded-md px-2 py-0.5"
+                              >
+                                <Text size="small" leading="compact">
+                                  {field.name}
+                                </Text>
+                                <IconButton
+                                  size="small"
+                                  variant="transparent"
+                                  type="button"
+                                  onClick={() => remove(index)}
+                                >
+                                  <XMarkMini />
+                                </IconButton>
+                              </div>
+                            )
+                          })}
+                        </div>
+                      </div>
+                    ) : null}
+                  </div>
+                </Form.Control>
+                <Form.ErrorMessage />
+              </Form.Item>
+            )
+          }}
+        />
+      </div>
+    </div>
+  )
+}
diff --git a/packages/admin-next/dashboard/src/routes/pricing/pricing-create/components/pricing-create-form/pricing-prices-form.tsx b/packages/admin-next/dashboard/src/routes/price-lists/price-list-create/components/price-list-create-form/price-list-prices-form.tsx
similarity index 60%
rename from packages/admin-next/dashboard/src/routes/pricing/pricing-create/components/pricing-create-form/pricing-prices-form.tsx
rename to packages/admin-next/dashboard/src/routes/price-lists/price-list-create/components/price-list-create-form/price-list-prices-form.tsx
index bc47f70444..2639fc3c94 100644
--- a/packages/admin-next/dashboard/src/routes/pricing/pricing-create/components/pricing-create-form/pricing-prices-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/price-lists/price-list-create/components/price-list-create-form/price-list-prices-form.tsx
@@ -1,41 +1,24 @@
+import { HttpTypes } from "@medusajs/types"
 import { useEffect } from "react"
 import { UseFormReturn, useWatch } from "react-hook-form"
-import { DataGrid } from "../../../../../components/grid/data-grid"
-import { useCurrencies } from "../../../../../hooks/api/currencies"
+import { DataGridRoot } from "../../../../../components/data-grid/data-grid-root"
 import { useProducts } from "../../../../../hooks/api/products"
-import { useStore } from "../../../../../hooks/api/store"
 import { usePriceListGridColumns } from "../../../common/hooks/use-price-list-grid-columns"
-import { PricingVariantsRecordType } from "../../../common/schemas"
+import { PriceListCreateProductVariantsSchema } from "../../../common/schemas"
 import { isProductRow } from "../../../common/utils"
 import { PricingCreateSchemaType } from "./schema"
 
-type PricingPricesFormProps = {
+type PriceListPricesFormProps = {
   form: UseFormReturn<PricingCreateSchemaType>
+  currencies: HttpTypes.AdminStoreCurrency[]
+  regions: HttpTypes.AdminRegion[]
 }
 
-export const PricingPricesForm = ({ form }: PricingPricesFormProps) => {
-  const {
-    store,
-    isLoading: isStoreLoading,
-    isError: isStoreError,
-    error: storeError,
-  } = useStore()
-
-  const {
-    currencies,
-    isLoading: isCurrenciesLoading,
-    isError: isCurrencyError,
-    error: currencyError,
-  } = useCurrencies(
-    {
-      code: store?.supported_currencies?.map((c) => c.currency_code),
-      limit: store?.supported_currencies?.length,
-    },
-    {
-      enabled: !!store,
-    }
-  )
-
+export const PriceListPricesForm = ({
+  form,
+  currencies,
+  regions,
+}: PriceListPricesFormProps) => {
   const ids = useWatch({
     control: form.control,
     name: "product_ids",
@@ -71,7 +54,7 @@ export const PricingPricesForm = ({ form }: PricingPricesFormProps) => {
               region_prices: {},
             }
             return variants
-          }, {} as PricingVariantsRecordType),
+          }, {} as PriceListCreateProductVariantsSchema),
         })
       })
     }
@@ -79,39 +62,23 @@ export const PricingPricesForm = ({ form }: PricingPricesFormProps) => {
 
   const columns = usePriceListGridColumns({
     currencies,
+    regions,
   })
 
-  const initializing =
-    isLoading ||
-    isStoreLoading ||
-    isCurrenciesLoading ||
-    !products ||
-    !store ||
-    !currencies
-
   if (isError) {
     throw error
   }
 
-  if (isStoreError) {
-    throw storeError
-  }
-
-  if (isCurrencyError) {
-    throw currencyError
-  }
-
   return (
     <div className="flex size-full flex-col divide-y overflow-hidden">
-      <DataGrid
+      <DataGridRoot
         columns={columns}
         data={products}
         getSubRows={(row) => {
-          if (isProductRow(row)) {
+          if (isProductRow(row) && row.variants) {
             return row.variants
           }
         }}
-        isLoading={initializing}
         state={form}
       />
     </div>
diff --git a/packages/admin-next/dashboard/src/routes/pricing/pricing-create/components/pricing-create-form/pricing-products-form.tsx b/packages/admin-next/dashboard/src/routes/price-lists/price-list-create/components/price-list-create-form/price-list-products-form.tsx
similarity index 93%
rename from packages/admin-next/dashboard/src/routes/pricing/pricing-create/components/pricing-create-form/pricing-products-form.tsx
rename to packages/admin-next/dashboard/src/routes/price-lists/price-list-create/components/price-list-create-form/price-list-products-form.tsx
index 7c0c43d2e7..21561930bd 100644
--- a/packages/admin-next/dashboard/src/routes/pricing/pricing-create/components/pricing-create-form/pricing-products-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/price-lists/price-list-create/components/price-list-create-form/price-list-products-form.tsx
@@ -1,3 +1,4 @@
+import { HttpTypes } from "@medusajs/types"
 import { Checkbox } from "@medusajs/ui"
 import { keepPreviousData } from "@tanstack/react-query"
 import {
@@ -7,17 +8,17 @@ import {
 } from "@tanstack/react-table"
 import { useMemo, useState } from "react"
 import { UseFormReturn, useWatch } from "react-hook-form"
+
 import { DataTable } from "../../../../../components/table/data-table"
 import { useProducts } from "../../../../../hooks/api/products"
 import { useProductTableColumns } from "../../../../../hooks/table/columns/use-product-table-columns"
 import { useProductTableFilters } from "../../../../../hooks/table/filters/use-product-table-filters"
 import { useProductTableQuery } from "../../../../../hooks/table/query/use-product-table-query"
 import { useDataTable } from "../../../../../hooks/use-data-table"
-import { PricingProductsRecordType } from "../../../common/schemas"
+import { PriceListCreateProductsSchema } from "../../../common/schemas"
 import { PricingCreateSchemaType } from "./schema"
-import { HttpTypes } from "@medusajs/types"
 
-type PricingProductsFormProps = {
+type PriceListProductsFormProps = {
   form: UseFormReturn<PricingCreateSchemaType>
 }
 
@@ -31,7 +32,7 @@ function getInitialSelection(products: { id: string }[]) {
   }, {} as RowSelectionState)
 }
 
-export const PricingProductsForm = ({ form }: PricingProductsFormProps) => {
+export const PriceListProductsForm = ({ form }: PriceListProductsFormProps) => {
   const { control, setValue } = form
 
   const selectedIds = useWatch({
@@ -71,7 +72,7 @@ export const PricingProductsForm = ({ form }: PricingProductsFormProps) => {
       }
 
       return acc
-    }, {} as PricingProductsRecordType)
+    }, {} as PriceListCreateProductsSchema)
 
     const update = ids.map((id) => ({ id }))
 
@@ -98,7 +99,7 @@ export const PricingProductsForm = ({ form }: PricingProductsFormProps) => {
     count,
     enablePagination: true,
     enableRowSelection: (row) => {
-      return row.original.variants.length > 0
+      return !!row.original.variants?.length
     },
     getRowId: (row) => row.id,
     rowSelection: {
diff --git a/packages/admin-next/dashboard/src/routes/pricing/pricing-create/components/pricing-create-form/schema.ts b/packages/admin-next/dashboard/src/routes/price-lists/price-list-create/components/price-list-create-form/schema.ts
similarity index 79%
rename from packages/admin-next/dashboard/src/routes/pricing/pricing-create/components/pricing-create-form/schema.ts
rename to packages/admin-next/dashboard/src/routes/price-lists/price-list-create/components/price-list-create-form/schema.ts
index 9d74509ace..40e6faf6d0 100644
--- a/packages/admin-next/dashboard/src/routes/pricing/pricing-create/components/pricing-create-form/schema.ts
+++ b/packages/admin-next/dashboard/src/routes/price-lists/price-list-create/components/price-list-create-form/schema.ts
@@ -1,5 +1,8 @@
 import { z } from "zod"
-import { PricingProductsRecordSchema } from "../../../common/schemas"
+import {
+  PriceListCreateProductsSchema,
+  PriceListRulesSchema,
+} from "../../../common/schemas"
 
 const PricingCustomerGroupsArray = z.array(
   z.object({
@@ -14,13 +17,14 @@ export type PricingCustomerGroupsArrayType = z.infer<
 
 export const PricingCreateSchema = z.object({
   type: z.enum(["sale", "override"]),
+  status: z.enum(["draft", "active"]),
   title: z.string().min(1),
   description: z.string().min(1),
-  starts_at: z.date().nullable(),
-  ends_at: z.date().nullable(),
-  customer_group_ids: PricingCustomerGroupsArray.optional(),
+  starts_at: z.date().nullish(),
+  ends_at: z.date().nullish(),
   product_ids: z.array(z.object({ id: z.string() })).min(1),
-  products: PricingProductsRecordSchema,
+  products: PriceListCreateProductsSchema,
+  rules: PriceListRulesSchema.nullish(),
 })
 
 export type PricingCreateSchemaType = z.infer<typeof PricingCreateSchema>
@@ -31,6 +35,7 @@ export const PricingDetailsSchema = PricingCreateSchema.pick({
   description: true,
   starts_at: true,
   ends_at: true,
+  customer_group_ids: true,
 })
 
 export const PricingDetailsFields = Object.keys(
diff --git a/packages/admin-next/dashboard/src/routes/price-lists/price-list-create/index.ts b/packages/admin-next/dashboard/src/routes/price-lists/price-list-create/index.ts
new file mode 100644
index 0000000000..676434082c
--- /dev/null
+++ b/packages/admin-next/dashboard/src/routes/price-lists/price-list-create/index.ts
@@ -0,0 +1 @@
+export { PriceListCreate as Component } from "./price-list-create"
diff --git a/packages/admin-next/dashboard/src/routes/price-lists/price-list-create/price-list-create.tsx b/packages/admin-next/dashboard/src/routes/price-lists/price-list-create/price-list-create.tsx
new file mode 100644
index 0000000000..15a7624534
--- /dev/null
+++ b/packages/admin-next/dashboard/src/routes/price-lists/price-list-create/price-list-create.tsx
@@ -0,0 +1,15 @@
+import { RouteFocusModal } from "../../../components/modals"
+import { usePriceListCurrencyData } from "../common/hooks/use-price-list-currency-data"
+import { PriceListCreateForm } from "./components/price-list-create-form"
+
+export const PriceListCreate = () => {
+  const { isReady, regions, currencies } = usePriceListCurrencyData()
+
+  return (
+    <RouteFocusModal>
+      {isReady && (
+        <PriceListCreateForm regions={regions} currencies={currencies} />
+      )}
+    </RouteFocusModal>
+  )
+}
diff --git a/packages/admin-next/dashboard/src/routes/price-lists/price-list-detail/components/price-list-configuration-section/index.ts b/packages/admin-next/dashboard/src/routes/price-lists/price-list-detail/components/price-list-configuration-section/index.ts
new file mode 100644
index 0000000000..8214183546
--- /dev/null
+++ b/packages/admin-next/dashboard/src/routes/price-lists/price-list-detail/components/price-list-configuration-section/index.ts
@@ -0,0 +1 @@
+export * from "./price-list-configuration-section"
diff --git a/packages/admin-next/dashboard/src/routes/price-lists/price-list-detail/components/price-list-configuration-section/price-list-configuration-section.tsx b/packages/admin-next/dashboard/src/routes/price-lists/price-list-detail/components/price-list-configuration-section/price-list-configuration-section.tsx
new file mode 100644
index 0000000000..2f5f1c0fe9
--- /dev/null
+++ b/packages/admin-next/dashboard/src/routes/price-lists/price-list-detail/components/price-list-configuration-section/price-list-configuration-section.tsx
@@ -0,0 +1,96 @@
+import { PencilSquare } from "@medusajs/icons"
+import { HttpTypes } from "@medusajs/types"
+import { Container, Heading } from "@medusajs/ui"
+import { useTranslation } from "react-i18next"
+import { ActionMenu } from "../../../../../components/common/action-menu"
+import { DateRangeDisplay } from "../../../../../components/common/date-range-display"
+import { ListSummary } from "../../../../../components/common/list-summary"
+import { Skeleton } from "../../../../../components/common/skeleton"
+import { useCustomerGroups } from "../../../../../hooks/api/customer-groups"
+
+type PriceListConfigurationSectionProps = {
+  priceList: HttpTypes.AdminPriceList
+}
+
+export const PriceListConfigurationSection = ({
+  priceList,
+}: PriceListConfigurationSectionProps) => {
+  const { t } = useTranslation()
+
+  return (
+    <Container className="flex flex-col gap-y-4">
+      <div className="flex items-center justify-between">
+        <div>
+          <Heading level="h2">{t("priceLists.configuration.header")}</Heading>
+          <CustomerGroupDisplay priceList={priceList} />
+        </div>
+        <ActionMenu
+          groups={[
+            {
+              actions: [
+                {
+                  label: t("actions.edit"),
+                  to: "configuration",
+                  icon: <PencilSquare />,
+                },
+              ],
+            },
+          ]}
+        />
+      </div>
+
+      <DateRangeDisplay
+        endsAt={priceList.ends_at}
+        startsAt={priceList.starts_at}
+        showTime
+      />
+    </Container>
+  )
+}
+
+const CustomerGroupDisplay = ({
+  priceList,
+}: {
+  priceList: HttpTypes.AdminPriceList
+}) => {
+  const { t } = useTranslation()
+
+  const customerGroupIds = priceList.rules.customer_group_id as
+    | string[]
+    | undefined
+
+  const { customer_groups, isPending, isError, error } = useCustomerGroups(
+    {
+      id: customerGroupIds,
+    },
+    {
+      enabled: !!customerGroupIds?.length,
+    }
+  )
+
+  if (isError) {
+    throw error
+  }
+
+  if (!customerGroupIds?.length) {
+    return null
+  }
+
+  if (isPending || !customer_groups) {
+    return <Skeleton className="h-5 w-full max-w-48" />
+  }
+
+  return (
+    <div className="txt-small-plus text-ui-fg-muted flex items-center gap-x-1.5">
+      <span className="text-ui-fg-subtle">
+        {t("priceLists.fields.customerAvailability.attribute")}
+      </span>
+      <span>·</span>
+      <ListSummary
+        list={customer_groups.map((group) => group.name!)}
+        n={1}
+        className="txt-small-plus text-ui-fg-muted"
+      />
+    </div>
+  )
+}
diff --git a/packages/admin-next/dashboard/src/routes/price-lists/price-list-detail/components/price-list-general-section/index.ts b/packages/admin-next/dashboard/src/routes/price-lists/price-list-detail/components/price-list-general-section/index.ts
new file mode 100644
index 0000000000..819714e0dd
--- /dev/null
+++ b/packages/admin-next/dashboard/src/routes/price-lists/price-list-detail/components/price-list-general-section/index.ts
@@ -0,0 +1 @@
+export * from "./price-list-general-section"
diff --git a/packages/admin-next/dashboard/src/routes/pricing/pricing-detail/components/pricing-general-section/pricing-general-section.tsx b/packages/admin-next/dashboard/src/routes/price-lists/price-list-detail/components/price-list-general-section/price-list-general-section.tsx
similarity index 67%
rename from packages/admin-next/dashboard/src/routes/pricing/pricing-detail/components/pricing-general-section/pricing-general-section.tsx
rename to packages/admin-next/dashboard/src/routes/price-lists/price-list-detail/components/price-list-general-section/price-list-general-section.tsx
index 50fb8ad9aa..05df8606a5 100644
--- a/packages/admin-next/dashboard/src/routes/pricing/pricing-detail/components/pricing-general-section/pricing-general-section.tsx
+++ b/packages/admin-next/dashboard/src/routes/price-lists/price-list-detail/components/price-list-general-section/price-list-general-section.tsx
@@ -1,55 +1,31 @@
 import { PencilSquare, Trash } from "@medusajs/icons"
-import { PriceListDTO } from "@medusajs/types"
-import { Container, Heading, StatusBadge, Text, usePrompt } from "@medusajs/ui"
+import { HttpTypes } from "@medusajs/types"
+import { Container, Heading, StatusBadge, Text } from "@medusajs/ui"
 import { useTranslation } from "react-i18next"
-import { useNavigate } from "react-router-dom"
 
 import { ActionMenu } from "../../../../../components/common/action-menu"
-import { useDeletePriceList } from "../../../../../hooks/api/price-lists"
+import { useDeletePriceListAction } from "../../../common/hooks/use-delete-price-list-action"
 import { getPriceListStatus } from "../../../common/utils"
 
-type PricingGeneralSectionProps = {
-  priceList: PriceListDTO
+type PriceListGeneralSectionProps = {
+  priceList: HttpTypes.AdminPriceList
 }
 
-export const PricingGeneralSection = ({
+export const PriceListGeneralSection = ({
   priceList,
-}: PricingGeneralSectionProps) => {
+}: PriceListGeneralSectionProps) => {
   const { t } = useTranslation()
-  const navigate = useNavigate()
-  const prompt = usePrompt()
-
-  const { mutateAsync } = useDeletePriceList(priceList.id)
 
   const overrideCount = priceList.prices?.length || 0
 
   const { color, text } = getPriceListStatus(t, priceList)
 
-  const handleDelete = async () => {
-    const res = await prompt({
-      title: t("general.areYouSure"),
-      description: t("pricing.warnings.delete", {
-        name: priceList.title,
-      }),
-      confirmText: t("actions.delete"),
-      cancelText: t("actions.cancel"),
-    })
-
-    if (!res) {
-      return
-    }
-
-    await mutateAsync(undefined, {
-      onSuccess: () => {
-        navigate("..", { replace: true })
-      },
-    })
-  }
+  const handleDelete = useDeletePriceListAction({ priceList })
 
   const type =
     priceList.type === "sale"
-      ? t("pricing.type.sale")
-      : t("pricing.type.override")
+      ? t("priceLists.fields.type.options.sale.label")
+      : t("priceLists.fields.type.options.override.label")
 
   return (
     <Container className="divide-y p-0">
@@ -99,7 +75,7 @@ export const PricingGeneralSection = ({
       </div>
       <div className="text-ui-fg-subtle grid grid-cols-2 items-center px-6 py-4">
         <Text leading="compact" size="small" weight="plus">
-          {t("pricing.fields.priceOverridesLabel")}
+          {t("priceLists.fields.priceOverrides.label")}
         </Text>
         <Text size="small" className="text-pretty">
           {overrideCount || "-"}
diff --git a/packages/admin-next/dashboard/src/routes/price-lists/price-list-detail/components/price-list-product-section/index.ts b/packages/admin-next/dashboard/src/routes/price-lists/price-list-detail/components/price-list-product-section/index.ts
new file mode 100644
index 0000000000..1dc742026f
--- /dev/null
+++ b/packages/admin-next/dashboard/src/routes/price-lists/price-list-detail/components/price-list-product-section/index.ts
@@ -0,0 +1 @@
+export * from "./price-list-product-section"
diff --git a/packages/admin-next/dashboard/src/routes/pricing/pricing-detail/components/pricing-product-section/pricing-product-section.tsx b/packages/admin-next/dashboard/src/routes/price-lists/price-list-detail/components/price-list-product-section/price-list-product-section.tsx
similarity index 76%
rename from packages/admin-next/dashboard/src/routes/pricing/pricing-detail/components/pricing-product-section/pricing-product-section.tsx
rename to packages/admin-next/dashboard/src/routes/price-lists/price-list-detail/components/price-list-product-section/price-list-product-section.tsx
index 6c360a3d90..1873712c9a 100644
--- a/packages/admin-next/dashboard/src/routes/pricing/pricing-detail/components/pricing-product-section/pricing-product-section.tsx
+++ b/packages/admin-next/dashboard/src/routes/price-lists/price-list-detail/components/price-list-product-section/price-list-product-section.tsx
@@ -1,11 +1,12 @@
 import { PencilSquare, Plus, Trash } from "@medusajs/icons"
-import { HttpTypes, PriceListDTO } from "@medusajs/types"
-import { Checkbox, Container, Heading, usePrompt } from "@medusajs/ui"
+import { HttpTypes } from "@medusajs/types"
+import { Checkbox, Container, Heading, toast, usePrompt } from "@medusajs/ui"
 import { keepPreviousData } from "@tanstack/react-query"
 import { RowSelectionState, createColumnHelper } from "@tanstack/react-table"
 import { useMemo, useState } from "react"
 import { useTranslation } from "react-i18next"
 import { useNavigate } from "react-router-dom"
+
 import { ActionMenu } from "../../../../../components/common/action-menu"
 import { DataTable } from "../../../../../components/table/data-table"
 import { usePriceListLinkProducts } from "../../../../../hooks/api/price-lists"
@@ -15,16 +16,16 @@ import { useProductTableFilters } from "../../../../../hooks/table/filters/use-p
 import { useProductTableQuery } from "../../../../../hooks/table/query/use-product-table-query"
 import { useDataTable } from "../../../../../hooks/use-data-table"
 
-type PricingProductSectionProps = {
-  priceList: PriceListDTO
+type PriceListProductSectionProps = {
+  priceList: HttpTypes.AdminPriceList
 }
 
 const PAGE_SIZE = 10
 const PREFIX = "p"
 
-export const PricingProductSection = ({
+export const PriceListProductSection = ({
   priceList,
-}: PricingProductSectionProps) => {
+}: PriceListProductSectionProps) => {
   const { t } = useTranslation()
   const navigate = useNavigate()
   const prompt = usePrompt()
@@ -67,7 +68,7 @@ export const PricingProductSection = ({
   const handleDelete = async () => {
     const res = await prompt({
       title: t("general.areYouSure"),
-      description: t("pricing.products.deleteProductsPricesWarning", {
+      description: t("priceLists.products.delete.confirmation", {
         count: Object.keys(rowSelection).length,
       }),
       confirmText: t("actions.delete"),
@@ -78,15 +79,31 @@ export const PricingProductSection = ({
       return
     }
 
-    mutateAsync({
-      remove: Object.keys(rowSelection),
-    })
+    mutateAsync(
+      {
+        remove: Object.keys(rowSelection),
+      },
+      {
+        onSuccess: () => {
+          toast.success(
+            t("priceLists.products.delete.successToast", {
+              count: Object.keys(rowSelection).length,
+            })
+          )
+
+          setRowSelection({})
+        },
+        onError: (e) => {
+          toast.error(e.message)
+        },
+      }
+    )
   }
 
   const handleEdit = async () => {
     const ids = Object.keys(rowSelection).join(",")
 
-    navigate(`/pricing/${priceList.id}/products/edit?ids[]=${ids}`)
+    navigate(`products/edit?ids[]=${ids}`)
   }
 
   if (isError) {
@@ -96,18 +113,18 @@ export const PricingProductSection = ({
   return (
     <Container className="divide-y p-0">
       <div className="flex items-center justify-between px-6 py-4">
-        <Heading>{t("products.domain")}</Heading>
+        <Heading>{t("priceLists.products.header")}</Heading>
         <ActionMenu
           groups={[
             {
               actions: [
                 {
-                  label: t("pricing.prices.addPrices"),
+                  label: t("priceLists.products.actions.addProducts"),
                   to: "products/add",
                   icon: <Plus />,
                 },
                 {
-                  label: t("pricing.prices.editPrices"),
+                  label: t("priceLists.products.actions.editPrices"),
                   to: "products/edit",
                   icon: <PencilSquare />,
                 },
@@ -154,14 +171,13 @@ const ProductRowAction = ({
   priceList: HttpTypes.AdminPriceList
 }) => {
   const { t } = useTranslation()
+  const prompt = usePrompt()
   const { mutateAsync } = usePriceListLinkProducts(priceList.id)
 
   const handleDelete = async () => {
-    const prompt = usePrompt()
-
     const res = await prompt({
       title: t("general.areYouSure"),
-      description: t("pricing.products.deleteProductsPricesWarning", {
+      description: t("priceLists.products.delete.confirmation", {
         count: 1,
       }),
       confirmText: t("actions.delete"),
@@ -172,14 +188,37 @@ const ProductRowAction = ({
       return
     }
 
-    mutateAsync({
-      remove: [product.id],
-    })
+    mutateAsync(
+      {
+        remove: [product.id],
+      },
+      {
+        onSuccess: () => {
+          toast.success(
+            t("priceLists.products.delete.successToast", {
+              count: 1,
+            })
+          )
+        },
+        onError: (e) => {
+          toast.error(e.message)
+        },
+      }
+    )
   }
 
   return (
     <ActionMenu
       groups={[
+        {
+          actions: [
+            {
+              icon: <PencilSquare />,
+              label: t("priceLists.products.actions.editPrices"),
+              to: `products/edit?ids[]=${product.id}`,
+            },
+          ],
+        },
         {
           actions: [
             {
@@ -237,6 +276,6 @@ const useColumns = (priceList: HttpTypes.AdminPriceList) => {
         ),
       }),
     ],
-    [base]
+    [base, priceList]
   )
 }
diff --git a/packages/admin-next/dashboard/src/routes/price-lists/price-list-detail/index.ts b/packages/admin-next/dashboard/src/routes/price-lists/price-list-detail/index.ts
new file mode 100644
index 0000000000..a15288c41f
--- /dev/null
+++ b/packages/admin-next/dashboard/src/routes/price-lists/price-list-detail/index.ts
@@ -0,0 +1,2 @@
+export { pricingLoader as loader } from "./loader"
+export { PriceListDetails as Component } from "./price-list-detail"
diff --git a/packages/admin-next/dashboard/src/routes/pricing/pricing-detail/loader.ts b/packages/admin-next/dashboard/src/routes/price-lists/price-list-detail/loader.ts
similarity index 85%
rename from packages/admin-next/dashboard/src/routes/pricing/pricing-detail/loader.ts
rename to packages/admin-next/dashboard/src/routes/price-lists/price-list-detail/loader.ts
index 604828dc15..acf902d6b1 100644
--- a/packages/admin-next/dashboard/src/routes/pricing/pricing-detail/loader.ts
+++ b/packages/admin-next/dashboard/src/routes/price-lists/price-list-detail/loader.ts
@@ -1,12 +1,12 @@
 import { LoaderFunctionArgs } from "react-router-dom"
 import { priceListsQueryKeys } from "../../../hooks/api/price-lists"
-import { client } from "../../../lib/client"
+import { sdk } from "../../../lib/client"
 import { queryClient } from "../../../lib/query-client"
 import { PriceListRes } from "../../../types/api-responses"
 
 const pricingDetailQuery = (id: string) => ({
   queryKey: priceListsQueryKeys.detail(id),
-  queryFn: async () => client.priceLists.retrieve(id),
+  queryFn: async () => sdk.admin.priceList.retrieve(id),
 })
 
 export const pricingLoader = async ({ params }: LoaderFunctionArgs) => {
diff --git a/packages/admin-next/dashboard/src/routes/pricing/pricing-detail/pricing-detail.tsx b/packages/admin-next/dashboard/src/routes/price-lists/price-list-detail/price-list-detail.tsx
similarity index 76%
rename from packages/admin-next/dashboard/src/routes/pricing/pricing-detail/pricing-detail.tsx
rename to packages/admin-next/dashboard/src/routes/price-lists/price-list-detail/price-list-detail.tsx
index ff66d85ad3..af0ae3a37e 100644
--- a/packages/admin-next/dashboard/src/routes/pricing/pricing-detail/pricing-detail.tsx
+++ b/packages/admin-next/dashboard/src/routes/price-lists/price-list-detail/price-list-detail.tsx
@@ -2,16 +2,16 @@ import { Outlet, useParams } from "react-router-dom"
 
 import { JsonViewSection } from "../../../components/common/json-view-section"
 import { usePriceList } from "../../../hooks/api/price-lists"
-import { PricingConfigurationSection } from "./components/pricing-configuration-section"
-import { PricingGeneralSection } from "./components/pricing-general-section"
-import { PricingProductSection } from "./components/pricing-product-section"
+import { PriceListConfigurationSection } from "./components/price-list-configuration-section"
+import { PriceListGeneralSection } from "./components/price-list-general-section"
+import { PriceListProductSection } from "./components/price-list-product-section"
 
 import after from "virtual:medusa/widgets/price_list/details/after"
 import before from "virtual:medusa/widgets/price_list/details/before"
 import sideAfter from "virtual:medusa/widgets/price_list/details/side/after"
 import sideBefore from "virtual:medusa/widgets/price_list/details/side/before"
 
-export const PricingDetail = () => {
+export const PriceListDetails = () => {
   const { id } = useParams()
 
   const { price_list, isLoading, isError, error } = usePriceList(id!)
@@ -33,10 +33,10 @@ export const PricingDetail = () => {
           </div>
         )
       })}
-      <div className="flex flex-col gap-x-4 lg:flex-row xl:items-start">
+      <div className="flex flex-col gap-x-4 xl:flex-row xl:items-start">
         <div className="flex w-full flex-col gap-y-3">
-          <PricingGeneralSection priceList={price_list} />
-          <PricingProductSection priceList={price_list} />
+          <PriceListGeneralSection priceList={price_list} />
+          <PriceListProductSection priceList={price_list} />
           {after.widgets.map((w, i) => {
             return (
               <div key={i}>
@@ -48,7 +48,7 @@ export const PricingDetail = () => {
             <JsonViewSection data={price_list} />
           </div>
         </div>
-        <div className="mt-2 flex w-full max-w-[100%] flex-col gap-y-2 xl:mt-0 xl:max-w-[400px]">
+        <div className="mt-2 flex w-full max-w-[100%] flex-col gap-y-2 xl:mt-0 xl:max-w-[423px]">
           {sideBefore.widgets.map((w, i) => {
             return (
               <div key={i}>
@@ -56,7 +56,7 @@ export const PricingDetail = () => {
               </div>
             )
           })}
-          <PricingConfigurationSection priceList={price_list} />
+          <PriceListConfigurationSection priceList={price_list} />
           {sideAfter.widgets.map((w, i) => {
             return (
               <div key={i}>
diff --git a/packages/admin-next/dashboard/src/routes/pricing/pricing-edit/components/edit-price-list-form/edit-price-list-form.tsx b/packages/admin-next/dashboard/src/routes/price-lists/price-list-edit/components/price-list-edit-form/edit-price-list-form.tsx
similarity index 57%
rename from packages/admin-next/dashboard/src/routes/pricing/pricing-edit/components/edit-price-list-form/edit-price-list-form.tsx
rename to packages/admin-next/dashboard/src/routes/price-lists/price-list-edit/components/price-list-edit-form/edit-price-list-form.tsx
index 8fee19bb66..d04fe31495 100644
--- a/packages/admin-next/dashboard/src/routes/pricing/pricing-edit/components/edit-price-list-form/edit-price-list-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/price-lists/price-list-edit/components/price-list-edit-form/edit-price-list-form.tsx
@@ -1,49 +1,63 @@
 import { zodResolver } from "@hookform/resolvers/zod"
-import { PriceListDTO } from "@medusajs/types"
-import { Button, Input, RadioGroup, Textarea } from "@medusajs/ui"
+import { HttpTypes } from "@medusajs/types"
+import {
+  Button,
+  Input,
+  RadioGroup,
+  Select,
+  Textarea,
+  toast,
+} from "@medusajs/ui"
 import { useForm } from "react-hook-form"
 import { useTranslation } from "react-i18next"
 import { z } from "zod"
+
 import { Form } from "../../../../../components/common/form"
-import {
-  RouteDrawer,
-  useRouteModal,
-} from "../../../../../components/route-modal"
+import { RouteDrawer, useRouteModal } from "../../../../../components/modals"
 import { useUpdatePriceList } from "../../../../../hooks/api/price-lists"
 import { PriceListStatus, PriceListType } from "../../../common/constants"
 
-type EditPriceListFormProps = {
-  priceList: PriceListDTO
+type PriceListEditFormProps = {
+  priceList: HttpTypes.AdminPriceList
 }
 
-const EditPriceListFormSchema = z.object({
+const PriceListEditSchema = z.object({
   status: z.nativeEnum(PriceListStatus),
   type: z.nativeEnum(PriceListType),
   title: z.string().min(1),
   description: z.string().min(1),
 })
 
-export const EditPriceListForm = ({ priceList }: EditPriceListFormProps) => {
+export const PriceListEditForm = ({ priceList }: PriceListEditFormProps) => {
   const { t } = useTranslation()
   const { handleSuccess } = useRouteModal()
 
-  const form = useForm<z.infer<typeof EditPriceListFormSchema>>({
+  const form = useForm<z.infer<typeof PriceListEditSchema>>({
     defaultValues: {
       type: priceList.type as PriceListType,
       title: priceList.title,
       description: priceList.description,
       status: priceList.status as PriceListStatus,
     },
-    resolver: zodResolver(EditPriceListFormSchema),
+    resolver: zodResolver(PriceListEditSchema),
   })
 
   const { mutateAsync } = useUpdatePriceList(priceList.id)
 
   const handleSubmit = form.handleSubmit(async (values) => {
     await mutateAsync(values, {
-      onSuccess: () => {
+      onSuccess: ({ price_list }) => {
+        toast.success(
+          t("priceLists.edit.successToast", {
+            title: price_list.title,
+          })
+        )
+
         handleSuccess()
       },
+      onError: (error) => {
+        toast.error(error.message)
+      },
     })
   })
 
@@ -53,40 +67,7 @@ export const EditPriceListForm = ({ priceList }: EditPriceListFormProps) => {
         className="flex flex-1 flex-col overflow-hidden"
         onSubmit={handleSubmit}
       >
-        <RouteDrawer.Body className="flex flex-1 flex-col gap-y-8 overflow-auto">
-          <Form.Field
-            control={form.control}
-            name="status"
-            render={({ field: { onChange, ...field } }) => {
-              return (
-                <Form.Item>
-                  <div>
-                    <Form.Label tooltip={t("pricing.fields.statusTooltip")}>
-                      {t("fields.status")}
-                    </Form.Label>
-                    <Form.Hint>{t("pricing.fields.statusHint")}</Form.Hint>
-                  </div>
-
-                  <Form.Control>
-                    <RadioGroup {...field} onValueChange={onChange}>
-                      <RadioGroup.ChoiceBox
-                        value={PriceListStatus.DRAFT}
-                        label={t("pricing.status.draft")}
-                        description={t("pricing.fields.draftTypeHint")}
-                      />
-
-                      <RadioGroup.ChoiceBox
-                        value={PriceListStatus.ACTIVE}
-                        label={t("pricing.status.active")}
-                        description={t("pricing.fields.activeTypeHint")}
-                      />
-                    </RadioGroup>
-                  </Form.Control>
-                </Form.Item>
-              )
-            }}
-          />
-
+        <RouteDrawer.Body className="flex flex-1 flex-col gap-y-6 overflow-auto">
           <Form.Field
             control={form.control}
             name="type"
@@ -94,23 +75,30 @@ export const EditPriceListForm = ({ priceList }: EditPriceListFormProps) => {
               return (
                 <Form.Item>
                   <div>
-                    <Form.Label>{t("fields.type")}</Form.Label>
-                    <Form.Hint>{t("pricing.fields.typeHint")}</Form.Hint>
+                    <Form.Label>{t("priceLists.fields.type.label")}</Form.Label>
+                    <Form.Hint>{t("priceLists.fields.type.hint")}</Form.Hint>
                   </div>
                   <Form.Control>
                     <RadioGroup {...field} onValueChange={onChange}>
                       <RadioGroup.ChoiceBox
                         value={PriceListType.SALE}
-                        label={t("pricing.type.sale")}
-                        description={t("pricing.fields.saleTypeHint")}
+                        label={t("priceLists.fields.type.options.sale.label")}
+                        description={t(
+                          "priceLists.fields.type.options.sale.description"
+                        )}
                       />
                       <RadioGroup.ChoiceBox
                         value={PriceListType.OVERRIDE}
-                        label={t("pricing.type.override")}
-                        description={t("pricing.fields.overrideTypeHint")}
+                        label={t(
+                          "priceLists.fields.type.options.override.label"
+                        )}
+                        description={t(
+                          "priceLists.fields.type.options.override.description"
+                        )}
                       />
                     </RadioGroup>
                   </Form.Control>
+                  <Form.ErrorMessage />
                 </Form.Item>
               )
             }}
@@ -131,6 +119,35 @@ export const EditPriceListForm = ({ priceList }: EditPriceListFormProps) => {
                 )
               }}
             />
+            <Form.Field
+              control={form.control}
+              name="status"
+              render={({ field: { onChange, ref, ...field } }) => {
+                return (
+                  <Form.Item>
+                    <Form.Label>
+                      {t("priceLists.fields.status.label")}
+                    </Form.Label>
+                    <Form.Control>
+                      <Select {...field} onValueChange={onChange}>
+                        <Select.Trigger ref={ref}>
+                          <Select.Value />
+                        </Select.Trigger>
+                        <Select.Content>
+                          <Select.Item value={PriceListStatus.ACTIVE}>
+                            {t("priceLists.fields.status.options.active")}
+                          </Select.Item>
+                          <Select.Item value={PriceListStatus.DRAFT}>
+                            {t("priceLists.fields.status.options.draft")}
+                          </Select.Item>
+                        </Select.Content>
+                      </Select>
+                    </Form.Control>
+                    <Form.ErrorMessage />
+                  </Form.Item>
+                )
+              }}
+            />
             <Form.Field
               control={form.control}
               name="description"
diff --git a/packages/admin-next/dashboard/src/routes/pricing/pricing-edit/components/edit-price-list-form/index.ts b/packages/admin-next/dashboard/src/routes/price-lists/price-list-edit/components/price-list-edit-form/index.ts
similarity index 100%
rename from packages/admin-next/dashboard/src/routes/pricing/pricing-edit/components/edit-price-list-form/index.ts
rename to packages/admin-next/dashboard/src/routes/price-lists/price-list-edit/components/price-list-edit-form/index.ts
diff --git a/packages/admin-next/dashboard/src/routes/price-lists/price-list-edit/index.ts b/packages/admin-next/dashboard/src/routes/price-lists/price-list-edit/index.ts
new file mode 100644
index 0000000000..d67cc74f5a
--- /dev/null
+++ b/packages/admin-next/dashboard/src/routes/price-lists/price-list-edit/index.ts
@@ -0,0 +1 @@
+export { PriceListEdit as Component } from "./price-list-edit"
diff --git a/packages/admin-next/dashboard/src/routes/pricing/pricing-edit/pricing-edit.tsx b/packages/admin-next/dashboard/src/routes/price-lists/price-list-edit/price-list-edit.tsx
similarity index 65%
rename from packages/admin-next/dashboard/src/routes/pricing/pricing-edit/pricing-edit.tsx
rename to packages/admin-next/dashboard/src/routes/price-lists/price-list-edit/price-list-edit.tsx
index 2860801063..e7c2c65468 100644
--- a/packages/admin-next/dashboard/src/routes/pricing/pricing-edit/pricing-edit.tsx
+++ b/packages/admin-next/dashboard/src/routes/price-lists/price-list-edit/price-list-edit.tsx
@@ -1,11 +1,11 @@
 import { Heading } from "@medusajs/ui"
 import { useTranslation } from "react-i18next"
 import { useParams } from "react-router-dom"
-import { RouteDrawer } from "../../../components/route-modal"
+import { RouteDrawer } from "../../../components/modals"
 import { usePriceList } from "../../../hooks/api/price-lists"
-import { EditPriceListForm } from "./components/edit-price-list-form"
+import { PriceListEditForm } from "./components/price-list-edit-form"
 
-export const PricingEdit = () => {
+export const PriceListEdit = () => {
   const { t } = useTranslation()
   const { id } = useParams()
 
@@ -20,9 +20,9 @@ export const PricingEdit = () => {
   return (
     <RouteDrawer>
       <RouteDrawer.Header>
-        <Heading>{t("pricing.edit.header")}</Heading>
+        <Heading>{t("priceLists.edit.header")}</Heading>
       </RouteDrawer.Header>
-      {ready && <EditPriceListForm priceList={price_list} />}
+      {ready && <PriceListEditForm priceList={price_list} />}
     </RouteDrawer>
   )
 }
diff --git a/packages/admin-next/dashboard/src/routes/price-lists/price-list-list/components/price-list-list-table/index.ts b/packages/admin-next/dashboard/src/routes/price-lists/price-list-list/components/price-list-list-table/index.ts
new file mode 100644
index 0000000000..1ca9698bc8
--- /dev/null
+++ b/packages/admin-next/dashboard/src/routes/price-lists/price-list-list/components/price-list-list-table/index.ts
@@ -0,0 +1 @@
+export * from "./price-list-list-table"
diff --git a/packages/admin-next/dashboard/src/routes/price-lists/price-list-list/components/price-list-list-table/price-list-list-table-actions.tsx b/packages/admin-next/dashboard/src/routes/price-lists/price-list-list/components/price-list-list-table/price-list-list-table-actions.tsx
new file mode 100644
index 0000000000..58efa495ec
--- /dev/null
+++ b/packages/admin-next/dashboard/src/routes/price-lists/price-list-list/components/price-list-list-table/price-list-list-table-actions.tsx
@@ -0,0 +1,42 @@
+import { PencilSquare, Trash } from "@medusajs/icons"
+import { HttpTypes } from "@medusajs/types"
+
+import { useTranslation } from "react-i18next"
+import { ActionMenu } from "../../../../../components/common/action-menu"
+import { useDeletePriceListAction } from "../../../common/hooks/use-delete-price-list-action"
+
+type PriceListListTableActionsProps = {
+  priceList: HttpTypes.AdminPriceList
+}
+
+export const PriceListListTableActions = ({
+  priceList,
+}: PriceListListTableActionsProps) => {
+  const { t } = useTranslation()
+  const handleDelete = useDeletePriceListAction({ priceList })
+
+  return (
+    <ActionMenu
+      groups={[
+        {
+          actions: [
+            {
+              label: t("actions.edit"),
+              to: `${priceList.id}/edit`,
+              icon: <PencilSquare />,
+            },
+          ],
+        },
+        {
+          actions: [
+            {
+              label: t("actions.delete"),
+              onClick: handleDelete,
+              icon: <Trash />,
+            },
+          ],
+        },
+      ]}
+    />
+  )
+}
diff --git a/packages/admin-next/dashboard/src/routes/pricing/pricing-list/components/pricing-list-table/pricing-list-table.tsx b/packages/admin-next/dashboard/src/routes/price-lists/price-list-list/components/price-list-list-table/price-list-list-table.tsx
similarity index 86%
rename from packages/admin-next/dashboard/src/routes/pricing/pricing-list/components/pricing-list-table/pricing-list-table.tsx
rename to packages/admin-next/dashboard/src/routes/price-lists/price-list-list/components/price-list-list-table/price-list-list-table.tsx
index b7484c4c4a..6f657d2418 100644
--- a/packages/admin-next/dashboard/src/routes/pricing/pricing-list/components/pricing-list-table/pricing-list-table.tsx
+++ b/packages/admin-next/dashboard/src/routes/price-lists/price-list-list/components/price-list-list-table/price-list-list-table.tsx
@@ -11,17 +11,14 @@ import { usePricingTableQuery } from "./use-pricing-table-query"
 
 const PAGE_SIZE = 20
 
-export const PricingListTable = () => {
+export const PriceListListTable = () => {
   const { t } = useTranslation()
 
   const { searchParams, raw } = usePricingTableQuery({
     pageSize: PAGE_SIZE,
   })
   const { price_lists, count, isLoading, isError, error } = usePriceLists(
-    // {
-    //   ...searchParams, // TODO: Query params are not currently supported by the API.
-    // },
-    undefined,
+    searchParams,
     {
       placeholderData: keepPreviousData,
     }
@@ -46,7 +43,7 @@ export const PricingListTable = () => {
   return (
     <Container className="divide-y p-0">
       <div className="flex items-center justify-between px-6 py-4">
-        <Heading>{t("pricing.domain")}</Heading>
+        <Heading>{t("priceLists.domain")}</Heading>
         <Button size="small" variant="secondary" asChild>
           <Link to="create">{t("actions.create")}</Link>
         </Button>
@@ -56,7 +53,7 @@ export const PricingListTable = () => {
         columns={columns}
         count={count}
         filters={filters}
-        orderBy={["name", "status", "created_at", "updated_at"]}
+        orderBy={["title", "status", "created_at", "updated_at"]}
         queryObject={raw}
         pageSize={PAGE_SIZE}
         navigateTo={(row) => row.original.id}
diff --git a/packages/admin-next/dashboard/src/routes/pricing/pricing-list/components/pricing-list-table/use-pricing-table-columns.tsx b/packages/admin-next/dashboard/src/routes/price-lists/price-list-list/components/price-list-list-table/use-pricing-table-columns.tsx
similarity index 68%
rename from packages/admin-next/dashboard/src/routes/pricing/pricing-list/components/pricing-list-table/use-pricing-table-columns.tsx
rename to packages/admin-next/dashboard/src/routes/price-lists/price-list-list/components/price-list-list-table/use-pricing-table-columns.tsx
index 62aeeda2a0..d301d577db 100644
--- a/packages/admin-next/dashboard/src/routes/pricing/pricing-list/components/pricing-list-table/use-pricing-table-columns.tsx
+++ b/packages/admin-next/dashboard/src/routes/price-lists/price-list-list/components/price-list-list-table/use-pricing-table-columns.tsx
@@ -1,16 +1,17 @@
-import { PriceListDTO } from "@medusajs/types"
+import { HttpTypes } from "@medusajs/types"
 import { createColumnHelper } from "@tanstack/react-table"
 import { useMemo } from "react"
 import { useTranslation } from "react-i18next"
+
 import { StatusCell } from "../../../../../components/table/table-cells/common/status-cell"
 import {
   TextCell,
   TextHeader,
 } from "../../../../../components/table/table-cells/common/text-cell"
 import { getPriceListStatus } from "../../../common/utils"
-import { PricingTableActions } from "./pricing-table-actions"
+import { PriceListListTableActions } from "./price-list-list-table-actions"
 
-const columnHelper = createColumnHelper<PriceListDTO>()
+const columnHelper = createColumnHelper<HttpTypes.AdminPriceList>()
 
 export const usePricingTableColumns = () => {
   const { t } = useTranslation()
@@ -18,11 +19,11 @@ export const usePricingTableColumns = () => {
   return useMemo(
     () => [
       columnHelper.accessor("title", {
-        header: () => <TextHeader text={t("fields.name")} />,
+        header: () => <TextHeader text={t("fields.title")} />,
         cell: (info) => info.getValue(),
       }),
       columnHelper.accessor("status", {
-        header: t("fields.status"),
+        header: t("priceLists.fields.status.label"),
         cell: ({ row }) => {
           const { color, text } = getPriceListStatus(t, row.original)
 
@@ -30,12 +31,14 @@ export const usePricingTableColumns = () => {
         },
       }),
       columnHelper.accessor("prices", {
-        header: t("pricing.table.pricesHeader"),
+        header: t("priceLists.fields.priceOverrides.header"),
         cell: (info) => <TextCell text={`${info.getValue()?.length || "-"}`} />,
       }),
       columnHelper.display({
         id: "actions",
-        cell: ({ row }) => <PricingTableActions priceList={row.original} />,
+        cell: ({ row }) => (
+          <PriceListListTableActions priceList={row.original} />
+        ),
       }),
     ],
     [t]
diff --git a/packages/admin-next/dashboard/src/routes/price-lists/price-list-list/components/price-list-list-table/use-pricing-table-filters.tsx b/packages/admin-next/dashboard/src/routes/price-lists/price-list-list/components/price-list-list-table/use-pricing-table-filters.tsx
new file mode 100644
index 0000000000..4a49104ef3
--- /dev/null
+++ b/packages/admin-next/dashboard/src/routes/price-lists/price-list-list/components/price-list-list-table/use-pricing-table-filters.tsx
@@ -0,0 +1,7 @@
+import { useDateTableFilters } from "../../../../../hooks/table/filters/use-date-table-filters"
+
+export const usePricingTableFilters = () => {
+  const dateFilters = useDateTableFilters()
+
+  return dateFilters
+}
diff --git a/packages/admin-next/dashboard/src/routes/pricing/pricing-list/components/pricing-list-table/use-pricing-table-query.tsx b/packages/admin-next/dashboard/src/routes/price-lists/price-list-list/components/price-list-list-table/use-pricing-table-query.tsx
similarity index 54%
rename from packages/admin-next/dashboard/src/routes/pricing/pricing-list/components/pricing-list-table/use-pricing-table-query.tsx
rename to packages/admin-next/dashboard/src/routes/price-lists/price-list-list/components/price-list-list-table/use-pricing-table-query.tsx
index 47c4c1e810..4d380f435f 100644
--- a/packages/admin-next/dashboard/src/routes/pricing/pricing-list/components/pricing-list-table/use-pricing-table-query.tsx
+++ b/packages/admin-next/dashboard/src/routes/price-lists/price-list-list/components/price-list-list-table/use-pricing-table-query.tsx
@@ -1,4 +1,4 @@
-import { AdminGetPriceListPaginationParams } from "@medusajs/medusa"
+import { HttpTypes, PriceListStatus } from "@medusajs/types"
 import { useQueryParams } from "../../../../../hooks/use-query-params"
 
 export const usePricingTableQuery = ({
@@ -8,11 +8,13 @@ export const usePricingTableQuery = ({
   pageSize?: number
   prefix?: string
 }) => {
-  const raw = useQueryParams(["offset", "q"], prefix)
+  const raw = useQueryParams(["offset", "q", "order", "status"], prefix)
 
-  const searchParams: AdminGetPriceListPaginationParams = {
+  const searchParams: HttpTypes.AdminPriceListListParams = {
     limit: pageSize,
     offset: raw.offset ? Number(raw.offset) : 0,
+    order: raw.order,
+    status: raw.status?.split(",") as PriceListStatus[],
     q: raw.q,
   }
 
diff --git a/packages/admin-next/dashboard/src/routes/price-lists/price-list-list/index.ts b/packages/admin-next/dashboard/src/routes/price-lists/price-list-list/index.ts
new file mode 100644
index 0000000000..1a141b8abb
--- /dev/null
+++ b/packages/admin-next/dashboard/src/routes/price-lists/price-list-list/index.ts
@@ -0,0 +1 @@
+export { PriceListList as Component } from "./price-list-list"
diff --git a/packages/admin-next/dashboard/src/routes/pricing/pricing-list/pricing-list.tsx b/packages/admin-next/dashboard/src/routes/price-lists/price-list-list/price-list-list.tsx
similarity index 80%
rename from packages/admin-next/dashboard/src/routes/pricing/pricing-list/pricing-list.tsx
rename to packages/admin-next/dashboard/src/routes/price-lists/price-list-list/price-list-list.tsx
index c03dfa0a60..c23a9c407a 100644
--- a/packages/admin-next/dashboard/src/routes/pricing/pricing-list/pricing-list.tsx
+++ b/packages/admin-next/dashboard/src/routes/price-lists/price-list-list/price-list-list.tsx
@@ -1,11 +1,11 @@
 import { Outlet } from "react-router-dom"
 
-import { PricingListTable } from "./components/pricing-list-table"
+import { PriceListListTable } from "./components/price-list-list-table"
 
 import after from "virtual:medusa/widgets/price_list/list/after"
 import before from "virtual:medusa/widgets/price_list/list/before"
 
-export const PricingList = () => {
+export const PriceListList = () => {
   return (
     <div className="flex flex-col gap-y-2">
       {before.widgets.map((w, i) => {
@@ -15,7 +15,7 @@ export const PricingList = () => {
           </div>
         )
       })}
-      <PricingListTable />
+      <PriceListListTable />
       {after.widgets.map((w, i) => {
         return (
           <div key={i}>
diff --git a/packages/admin-next/dashboard/src/routes/price-lists/price-list-prices-add/components/price-list-prices-add-form/index.ts b/packages/admin-next/dashboard/src/routes/price-lists/price-list-prices-add/components/price-list-prices-add-form/index.ts
new file mode 100644
index 0000000000..cbc89a9e21
--- /dev/null
+++ b/packages/admin-next/dashboard/src/routes/price-lists/price-list-prices-add/components/price-list-prices-add-form/index.ts
@@ -0,0 +1 @@
+export * from "./price-list-prices-add-form"
diff --git a/packages/admin-next/dashboard/src/routes/price-lists/price-list-prices-add/components/price-list-prices-add-form/price-list-prices-add-form.tsx b/packages/admin-next/dashboard/src/routes/price-lists/price-list-prices-add/components/price-list-prices-add-form/price-list-prices-add-form.tsx
new file mode 100644
index 0000000000..1d7640c14c
--- /dev/null
+++ b/packages/admin-next/dashboard/src/routes/price-lists/price-list-prices-add/components/price-list-prices-add-form/price-list-prices-add-form.tsx
@@ -0,0 +1,296 @@
+import { zodResolver } from "@hookform/resolvers/zod"
+import { HttpTypes } from "@medusajs/types"
+import { Button, ProgressStatus, ProgressTabs, toast } from "@medusajs/ui"
+import { useState } from "react"
+import { FieldPath, useForm } from "react-hook-form"
+import { useTranslation } from "react-i18next"
+import { z } from "zod"
+
+import {
+  RouteFocusModal,
+  useRouteModal,
+} from "../../../../../components/modals"
+import { useBatchPriceListPrices } from "../../../../../hooks/api/price-lists"
+import { exctractPricesFromProducts } from "../../../common/utils"
+import { PriceListPricesAddPricesForm } from "./price-list-prices-add-prices-form"
+import { PriceListPricesAddProductIdsForm } from "./price-list-prices-add-product-ids-form"
+import {
+  PriceListPricesAddProductIdsSchema,
+  PriceListPricesAddProductsFields,
+  PriceListPricesAddProductsIdsFields,
+  PriceListPricesAddSchema,
+} from "./schema"
+
+type PriceListPricesAddFormProps = {
+  priceList: HttpTypes.AdminPriceList
+  currencies: HttpTypes.AdminStoreCurrency[]
+  regions: HttpTypes.AdminRegion[]
+}
+
+enum Tab {
+  PRODUCT = "product",
+  PRICE = "price",
+}
+
+const tabOrder = [Tab.PRODUCT, Tab.PRICE] as const
+
+type TabState = Record<Tab, ProgressStatus>
+
+const initialTabState: TabState = {
+  [Tab.PRODUCT]: "in-progress",
+  [Tab.PRICE]: "not-started",
+}
+
+export const PriceListPricesAddForm = ({
+  priceList,
+  regions,
+  currencies,
+}: PriceListPricesAddFormProps) => {
+  const [tab, setTab] = useState<Tab>(Tab.PRODUCT)
+  const [tabState, setTabState] = useState<TabState>(initialTabState)
+
+  const { t } = useTranslation()
+  const { handleSuccess } = useRouteModal()
+
+  const form = useForm<PriceListPricesAddSchema>({
+    defaultValues: {
+      products: {},
+      product_ids: [],
+    },
+    resolver: zodResolver(PriceListPricesAddSchema),
+  })
+
+  const { mutateAsync, isPending } = useBatchPriceListPrices(priceList.id)
+
+  const handleSubmit = form.handleSubmit(async (values) => {
+    const { products } = values
+
+    const prices = exctractPricesFromProducts(products, regions)
+
+    await mutateAsync(
+      {
+        create: prices,
+      },
+      {
+        onSuccess: () => {
+          toast.success(t("priceLists.products.add.successToast"))
+          handleSuccess()
+        },
+        onError: (e) => toast.error(e.message),
+      }
+    )
+  })
+
+  const partialFormValidation = (
+    fields: FieldPath<PriceListPricesAddSchema>[],
+    schema: z.ZodSchema<any>
+  ) => {
+    form.clearErrors(fields)
+
+    const values = fields.reduce((acc, key) => {
+      acc[key] = form.getValues(key)
+      return acc
+    }, {} as Record<string, unknown>)
+
+    const validationResult = schema.safeParse(values)
+
+    if (!validationResult.success) {
+      validationResult.error.errors.forEach(({ path, message, code }) => {
+        form.setError(path.join(".") as keyof PriceListPricesAddSchema, {
+          type: code,
+          message,
+        })
+      })
+
+      return false
+    }
+
+    return true
+  }
+
+  const isTabDirty = (tab: Tab) => {
+    switch (tab) {
+      case Tab.PRODUCT: {
+        const fields = PriceListPricesAddProductsIdsFields
+
+        return fields.some((field) => {
+          return form.getFieldState(field).isDirty
+        })
+      }
+      case Tab.PRICE: {
+        const fields = PriceListPricesAddProductsFields
+
+        return fields.some((field) => {
+          return form.getFieldState(field).isDirty
+        })
+      }
+    }
+  }
+
+  const handleChangeTab = (update: Tab) => {
+    if (tab === update) {
+      return
+    }
+
+    if (tabOrder.indexOf(update) < tabOrder.indexOf(tab)) {
+      const isCurrentTabDirty = isTabDirty(tab)
+
+      setTabState((prev) => ({
+        ...prev,
+        [tab]: isCurrentTabDirty ? prev[tab] : "not-started",
+        [update]: "in-progress",
+      }))
+
+      setTab(update)
+      return
+    }
+
+    // get the tabs from the current tab to the update tab including the current tab
+    const tabs = tabOrder.slice(0, tabOrder.indexOf(update))
+
+    // validate all the tabs from the current tab to the update tab if it fails on any of tabs then set that tab as current tab
+    for (const tab of tabs) {
+      if (tab === Tab.PRODUCT) {
+        if (
+          !partialFormValidation(
+            PriceListPricesAddProductsIdsFields,
+            PriceListPricesAddProductIdsSchema
+          )
+        ) {
+          setTabState((prev) => ({
+            ...prev,
+            [tab]: "in-progress",
+          }))
+          setTab(tab)
+
+          return
+        }
+
+        setTabState((prev) => ({
+          ...prev,
+          [tab]: "completed",
+        }))
+      }
+    }
+
+    setTabState((prev) => ({
+      ...prev,
+      [tab]: "completed",
+      [update]: "in-progress",
+    }))
+    setTab(update)
+  }
+
+  const handleNextTab = (tab: Tab) => {
+    if (tabOrder.indexOf(tab) + 1 >= tabOrder.length) {
+      return
+    }
+
+    const nextTab = tabOrder[tabOrder.indexOf(tab) + 1]
+    handleChangeTab(nextTab)
+  }
+
+  return (
+    <RouteFocusModal.Form form={form}>
+      <ProgressTabs
+        value={tab}
+        onValueChange={(tab) => handleChangeTab(tab as Tab)}
+        className="flex h-full flex-col overflow-hidden"
+      >
+        <form onSubmit={handleSubmit} className="flex h-full flex-col">
+          <RouteFocusModal.Header>
+            <div className="flex w-full items-center justify-between gap-x-4">
+              <div className="-my-2 w-full max-w-[600px] border-l">
+                <ProgressTabs.List className="grid w-full grid-cols-3">
+                  <ProgressTabs.Trigger
+                    status={tabState.product}
+                    value={Tab.PRODUCT}
+                  >
+                    {t("priceLists.create.tabs.products")}
+                  </ProgressTabs.Trigger>
+                  <ProgressTabs.Trigger
+                    status={tabState.price}
+                    value={Tab.PRICE}
+                  >
+                    {t("priceLists.create.tabs.prices")}
+                  </ProgressTabs.Trigger>
+                </ProgressTabs.List>
+              </div>
+            </div>
+          </RouteFocusModal.Header>
+          <RouteFocusModal.Body className="size-full overflow-hidden">
+            <ProgressTabs.Content
+              className="size-full overflow-y-auto"
+              value={Tab.PRODUCT}
+            >
+              <PriceListPricesAddProductIdsForm
+                form={form}
+                priceList={priceList}
+              />
+            </ProgressTabs.Content>
+            <ProgressTabs.Content
+              className="size-full overflow-hidden"
+              value={Tab.PRICE}
+            >
+              <PriceListPricesAddPricesForm
+                form={form}
+                regions={regions}
+                currencies={currencies}
+              />
+            </ProgressTabs.Content>
+          </RouteFocusModal.Body>
+          <RouteFocusModal.Footer>
+            <div className="flex items-center justify-end gap-x-2">
+              <RouteFocusModal.Close asChild>
+                <Button variant="secondary" size="small">
+                  {t("actions.cancel")}
+                </Button>
+              </RouteFocusModal.Close>
+              <PrimaryButton
+                tab={tab}
+                next={handleNextTab}
+                isLoading={isPending}
+              />
+            </div>
+          </RouteFocusModal.Footer>
+        </form>
+      </ProgressTabs>
+    </RouteFocusModal.Form>
+  )
+}
+
+type PrimaryButtonProps = {
+  tab: Tab
+  next: (tab: Tab) => void
+  isLoading?: boolean
+}
+
+const PrimaryButton = ({ tab, next, isLoading }: PrimaryButtonProps) => {
+  const { t } = useTranslation()
+
+  if (tab === Tab.PRICE) {
+    return (
+      <Button
+        key="submit-button"
+        type="submit"
+        variant="primary"
+        size="small"
+        isLoading={isLoading}
+      >
+        {t("actions.save")}
+      </Button>
+    )
+  }
+
+  return (
+    <Button
+      key="next-button"
+      type="button"
+      variant="primary"
+      size="small"
+      onClick={() => next(tab)}
+    >
+      {t("actions.continue")}
+    </Button>
+  )
+}
diff --git a/packages/admin-next/dashboard/src/routes/price-lists/price-list-prices-add/components/price-list-prices-add-form/price-list-prices-add-prices-form.tsx b/packages/admin-next/dashboard/src/routes/price-lists/price-list-prices-add/components/price-list-prices-add-form/price-list-prices-add-prices-form.tsx
new file mode 100644
index 0000000000..bfa690c141
--- /dev/null
+++ b/packages/admin-next/dashboard/src/routes/price-lists/price-list-prices-add/components/price-list-prices-add-form/price-list-prices-add-prices-form.tsx
@@ -0,0 +1,87 @@
+import { HttpTypes } from "@medusajs/types"
+import { useEffect } from "react"
+import { UseFormReturn, useWatch } from "react-hook-form"
+
+import { DataGridRoot } from "../../../../../components/data-grid/data-grid-root"
+import { useProducts } from "../../../../../hooks/api/products"
+import { usePriceListGridColumns } from "../../../common/hooks/use-price-list-grid-columns"
+import { PriceListCreateProductVariantsSchema } from "../../../common/schemas"
+import { isProductRow } from "../../../common/utils"
+import { PriceListPricesAddSchema } from "./schema"
+
+type PriceListPricesAddPricesFormProps = {
+  form: UseFormReturn<PriceListPricesAddSchema>
+  currencies: HttpTypes.AdminStoreCurrency[]
+  regions: HttpTypes.AdminRegion[]
+}
+
+export const PriceListPricesAddPricesForm = ({
+  form,
+  currencies,
+  regions,
+}: PriceListPricesAddPricesFormProps) => {
+  const ids = useWatch({
+    control: form.control,
+    name: "product_ids",
+  })
+
+  const existingProducts = useWatch({
+    control: form.control,
+    name: "products",
+  })
+
+  const { products, isLoading, isError, error } = useProducts({
+    id: ids.map((id) => id.id),
+    limit: ids.length,
+    fields: "title,thumbnail,*variants",
+  })
+
+  const { setValue } = form
+
+  useEffect(() => {
+    if (!isLoading && products) {
+      products.forEach((product) => {
+        /**
+         * If the product already exists in the form, we don't want to overwrite it.
+         */
+        if (existingProducts[product.id] || !product.variants) {
+          return
+        }
+
+        setValue(`products.${product.id}.variants`, {
+          ...product.variants.reduce((variants, variant) => {
+            variants[variant.id] = {
+              currency_prices: {},
+              region_prices: {},
+            }
+            return variants
+          }, {} as PriceListCreateProductVariantsSchema),
+        })
+      })
+    }
+  }, [products, existingProducts, isLoading, setValue])
+
+  const columns = usePriceListGridColumns({
+    currencies,
+    regions,
+  })
+
+  if (isError) {
+    throw error
+  }
+
+  return (
+    <div className="flex size-full flex-col divide-y overflow-hidden">
+      <DataGridRoot
+        columns={columns}
+        data={products}
+        getSubRows={(row) => {
+          if (isProductRow(row) && row.variants) {
+            return row.variants
+          }
+        }}
+        state={form}
+      />
+    </div>
+  )
+}
diff --git a/packages/admin-next/dashboard/src/routes/price-lists/price-list-prices-add/components/price-list-prices-add-form/price-list-prices-add-product-ids-form.tsx b/packages/admin-next/dashboard/src/routes/price-lists/price-list-prices-add/components/price-list-prices-add-form/price-list-prices-add-product-ids-form.tsx
new file mode 100644
index 0000000000..f162001691
--- /dev/null
+++ b/packages/admin-next/dashboard/src/routes/price-lists/price-list-prices-add/components/price-list-prices-add-form/price-list-prices-add-product-ids-form.tsx
@@ -0,0 +1,220 @@
+import { HttpTypes } from "@medusajs/types"
+import { Checkbox, Tooltip } from "@medusajs/ui"
+import { keepPreviousData } from "@tanstack/react-query"
+import {
+  OnChangeFn,
+  RowSelectionState,
+  createColumnHelper,
+} from "@tanstack/react-table"
+import { useMemo, useState } from "react"
+import { UseFormReturn, useWatch } from "react-hook-form"
+import { DataTable } from "../../../../../components/table/data-table"
+import { useProducts } from "../../../../../hooks/api/products"
+import { useProductTableColumns } from "../../../../../hooks/table/columns/use-product-table-columns"
+import { useProductTableFilters } from "../../../../../hooks/table/filters/use-product-table-filters"
+import { useProductTableQuery } from "../../../../../hooks/table/query/use-product-table-query"
+import { useDataTable } from "../../../../../hooks/use-data-table"
+import { PriceListCreateProductsSchema } from "../../../common/schemas"
+import { PriceListPricesAddSchema } from "./schema"
+
+type PriceListPricesAddProductIdsFormProps = {
+  form: UseFormReturn<PriceListPricesAddSchema>
+  priceList: HttpTypes.AdminPriceList
+}
+
+const PAGE_SIZE = 50
+const PREFIX = "p"
+
+function getInitialSelection(products: { id: string }[]) {
+  return products.reduce((acc, curr) => {
+    acc[curr.id] = true
+    return acc
+  }, {} as RowSelectionState)
+}
+
+export const PriceListPricesAddProductIdsForm = ({
+  priceList,
+  form,
+}: PriceListPricesAddProductIdsFormProps) => {
+  const { control, setValue } = form
+
+  const variantIdMap = useMemo(() => {
+    return priceList.prices.reduce((acc, curr) => {
+      acc[curr.variant_id] = true
+      return acc
+    }, {} as Record<string, boolean>)
+  }, [priceList.prices])
+
+  const selectedIds = useWatch({
+    control,
+    name: "product_ids",
+  })
+
+  const productRecords = useWatch({
+    control,
+    name: "products",
+  })
+
+  const [rowSelection, setRowSelection] = useState<RowSelectionState>(
+    getInitialSelection(selectedIds)
+  )
+
+  const { searchParams, raw } = useProductTableQuery({
+    pageSize: PAGE_SIZE,
+    prefix: PREFIX,
+  })
+  const { products, count, isLoading, isError, error } = useProducts(
+    searchParams,
+    {
+      placeholderData: keepPreviousData,
+    }
+  )
+
+  const updater: OnChangeFn<RowSelectionState> = (fn) => {
+    const state = typeof fn === "function" ? fn(rowSelection) : fn
+
+    const ids = Object.keys(state)
+    const productRecordKeys = Object.keys(productRecords)
+
+    const updatedRecords = productRecordKeys.reduce((acc, key) => {
+      if (ids.includes(key)) {
+        acc[key] = productRecords[key]
+      }
+
+      return acc
+    }, {} as PriceListCreateProductsSchema)
+
+    const update = ids.map((id) => ({ id }))
+
+    setValue("product_ids", update, { shouldDirty: true, shouldTouch: true })
+
+    /**
+     * Update the product records to ensure that all unselected products
+     * are removed from the form state.
+     */
+    setValue("products", updatedRecords, {
+      shouldDirty: true,
+      shouldTouch: true,
+    })
+
+    setRowSelection(state)
+  }
+
+  const columns = useColumns()
+  const filters = useProductTableFilters()
+
+  const { table } = useDataTable({
+    data: products || [],
+    columns,
+    count,
+    enablePagination: true,
+    enableRowSelection: (row) => {
+      return (
+        !!row.original.variants?.length &&
+        !row.original.variants?.some((v) => variantIdMap[v.id])
+      )
+    },
+    getRowId: (row) => row.id,
+    rowSelection: {
+      state: rowSelection,
+      updater,
+    },
+    pageSize: PAGE_SIZE,
+    meta: {
+      variantIdMap,
+    },
+  })
+
+  if (isError) {
+    throw error
+  }
+
+  return (
+    <div className="flex size-full flex-col">
+      <DataTable
+        table={table}
+        columns={columns}
+        filters={filters}
+        pageSize={PAGE_SIZE}
+        prefix={PREFIX}
+        count={count}
+        isLoading={isLoading}
+        layout="fill"
+        orderBy={["title", "status", "created_at", "updated_at"]}
+        pagination
+        search
+        queryObject={raw}
+      />
+    </div>
+  )
+}
+
+const columnHelper = createColumnHelper<HttpTypes.AdminProduct>()
+
+const useColumns = () => {
+  const base = useProductTableColumns()
+
+  return useMemo(
+    () => [
+      columnHelper.display({
+        id: "select",
+        header: ({ table }) => {
+          return (
+            <Checkbox
+              checked={
+                table.getIsSomePageRowsSelected()
+                  ? "indeterminate"
+                  : table.getIsAllPageRowsSelected()
+              }
+              onCheckedChange={(value) =>
+                table.toggleAllPageRowsSelected(!!value)
+              }
+            />
+          )
+        },
+        cell: ({ row, table }) => {
+          const { variantIdMap } = table.options.meta as {
+            variantIdMap: Record<string, boolean>
+          }
+
+          const isPreselected = row.original.variants?.some(
+            (v) => variantIdMap[v.id]
+          )
+          const isDisabled = !row.getCanSelect() || isPreselected
+          const isChecked = row.getIsSelected() || isPreselected
+
+          const Component = (
+            <Checkbox
+              checked={isChecked}
+              disabled={isDisabled}
+              onCheckedChange={(value) => row.toggleSelected(!!value)}
+              onClick={(e) => {
+                e.stopPropagation()
+              }}
+            />
+          )
+
+          if (isPreselected) {
+            return (
+              <Tooltip content="This product is already in the price list">
+                {Component}
+              </Tooltip>
+            )
+          }
+
+          if (isDisabled) {
+            return (
+              <Tooltip content="This product has no variants">
+                {Component}
+              </Tooltip>
+            )
+          }
+
+          return Component
+        },
+      }),
+      ...base,
+    ],
+    [base]
+  )
+}
diff --git a/packages/admin-next/dashboard/src/routes/price-lists/price-list-prices-add/components/price-list-prices-add-form/schema.ts b/packages/admin-next/dashboard/src/routes/price-lists/price-list-prices-add/components/price-list-prices-add-form/schema.ts
new file mode 100644
index 0000000000..b5341c166f
--- /dev/null
+++ b/packages/admin-next/dashboard/src/routes/price-lists/price-list-prices-add/components/price-list-prices-add-form/schema.ts
@@ -0,0 +1,27 @@
+import { z } from "zod"
+import { PriceListCreateProductsSchema } from "../../../common/schemas"
+
+export const PriceListPricesAddSchema = z.object({
+  product_ids: z.array(z.object({ id: z.string() })).min(1),
+  products: PriceListCreateProductsSchema,
+})
+
+export type PriceListPricesAddSchema = z.infer<typeof PriceListPricesAddSchema>
+
+export const PriceListPricesAddProductIdsSchema = PriceListPricesAddSchema.pick(
+  {
+    product_ids: true,
+  }
+)
+
+export const PriceListPricesAddProductsIdsFields = Object.keys(
+  PriceListPricesAddProductIdsSchema.shape
+) as (keyof typeof PriceListPricesAddProductIdsSchema.shape)[]
+
+export const PriceListPricesAddProductsSchema = PriceListPricesAddSchema.pick({
+  products: true,
+})
+
+export const PriceListPricesAddProductsFields = Object.keys(
+  PriceListPricesAddProductsSchema.shape
+) as (keyof typeof PriceListPricesAddProductsSchema.shape)[]
diff --git a/packages/admin-next/dashboard/src/routes/price-lists/price-list-prices-add/index.ts b/packages/admin-next/dashboard/src/routes/price-lists/price-list-prices-add/index.ts
new file mode 100644
index 0000000000..c2e17797a5
--- /dev/null
+++ b/packages/admin-next/dashboard/src/routes/price-lists/price-list-prices-add/index.ts
@@ -0,0 +1 @@
+export { PriceListProductsAdd as Component } from "./price-list-prices-add"
diff --git a/packages/admin-next/dashboard/src/routes/price-lists/price-list-prices-add/price-list-prices-add.tsx b/packages/admin-next/dashboard/src/routes/price-lists/price-list-prices-add/price-list-prices-add.tsx
new file mode 100644
index 0000000000..1e2eba76e3
--- /dev/null
+++ b/packages/admin-next/dashboard/src/routes/price-lists/price-list-prices-add/price-list-prices-add.tsx
@@ -0,0 +1,30 @@
+import { useParams } from "react-router-dom"
+import { RouteFocusModal } from "../../../components/modals"
+import { usePriceList } from "../../../hooks/api/price-lists"
+import { usePriceListCurrencyData } from "../common/hooks/use-price-list-currency-data"
+import { PriceListPricesAddForm } from "./components/price-list-prices-add-form"
+
+export const PriceListProductsAdd = () => {
+  const { id } = useParams<{ id: string }>()
+
+  const { price_list, isPending, isError, error } = usePriceList(id!)
+  const { currencies, regions, isReady } = usePriceListCurrencyData()
+
+  const ready = isReady && !isPending && !!price_list
+
+  if (isError) {
+    throw error
+  }
+
+  return (
+    <RouteFocusModal>
+      {ready && (
+        <PriceListPricesAddForm
+          priceList={price_list}
+          currencies={currencies}
+          regions={regions}
+        />
+      )}
+    </RouteFocusModal>
+  )
+}
diff --git a/packages/admin-next/dashboard/src/routes/price-lists/price-list-prices-edit/components/price-list-prices-edit-form/index.ts b/packages/admin-next/dashboard/src/routes/price-lists/price-list-prices-edit/components/price-list-prices-edit-form/index.ts
new file mode 100644
index 0000000000..7a562f1a76
--- /dev/null
+++ b/packages/admin-next/dashboard/src/routes/price-lists/price-list-prices-edit/components/price-list-prices-edit-form/index.ts
@@ -0,0 +1 @@
+export * from "./price-list-prices-edit-form"
diff --git a/packages/admin-next/dashboard/src/routes/price-lists/price-list-prices-edit/components/price-list-prices-edit-form/price-list-prices-edit-form.tsx b/packages/admin-next/dashboard/src/routes/price-lists/price-list-prices-edit/components/price-list-prices-edit-form/price-list-prices-edit-form.tsx
new file mode 100644
index 0000000000..c8a0039b5e
--- /dev/null
+++ b/packages/admin-next/dashboard/src/routes/price-lists/price-list-prices-edit/components/price-list-prices-edit-form/price-list-prices-edit-form.tsx
@@ -0,0 +1,299 @@
+import { zodResolver } from "@hookform/resolvers/zod"
+import { HttpTypes } from "@medusajs/types"
+import { Button, toast } from "@medusajs/ui"
+import { useRef } from "react"
+import { useForm } from "react-hook-form"
+import { useTranslation } from "react-i18next"
+import { z } from "zod"
+
+import { DataGridRoot } from "../../../../../components/data-grid/data-grid-root"
+import {
+  RouteFocusModal,
+  useRouteModal,
+} from "../../../../../components/modals"
+import { useBatchPriceListPrices } from "../../../../../hooks/api/price-lists"
+import { castNumber } from "../../../../../lib/cast-number"
+import { usePriceListGridColumns } from "../../../common/hooks/use-price-list-grid-columns"
+import {
+  PriceListUpdateProductVariantsSchema,
+  PriceListUpdateProductsSchema,
+} from "../../../common/schemas"
+import { isProductRow } from "../../../common/utils"
+
+type PriceListPricesEditFormProps = {
+  priceList: HttpTypes.AdminPriceList
+  products: HttpTypes.AdminProduct[]
+  regions: HttpTypes.AdminRegion[]
+  currencies: HttpTypes.AdminStoreCurrency[]
+}
+
+const PricingProductPricesSchema = z.object({
+  products: PriceListUpdateProductsSchema,
+})
+
+export const PriceListPricesEditForm = ({
+  priceList,
+  products,
+  regions,
+  currencies,
+}: PriceListPricesEditFormProps) => {
+  const { t } = useTranslation()
+  const { handleSuccess } = useRouteModal()
+
+  const initialValue = useRef(initRecord(priceList, products))
+
+  const form = useForm<z.infer<typeof PricingProductPricesSchema>>({
+    defaultValues: {
+      products: initialValue.current,
+    },
+    resolver: zodResolver(PricingProductPricesSchema),
+  })
+
+  const { mutateAsync, isPending } = useBatchPriceListPrices(priceList.id)
+
+  const handleSubmit = form.handleSubmit(async (values) => {
+    const { products } = values
+
+    const { pricesToDelete, pricesToCreate, pricesToUpdate } = sortPrices(
+      products,
+      initialValue.current,
+      regions
+    )
+
+    mutateAsync(
+      {
+        delete: pricesToDelete,
+        update: pricesToUpdate,
+        create: pricesToCreate,
+      },
+      {
+        onSuccess: () => {
+          toast.success(t("priceLists.products.edit.successToast"))
+
+          handleSuccess()
+        },
+        onError: (error) => {
+          toast.error(error.message)
+        },
+      }
+    )
+  })
+
+  const columns = usePriceListGridColumns({ currencies, regions })
+
+  return (
+    <RouteFocusModal.Form form={form}>
+      <form onSubmit={handleSubmit} className="flex size-full flex-col">
+        <RouteFocusModal.Header />
+        <RouteFocusModal.Body className="flex flex-col overflow-hidden">
+          <DataGridRoot
+            columns={columns}
+            data={products}
+            getSubRows={(row) => {
+              if (isProductRow(row) && row.variants) {
+                return row.variants
+              }
+            }}
+            state={form}
+          />
+        </RouteFocusModal.Body>
+        <RouteFocusModal.Footer>
+          <div className="flex items-center justify-end gap-x-2">
+            <RouteFocusModal.Close asChild>
+              <Button size="small" variant="secondary">
+                {t("actions.cancel")}
+              </Button>
+            </RouteFocusModal.Close>
+            <Button size="small" type="submit" isLoading={isPending}>
+              {t("actions.save")}
+            </Button>
+          </div>
+        </RouteFocusModal.Footer>
+      </form>
+    </RouteFocusModal.Form>
+  )
+}
+
+function initRecord(
+  priceList: HttpTypes.AdminPriceList,
+  products: HttpTypes.AdminProduct[]
+): PriceListUpdateProductsSchema {
+  const record: PriceListUpdateProductsSchema = {}
+
+  const variantPrices = priceList.prices?.reduce((variants, price) => {
+    const variantObject = variants[price.variant_id] || {}
+
+    const isRegionPrice = !!price.rules?.region_id
+
+    if (isRegionPrice) {
+      const regionId = price.rules.region_id as string
+
+      variantObject.region_prices = {
+        ...variantObject.region_prices,
+        [regionId]: {
+          amount: price.amount.toString(),
+          id: price.id,
+        },
+      }
+    } else {
+      variantObject.currency_prices = {
+        ...variantObject.currency_prices,
+        [price.currency_code]: {
+          amount: price.amount.toString(),
+          id: price.id,
+        },
+      }
+    }
+
+    variants[price.variant_id] = variantObject
+    return variants
+  }, {} as PriceListUpdateProductVariantsSchema)
+
+  for (const product of products) {
+    record[product.id] = {
+      variants:
+        product.variants?.reduce((variants, variant) => {
+          const prices = variantPrices[variant.id] || {}
+          variants[variant.id] = prices
+
+          return variants
+        }, {} as PriceListUpdateProductVariantsSchema) || {},
+    }
+  }
+
+  return record
+}
+
+type PriceObject = {
+  variantId: string
+  currencyCode: string
+  regionId?: string
+  amount: number
+  id?: string | null
+}
+
+function convertToPriceArray(
+  data: PriceListUpdateProductsSchema,
+  regions: HttpTypes.AdminRegion[]
+) {
+  const prices: PriceObject[] = []
+
+  const regionCurrencyMap = regions.reduce((map, region) => {
+    map[region.id] = region.currency_code
+    return map
+  }, {} as Record<string, string>)
+
+  for (const [_productId, product] of Object.entries(data || {})) {
+    const { variants } = product || {}
+
+    for (const [variantId, variant] of Object.entries(variants || {})) {
+      const { currency_prices: currencyPrices, region_prices: regionPrices } =
+        variant || {}
+
+      for (const [currencyCode, currencyPrice] of Object.entries(
+        currencyPrices || {}
+      )) {
+        if (currencyPrice?.amount) {
+          prices.push({
+            variantId,
+            currencyCode,
+            amount: castNumber(currencyPrice.amount),
+            id: currencyPrice.id,
+          })
+        }
+      }
+
+      for (const [regionId, regionPrice] of Object.entries(
+        regionPrices || {}
+      )) {
+        if (regionPrice?.amount) {
+          prices.push({
+            variantId,
+            regionId,
+            currencyCode: regionCurrencyMap[regionId],
+            amount: castNumber(regionPrice.amount),
+            id: regionPrice.id,
+          })
+        }
+      }
+    }
+  }
+
+  return prices
+}
+
+function createMapKey(obj: PriceObject) {
+  return `${obj.variantId}-${obj.currencyCode}-${obj.regionId || "none"}-${
+    obj.id || "none"
+  }`
+}
+
+function comparePrices(initialPrices: PriceObject[], newPrices: PriceObject[]) {
+  const pricesToUpdate: HttpTypes.AdminUpdatePriceListPrice[] = []
+  const pricesToCreate: HttpTypes.AdminCreatePriceListPrice[] = []
+  const pricesToDelete: string[] = []
+
+  const initialPriceMap = initialPrices.reduce((map, price) => {
+    map[createMapKey(price)] = price
+    return map
+  }, {} as Record<string, (typeof initialPrices)[0]>)
+
+  const newPriceMap = newPrices.reduce((map, price) => {
+    map[createMapKey(price)] = price
+    return map
+  }, {} as Record<string, (typeof newPrices)[0]>)
+
+  const keys = new Set([
+    ...Object.keys(initialPriceMap),
+    ...Object.keys(newPriceMap),
+  ])
+
+  for (const key of keys) {
+    const initialPrice = initialPriceMap[key]
+    const newPrice = newPriceMap[key]
+
+    if (initialPrice && newPrice) {
+      if (isNaN(newPrice.amount) && newPrice.id) {
+        pricesToDelete.push(newPrice.id)
+      }
+
+      if (initialPrice.amount !== newPrice.amount && newPrice.id) {
+        pricesToUpdate.push({
+          id: newPrice.id,
+          variant_id: newPrice.variantId,
+          currency_code: newPrice.currencyCode,
+          rules: newPrice.regionId
+            ? { region_id: newPrice.regionId }
+            : undefined,
+          amount: newPrice.amount,
+        })
+      }
+    }
+
+    if (!initialPrice && newPrice) {
+      pricesToCreate.push({
+        variant_id: newPrice.variantId,
+        currency_code: newPrice.currencyCode,
+        rules: newPrice.regionId ? { region_id: newPrice.regionId } : undefined,
+        amount: newPrice.amount,
+      })
+    }
+
+    if (initialPrice && !newPrice && initialPrice.id) {
+      pricesToDelete.push(initialPrice.id)
+    }
+  }
+
+  return { pricesToDelete, pricesToCreate, pricesToUpdate }
+}
+
+function sortPrices(
+  data: PriceListUpdateProductsSchema,
+  initialValue: PriceListUpdateProductsSchema,
+  regions: HttpTypes.AdminRegion[]
+) {
+  const initialPrices = convertToPriceArray(initialValue, regions)
+  const newPrices = convertToPriceArray(data, regions)
+
+  return comparePrices(initialPrices, newPrices)
+}
diff --git a/packages/admin-next/dashboard/src/routes/price-lists/price-list-prices-edit/index.ts b/packages/admin-next/dashboard/src/routes/price-lists/price-list-prices-edit/index.ts
new file mode 100644
index 0000000000..11d1030a7f
--- /dev/null
+++ b/packages/admin-next/dashboard/src/routes/price-lists/price-list-prices-edit/index.ts
@@ -0,0 +1 @@
+export { PriceListPricesEdit as Component } from "./price-list-prices-edit"
diff --git a/packages/admin-next/dashboard/src/routes/pricing/pricing-products-prices/pricing-products-prices.tsx b/packages/admin-next/dashboard/src/routes/price-lists/price-list-prices-edit/price-list-prices-edit.tsx
similarity index 58%
rename from packages/admin-next/dashboard/src/routes/pricing/pricing-products-prices/pricing-products-prices.tsx
rename to packages/admin-next/dashboard/src/routes/price-lists/price-list-prices-edit/price-list-prices-edit.tsx
index c27c7ea18c..daec61c14f 100644
--- a/packages/admin-next/dashboard/src/routes/pricing/pricing-products-prices/pricing-products-prices.tsx
+++ b/packages/admin-next/dashboard/src/routes/price-lists/price-list-prices-edit/price-list-prices-edit.tsx
@@ -1,10 +1,11 @@
 import { useParams, useSearchParams } from "react-router-dom"
-import { RouteFocusModal } from "../../../components/route-modal"
+import { RouteFocusModal } from "../../../components/modals"
 import { usePriceList } from "../../../hooks/api/price-lists"
 import { useProducts } from "../../../hooks/api/products"
-import { PricingProductPricesForm } from "./components/pricing-products-prices-form"
+import { usePriceListCurrencyData } from "../common/hooks/use-price-list-currency-data"
+import { PriceListPricesEditForm } from "./components/price-list-prices-edit-form"
 
-export const PricingProductsPrices = () => {
+export const PriceListPricesEdit = () => {
   const { id } = useParams()
   const [searchParams] = useSearchParams()
   const ids = searchParams.get("ids[]")
@@ -20,10 +21,14 @@ export const PricingProductsPrices = () => {
   } = useProducts({
     id: productIds,
     limit: productIds?.length || 9999, // Temporary until we support lazy loading in the DataGrid
+    price_list_id: [id!],
     fields: "title,thumbnail,*variants",
   })
 
-  const ready = !isLoading && !!price_list && !isProductsLoading && !!products
+  const { isReady, regions, currencies } = usePriceListCurrencyData()
+
+  const ready =
+    !isLoading && !!price_list && !isProductsLoading && !!products && isReady
 
   if (isError) {
     throw error
@@ -36,7 +41,12 @@ export const PricingProductsPrices = () => {
   return (
     <RouteFocusModal>
       {ready && (
-        <PricingProductPricesForm priceList={price_list} products={products} />
+        <PriceListPricesEditForm
+          priceList={price_list}
+          products={products}
+          regions={regions}
+          currencies={currencies}
+        />
       )}
     </RouteFocusModal>
   )
diff --git a/packages/admin-next/dashboard/src/routes/pricing/common/hooks/use-price-list-grid-columns.tsx b/packages/admin-next/dashboard/src/routes/pricing/common/hooks/use-price-list-grid-columns.tsx
deleted file mode 100644
index 5c2852f077..0000000000
--- a/packages/admin-next/dashboard/src/routes/pricing/common/hooks/use-price-list-grid-columns.tsx
+++ /dev/null
@@ -1,77 +0,0 @@
-import { CurrencyDTO, HttpTypes } from "@medusajs/types"
-import { ColumnDef, createColumnHelper } from "@tanstack/react-table"
-import { useMemo } from "react"
-import { useTranslation } from "react-i18next"
-import { Thumbnail } from "../../../../components/common/thumbnail"
-import { CurrencyCell } from "../../../../components/grid/grid-cells/common/currency-cell"
-import { ReadonlyCell } from "../../../../components/grid/grid-cells/common/readonly-cell"
-import { VoidCell } from "../../../../components/grid/grid-cells/common/void-cell"
-import { DataGridMeta } from "../../../../components/grid/types"
-import { isProductRow } from "../utils"
-
-const columnHelper = createColumnHelper<
-  HttpTypes.AdminProduct | HttpTypes.AdminProductVariant
->()
-
-export const usePriceListGridColumns = ({
-  currencies = [],
-}: {
-  currencies?: CurrencyDTO[]
-}) => {
-  const { t } = useTranslation()
-
-  const colDefs: ColumnDef<
-    HttpTypes.AdminProduct | HttpTypes.AdminProductVariant
-  >[] = useMemo(() => {
-    return [
-      columnHelper.display({
-        id: t("fields.title"),
-        header: t("fields.title"),
-        cell: ({ row }) => {
-          const entity = row.original
-
-          if (isProductRow(entity)) {
-            return (
-              <VoidCell>
-                <div className="flex h-full w-full items-center gap-x-2 overflow-hidden">
-                  <Thumbnail src={entity.thumbnail} />
-                  <span className="truncate">{entity.title}</span>
-                </div>
-              </VoidCell>
-            )
-          }
-
-          return (
-            <ReadonlyCell>
-              <div className="flex h-full w-full items-center gap-x-2 overflow-hidden">
-                <span className="truncate">{entity.title}</span>
-              </div>
-            </ReadonlyCell>
-          )
-        },
-      }),
-      ...currencies.map((currency) => {
-        return columnHelper.display({
-          header: `Price ${currency.code.toUpperCase()}`,
-          cell: ({ row, table }) => {
-            const entity = row.original
-
-            if (isProductRow(entity)) {
-              return <VoidCell />
-            }
-
-            return (
-              <CurrencyCell
-                currency={currency}
-                meta={table.options.meta as DataGridMeta}
-                field={`products.${entity.product_id}.variants.${entity.id}.currency_prices.${currency.code}.amount`}
-              />
-            )
-          },
-        })
-      }),
-    ]
-  }, [t, currencies])
-
-  return colDefs
-}
diff --git a/packages/admin-next/dashboard/src/routes/pricing/common/schemas.ts b/packages/admin-next/dashboard/src/routes/pricing/common/schemas.ts
deleted file mode 100644
index cc71de9d06..0000000000
--- a/packages/admin-next/dashboard/src/routes/pricing/common/schemas.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { z } from "zod"
-
-const PricingVariantPricesRecordSchema = z.record(
-  z
-    .object({
-      amount: z.string().optional(),
-      id: z.string().nullable().optional(),
-    })
-    .optional()
-)
-
-const PricingVariantsRecordSchema = z.record(
-  z.object({
-    currency_prices: PricingVariantPricesRecordSchema,
-    region_prices: PricingVariantPricesRecordSchema,
-  })
-)
-
-export type PricingVariantsRecordType = z.infer<
-  typeof PricingVariantsRecordSchema
->
-
-export const PricingProductsRecordSchema = z.record(
-  z.object({
-    variants: PricingVariantsRecordSchema,
-  })
-)
-
-export type PricingProductsRecordType = z.infer<
-  typeof PricingProductsRecordSchema
->
diff --git a/packages/admin-next/dashboard/src/routes/pricing/common/utils.ts b/packages/admin-next/dashboard/src/routes/pricing/common/utils.ts
deleted file mode 100644
index c5546e2435..0000000000
--- a/packages/admin-next/dashboard/src/routes/pricing/common/utils.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import { HttpTypes, PriceListDTO } from "@medusajs/types"
-import { TFunction } from "i18next"
-import { PriceListDateStatus, PriceListStatus } from "./constants"
-
-const getValues = (priceList: PriceListDTO) => {
-  const startsAt = priceList.starts_at
-  const endsAt = priceList.ends_at
-
-  const isExpired = endsAt ? new Date(endsAt) < new Date() : false
-  const isScheduled = startsAt ? new Date(startsAt) > new Date() : false
-  const isDraft = priceList.status === PriceListStatus.DRAFT
-
-  return {
-    isExpired,
-    isScheduled,
-    isDraft,
-  }
-}
-
-export const getPriceListStatus = (
-  t: TFunction<"translation">,
-  priceList: PriceListDTO
-) => {
-  const { isExpired, isScheduled, isDraft } = getValues(priceList)
-
-  let text = t("pricing.status.active")
-  let color: "red" | "grey" | "orange" | "green" = "green"
-  let status: string = PriceListStatus.ACTIVE
-
-  if (isDraft) {
-    color = "grey"
-    text = t("pricing.status.draft")
-    status = PriceListStatus.DRAFT
-  }
-
-  if (isExpired) {
-    color = "red"
-    text = t("pricing.status.expired")
-    status = PriceListDateStatus.EXPIRED
-  }
-
-  if (isScheduled) {
-    color = "orange"
-    text = t("pricing.status.scheduled")
-    status = PriceListDateStatus.SCHEDULED
-  }
-
-  return {
-    color,
-    text,
-    status,
-  }
-}
-
-export const isProductRow = (
-  row: HttpTypes.AdminProduct | HttpTypes.AdminProductVariant
-): row is HttpTypes.AdminProduct => {
-  return "variants" in row
-}
diff --git a/packages/admin-next/dashboard/src/routes/pricing/pricing-configuration/components/price-list-configuration-form/price-list-configuration-form.tsx b/packages/admin-next/dashboard/src/routes/pricing/pricing-configuration/components/price-list-configuration-form/price-list-configuration-form.tsx
deleted file mode 100644
index deb29ca557..0000000000
--- a/packages/admin-next/dashboard/src/routes/pricing/pricing-configuration/components/price-list-configuration-form/price-list-configuration-form.tsx
+++ /dev/null
@@ -1,197 +0,0 @@
-import { zodResolver } from "@hookform/resolvers/zod"
-import { PriceListDTO } from "@medusajs/types"
-import { Button, DatePicker, Switch, Text } from "@medusajs/ui"
-import * as Collapsible from "@radix-ui/react-collapsible"
-import { useForm } from "react-hook-form"
-import { useTranslation } from "react-i18next"
-import { z } from "zod"
-import { Divider } from "../../../../../components/common/divider"
-import { Form } from "../../../../../components/common/form"
-import {
-  RouteDrawer,
-  useRouteModal,
-} from "../../../../../components/route-modal"
-import { useUpdatePriceList } from "../../../../../hooks/api/price-lists"
-
-type PriceListConfigurationFormProps = {
-  priceList: PriceListDTO
-}
-
-const PriceListConfigurationSchema = z.object({
-  ends_at: z.date().nullable(),
-  starts_at: z.date().nullable(),
-})
-
-/**
- * TODO: Add CustomerGroups and possibly change to a RouteFocusModal
- *
- * Customer group rules aren't supported out of the box atm, so we can't
- * set them in the UI without throwing an error.
- */
-
-export const PriceListConfigurationForm = ({
-  priceList,
-}: PriceListConfigurationFormProps) => {
-  const { t } = useTranslation()
-  const { handleSuccess } = useRouteModal()
-
-  const form = useForm<z.infer<typeof PriceListConfigurationSchema>>({
-    defaultValues: {
-      ends_at: priceList.ends_at ? new Date(priceList.ends_at) : null,
-      starts_at: priceList.starts_at ? new Date(priceList.starts_at) : null,
-    },
-    resolver: zodResolver(PriceListConfigurationSchema),
-  })
-
-  const { mutateAsync } = useUpdatePriceList(priceList.id)
-
-  const handleSubmit = form.handleSubmit(async (values) => {
-    await mutateAsync(
-      // @ts-ignore - type is wrong and expects an ID.
-      {
-        starts_at: values.starts_at?.toISOString() || null,
-        ends_at: values.ends_at?.toISOString() || null,
-      },
-      {
-        onSuccess: () => {
-          handleSuccess()
-        },
-      }
-    )
-  })
-
-  return (
-    <RouteDrawer.Form form={form}>
-      <form
-        className="flex flex-1 flex-col overflow-hidden"
-        onSubmit={handleSubmit}
-      >
-        <RouteDrawer.Body className="flex flex-1 flex-col gap-y-8 overflow-auto">
-          <Form.Field
-            control={form.control}
-            name="starts_at"
-            render={({ field: { value, onChange, ...rest } }) => {
-              const handleSwitchChange = (checked: boolean) => {
-                if (!checked) {
-                  onChange(null)
-                  return
-                }
-
-                const now = new Date()
-
-                onChange(now)
-              }
-
-              return (
-                <Form.Item>
-                  <Collapsible.Root
-                    open={!!value}
-                    onOpenChange={handleSwitchChange}
-                  >
-                    <div className="grid grid-cols-[1fr_32px] gap-4">
-                      <div>
-                        <Text size="small" leading="compact" weight="plus">
-                          {t("pricing.fields.startDateLabel")}
-                        </Text>
-                        <Text size="small" className="text-ui-fg-subtle">
-                          {t("pricing.fields.startDateHint")}
-                        </Text>
-                      </div>
-                      <Collapsible.Trigger asChild>
-                        <Switch name={rest.name} checked={!!value} />
-                      </Collapsible.Trigger>
-                    </div>
-                    <Collapsible.Content>
-                      <div className="flex flex-col gap-y-2 pt-4">
-                        <Form.Label className="!txt-small text-ui-fg-subtle">
-                          {t("fields.startDate")}
-                        </Form.Label>
-                        <Form.Control>
-                          <DatePicker
-                            value={value || undefined}
-                            onChange={onChange}
-                            {...rest}
-                          />
-                        </Form.Control>
-                      </div>
-                    </Collapsible.Content>
-                    <Form.ErrorMessage />
-                  </Collapsible.Root>
-                </Form.Item>
-              )
-            }}
-          />
-          <Divider />
-          <Form.Field
-            control={form.control}
-            name="ends_at"
-            render={({ field: { value, onChange, ...rest } }) => {
-              const handleSwitchChange = (checked: boolean) => {
-                if (!checked) {
-                  onChange(null)
-                  return
-                }
-
-                const inAWeek = new Date(
-                  new Date().setDate(new Date().getDate() + 7)
-                )
-
-                onChange(inAWeek)
-              }
-
-              return (
-                <Form.Item>
-                  <Collapsible.Root
-                    open={!!value}
-                    onOpenChange={handleSwitchChange}
-                  >
-                    <div className="grid grid-cols-[1fr_32px] gap-4">
-                      <div>
-                        <Text size="small" leading="compact" weight="plus">
-                          {t("pricing.fields.endDateLabel")}
-                        </Text>
-                        <Text size="small" className="text-ui-fg-subtle">
-                          {t("pricing.fields.endDateHint")}
-                        </Text>
-                      </div>
-                      <Collapsible.Trigger asChild>
-                        <Switch name={rest.name} checked={!!value} />
-                      </Collapsible.Trigger>
-                    </div>
-                    <Collapsible.Content>
-                      <div className="flex flex-col gap-y-2 pt-4">
-                        <Form.Label className="!txt-small text-ui-fg-subtle">
-                          {t("fields.endDate")}
-                        </Form.Label>
-                        <Form.Control>
-                          <DatePicker
-                            value={value || undefined}
-                            onChange={onChange}
-                            {...rest}
-                          />
-                        </Form.Control>
-                      </div>
-                    </Collapsible.Content>
-                    <Form.ErrorMessage />
-                  </Collapsible.Root>
-                </Form.Item>
-              )
-            }}
-          />
-        </RouteDrawer.Body>
-        <RouteDrawer.Footer className="shrink-0">
-          <div className="flex items-center justify-end gap-x-2">
-            <RouteDrawer.Close asChild>
-              <Button size="small" variant="secondary">
-                {t("actions.cancel")}
-              </Button>
-            </RouteDrawer.Close>
-            <Button size="small" type="submit">
-              {t("actions.save")}
-            </Button>
-          </div>
-        </RouteDrawer.Footer>
-      </form>
-    </RouteDrawer.Form>
-  )
-}
diff --git a/packages/admin-next/dashboard/src/routes/pricing/pricing-configuration/index.ts b/packages/admin-next/dashboard/src/routes/pricing/pricing-configuration/index.ts
deleted file mode 100644
index d2a1567c18..0000000000
--- a/packages/admin-next/dashboard/src/routes/pricing/pricing-configuration/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { PricingConfiguration as Component } from "./pricing-configuration"
diff --git a/packages/admin-next/dashboard/src/routes/pricing/pricing-configuration/pricing-configuration.tsx b/packages/admin-next/dashboard/src/routes/pricing/pricing-configuration/pricing-configuration.tsx
deleted file mode 100644
index 9eb1c06761..0000000000
--- a/packages/admin-next/dashboard/src/routes/pricing/pricing-configuration/pricing-configuration.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import { Heading } from "@medusajs/ui"
-import { useTranslation } from "react-i18next"
-import { useParams } from "react-router-dom"
-import { RouteDrawer } from "../../../components/route-modal"
-import { usePriceList } from "../../../hooks/api/price-lists"
-import { PriceListConfigurationForm } from "./components/price-list-configuration-form"
-
-export const PricingConfiguration = () => {
-  const { t } = useTranslation()
-  const { id } = useParams()
-
-  const { price_list, isLoading, isError, error } = usePriceList(id!)
-
-  const ready = !isLoading && price_list
-
-  if (isError) {
-    throw error
-  }
-
-  return (
-    <RouteDrawer>
-      <RouteDrawer.Header>
-        <Heading>{t("pricing.configuration.editHeader")}</Heading>
-      </RouteDrawer.Header>
-      {ready && <PriceListConfigurationForm priceList={price_list} />}
-    </RouteDrawer>
-  )
-}
diff --git a/packages/admin-next/dashboard/src/routes/pricing/pricing-create/components/pricing-create-form/index.ts b/packages/admin-next/dashboard/src/routes/pricing/pricing-create/components/pricing-create-form/index.ts
deleted file mode 100644
index 09560939d3..0000000000
--- a/packages/admin-next/dashboard/src/routes/pricing/pricing-create/components/pricing-create-form/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./pricing-create-form"
diff --git a/packages/admin-next/dashboard/src/routes/pricing/pricing-create/components/pricing-create-form/pricing-details-form.tsx b/packages/admin-next/dashboard/src/routes/pricing/pricing-create/components/pricing-create-form/pricing-details-form.tsx
deleted file mode 100644
index 2944ac653c..0000000000
--- a/packages/admin-next/dashboard/src/routes/pricing/pricing-create/components/pricing-create-form/pricing-details-form.tsx
+++ /dev/null
@@ -1,553 +0,0 @@
-import {
-  Button,
-  Checkbox,
-  DatePicker,
-  Heading,
-  Input,
-  RadioGroup,
-  Switch,
-  Text,
-  Textarea,
-} from "@medusajs/ui"
-import * as Collapsible from "@radix-ui/react-collapsible"
-import { useFieldArray, type UseFormReturn } from "react-hook-form"
-import { useTranslation } from "react-i18next"
-
-import { XMarkMini } from "@medusajs/icons"
-import { keepPreviousData } from "@tanstack/react-query"
-import {
-  OnChangeFn,
-  RowSelectionState,
-  createColumnHelper,
-} from "@tanstack/react-table"
-import { t } from "i18next"
-import { useEffect, useMemo, useState } from "react"
-import { Divider } from "../../../../../components/common/divider"
-import { Form } from "../../../../../components/common/form"
-import { SplitView } from "../../../../../components/layout/split-view"
-import { DataTable } from "../../../../../components/table/data-table"
-import { useCustomerGroups } from "../../../../../hooks/api/customer-groups"
-import { useCustomerGroupTableColumns } from "../../../../../hooks/table/columns/use-customer-group-table-columns"
-import { useCustomerGroupTableQuery } from "../../../../../hooks/table/query/use-customer-group-table-query"
-import { useDataTable } from "../../../../../hooks/use-data-table"
-import type {
-  PricingCreateSchemaType,
-  PricingCustomerGroupsArrayType,
-} from "./schema"
-import { HttpTypes } from "@medusajs/types"
-
-type PricingDetailsFormProps = {
-  form: UseFormReturn<PricingCreateSchemaType>
-}
-
-export const PricingDetailsForm = ({ form }: PricingDetailsFormProps) => {
-  const [open, setOpen] = useState(false)
-  const [showCustomerGroups, setShowCustomerGroups] = useState(
-    !!form.getValues("customer_group_ids")?.length
-  )
-
-  const { t } = useTranslation()
-
-  const { fields, remove, append } = useFieldArray({
-    control: form.control,
-    name: "customer_group_ids",
-    keyName: "cg_id",
-  })
-
-  const handleAddCustomerGroup = (groups: PricingCustomerGroupsArrayType) => {
-    const newIds = groups.map((group) => group.id)
-
-    const fieldsToAdd = groups.filter(
-      (group) => !fields.some((field) => field.id === group.id)
-    )
-
-    for (const field of fields) {
-      if (!newIds.includes(field.id)) {
-        remove(fields.indexOf(field))
-      }
-    }
-
-    append(fieldsToAdd)
-    setOpen(false)
-  }
-
-  const handleOpenDrawer = () => {
-    setOpen(true)
-  }
-
-  const handleShowCustomerGroups = (open: boolean) => {
-    if (!open) {
-      form.setValue("customer_group_ids", [])
-    }
-
-    setShowCustomerGroups(open)
-  }
-
-  return (
-    <SplitView open={open} onOpenChange={setOpen}>
-      <SplitView.Content>
-        <div className="flex flex-1 flex-col items-center overflow-y-auto">
-          <div className="flex w-full max-w-[720px] flex-col gap-y-8 px-2 py-16">
-            <div>
-              <Heading>{t("pricing.create.header")}</Heading>
-              <Text size="small" className="text-ui-fg-subtle">
-                {t("pricing.create.hint")}
-              </Text>
-            </div>
-            <Form.Field
-              control={form.control}
-              name="type"
-              render={({ field: { onChange, ...rest } }) => {
-                return (
-                  <Form.Item>
-                    <div className="flex flex-col gap-y-4">
-                      <div>
-                        <Form.Label>{t("fields.type")}</Form.Label>
-                        <Form.Hint>{t("pricing.fields.typeHint")}</Form.Hint>
-                      </div>
-                      <Form.Control>
-                        <RadioGroup
-                          onValueChange={onChange}
-                          {...rest}
-                          className="grid grid-cols-1 gap-4 md:grid-cols-2"
-                        >
-                          <RadioGroup.ChoiceBox
-                            value={"sale"}
-                            label="Sale"
-                            description="Choose this if you are creating a sale"
-                          />
-                          <RadioGroup.ChoiceBox
-                            value={"override"}
-                            label="Override"
-                            description="Choose this if you are creating an override"
-                          />
-                        </RadioGroup>
-                      </Form.Control>
-                    </div>
-                    <Form.ErrorMessage />
-                  </Form.Item>
-                )
-              }}
-            />
-            <div className="flex flex-col gap-y-4">
-              <div className="grid grid-cols-2 gap-4">
-                <Form.Field
-                  control={form.control}
-                  name="title"
-                  render={({ field }) => {
-                    return (
-                      <Form.Item>
-                        <Form.Label>{t("fields.title")}</Form.Label>
-                        <Form.Control>
-                          <Input {...field} />
-                        </Form.Control>
-                        <Form.ErrorMessage />
-                      </Form.Item>
-                    )
-                  }}
-                />
-              </div>
-              <Form.Field
-                control={form.control}
-                name="description"
-                render={({ field }) => {
-                  return (
-                    <Form.Item>
-                      <Form.Label>{t("fields.description")}</Form.Label>
-                      <Form.Control>
-                        <Textarea {...field} />
-                      </Form.Control>
-                      <Form.ErrorMessage />
-                    </Form.Item>
-                  )
-                }}
-              />
-            </div>
-            <Divider />
-            <Form.Field
-              control={form.control}
-              name="starts_at"
-              render={({ field: { value, onChange, ...rest } }) => {
-                const handleSwitchChange = (checked: boolean) => {
-                  if (!checked) {
-                    onChange(null)
-                    return
-                  }
-
-                  const now = new Date()
-
-                  onChange(now)
-                }
-
-                return (
-                  <Form.Item>
-                    <Collapsible.Root
-                      open={!!value}
-                      onOpenChange={handleSwitchChange}
-                    >
-                      <div className="grid grid-cols-[1fr_32px] gap-4">
-                        <div>
-                          <div className="flex items-center gap-x-1">
-                            <Text size="small" leading="compact" weight="plus">
-                              {t("pricing.fields.startDateLabel")}
-                            </Text>
-                            <Text
-                              size="small"
-                              leading="compact"
-                              className="text-ui-fg-muted"
-                            >
-                              ({t("fields.optional")})
-                            </Text>
-                          </div>
-                          <Text size="small" className="text-ui-fg-subtle">
-                            {t("pricing.fields.startDateHint")}
-                          </Text>
-                        </div>
-                        <Collapsible.Trigger asChild>
-                          <Switch name={rest.name} checked={!!value} />
-                        </Collapsible.Trigger>
-                      </div>
-                      <Collapsible.Content>
-                        <div className="flex flex-col gap-y-2 pt-4">
-                          <Form.Label className="!txt-small text-ui-fg-subtle">
-                            {t("fields.startDate")}
-                          </Form.Label>
-                          <Form.Control>
-                            <DatePicker
-                              value={value || undefined}
-                              onChange={onChange}
-                              {...rest}
-                            />
-                          </Form.Control>
-                        </div>
-                      </Collapsible.Content>
-                      <Form.ErrorMessage />
-                    </Collapsible.Root>
-                  </Form.Item>
-                )
-              }}
-            />
-            <Divider />
-            <Form.Field
-              control={form.control}
-              name="ends_at"
-              render={({ field: { value, onChange, ...rest } }) => {
-                const handleSwitchChange = (checked: boolean) => {
-                  if (!checked) {
-                    onChange(null)
-                    return
-                  }
-
-                  const inAWeek = new Date(
-                    new Date().setDate(new Date().getDate() + 7)
-                  )
-
-                  onChange(inAWeek)
-                }
-
-                return (
-                  <Form.Item>
-                    <Collapsible.Root
-                      open={!!value}
-                      onOpenChange={handleSwitchChange}
-                    >
-                      <div className="grid grid-cols-[1fr_32px] gap-4">
-                        <div>
-                          <div className="flex items-center gap-x-1">
-                            <Text size="small" leading="compact" weight="plus">
-                              {t("pricing.fields.endDateLabel")}
-                            </Text>
-                            <Text
-                              size="small"
-                              leading="compact"
-                              className="text-ui-fg-muted"
-                            >
-                              ({t("fields.optional")})
-                            </Text>
-                          </div>
-                          <Text size="small" className="text-ui-fg-subtle">
-                            {t("pricing.fields.endDateHint")}
-                          </Text>
-                        </div>
-                        <Collapsible.Trigger asChild>
-                          <Switch name={rest.name} checked={!!value} />
-                        </Collapsible.Trigger>
-                      </div>
-                      <Collapsible.Content>
-                        <div className="flex flex-col gap-y-2 pt-4">
-                          <Form.Label className="!txt-small text-ui-fg-subtle">
-                            {t("fields.endDate")}
-                          </Form.Label>
-                          <Form.Control>
-                            <DatePicker
-                              value={value || undefined}
-                              onChange={onChange}
-                              {...rest}
-                            />
-                          </Form.Control>
-                        </div>
-                      </Collapsible.Content>
-                      <Form.ErrorMessage />
-                    </Collapsible.Root>
-                  </Form.Item>
-                )
-              }}
-            />
-            <Divider />
-            <div>
-              <Collapsible.Root
-                open={showCustomerGroups}
-                onOpenChange={handleShowCustomerGroups}
-              >
-                <Form.Field
-                  control={form.control}
-                  name="customer_group_ids"
-                  render={({ field }) => {
-                    return (
-                      <Form.Item>
-                        <div className="grid grid-cols-[1fr_32px] items-start gap-4">
-                          <div>
-                            <Form.Label optional>
-                              {t("pricing.fields.customerAvailabilityLabel")}
-                            </Form.Label>
-                            <Form.Hint>
-                              {t("pricing.fields.customerAvailabilityHint")}
-                            </Form.Hint>
-                          </div>
-                          <Form.Control>
-                            <Collapsible.Trigger asChild>
-                              <Switch
-                                name={field.name}
-                                checked={showCustomerGroups}
-                              />
-                            </Collapsible.Trigger>
-                          </Form.Control>
-                        </div>
-                        <Form.ErrorMessage />
-                      </Form.Item>
-                    )
-                  }}
-                />
-                <Collapsible.Content>
-                  <div className="flex flex-col pt-4">
-                    {fields.length > 0 ? (
-                      fields.map((field, index) => {
-                        return (
-                          <div
-                            key={field.cg_id}
-                            className="bg-ui-bg-field shadow-borders-base transition-fg hover:bg-ui-bg-field-hover flex h-7 w-fit items-center overflow-hidden rounded-md"
-                          >
-                            <div className="txt-compact-small-plus flex h-full select-none items-center justify-center px-2 py-0.5">
-                              {field.name}
-                            </div>
-                            <button
-                              type="button"
-                              onClick={() => remove(index)}
-                              className="focus-visible:bg-ui-bg-field-hover transition-fg hover:bg-ui-bg-field-hover flex h-full w-7 items-center justify-center border-l outline-none"
-                            >
-                              <XMarkMini className="text-ui-fg-muted" />
-                            </button>
-                          </div>
-                        )
-                      })
-                    ) : (
-                      <div className="flex items-center justify-center px-2 py-3">
-                        <Text
-                          size="small"
-                          leading="compact"
-                          className="text-ui-fg-muted"
-                        >
-                          {t(
-                            "pricing.fields.customerAvailabilityNoSelectionLabel"
-                          )}
-                        </Text>
-                      </div>
-                    )}
-                    <div className="flex items-center justify-end">
-                      <Button
-                        size="small"
-                        variant="secondary"
-                        type="button"
-                        onClick={handleOpenDrawer}
-                      >
-                        {t("pricing.actions.addCustomerGroups")}
-                      </Button>
-                    </div>
-                  </div>
-                </Collapsible.Content>
-              </Collapsible.Root>
-            </div>
-          </div>
-        </div>
-      </SplitView.Content>
-      <CustomerGroupDrawer
-        selectedCustomerGroups={fields}
-        saveCustomerGroups={handleAddCustomerGroup}
-      />
-    </SplitView>
-  )
-}
-
-const PAGE_SIZE = 50
-const PREFIX = "cg"
-
-const initRowSelection = (
-  selectedCustomerGroups: PricingCustomerGroupsArrayType
-) => {
-  return selectedCustomerGroups.reduce((acc, group) => {
-    acc[group.id] = true
-    return acc
-  }, {} as RowSelectionState)
-}
-
-const CustomerGroupDrawer = ({
-  selectedCustomerGroups,
-  saveCustomerGroups,
-}: {
-  selectedCustomerGroups: PricingCustomerGroupsArrayType
-  saveCustomerGroups: (arr: PricingCustomerGroupsArrayType) => void
-}) => {
-  const [rowSelection, setRowSelection] = useState<RowSelectionState>(
-    initRowSelection(selectedCustomerGroups)
-  )
-  const [intermediate, setIntermediate] =
-    useState<PricingCustomerGroupsArrayType>(selectedCustomerGroups)
-
-  useEffect(() => {
-    // If the selected customer groups change outside of the drawer,
-    // update the row selection state and intermediate state
-    setRowSelection(initRowSelection(selectedCustomerGroups))
-    setIntermediate(selectedCustomerGroups)
-  }, [selectedCustomerGroups])
-
-  const { searchParams, raw } = useCustomerGroupTableQuery({
-    pageSize: PAGE_SIZE,
-    prefix: PREFIX,
-  })
-  const { customer_groups, count, isLoading, isError, error } =
-    useCustomerGroups(searchParams, {
-      placeholderData: keepPreviousData,
-    })
-
-  const updater: OnChangeFn<RowSelectionState> = (value) => {
-    const state = typeof value === "function" ? value(rowSelection) : value
-    const currentIds = Object.keys(rowSelection)
-
-    const ids = Object.keys(state)
-
-    const newIds = ids.filter((id) => !currentIds.includes(id))
-    const removedIds = currentIds.filter((id) => !ids.includes(id))
-
-    const newCustomerGroups =
-      customer_groups
-        ?.filter((cg) => newIds.includes(cg.id))
-        .map((cg) => ({ id: cg.id, name: cg.name! })) || []
-
-    const filteredIntermediate = intermediate.filter(
-      (cg) => !removedIds.includes(cg.id)
-    )
-
-    setIntermediate([...filteredIntermediate, ...newCustomerGroups])
-    setRowSelection(state)
-  }
-
-  const handleSave = () => {
-    saveCustomerGroups(intermediate)
-  }
-
-  const columns = useColumns()
-
-  const { table } = useDataTable({
-    data: customer_groups || [],
-    columns,
-    count,
-    enablePagination: true,
-    enableRowSelection: true,
-    getRowId: (row) => row.id,
-    rowSelection: {
-      state: rowSelection,
-      updater,
-    },
-    pageSize: PAGE_SIZE,
-    prefix: PREFIX,
-  })
-
-  if (isError) {
-    throw error
-  }
-
-  return (
-    <SplitView.Drawer>
-      <div className="flex size-full flex-col overflow-hidden">
-        <DataTable
-          table={table}
-          columns={columns}
-          pageSize={PAGE_SIZE}
-          count={count}
-          isLoading={isLoading}
-          layout="fill"
-          pagination
-          search
-          prefix={PREFIX}
-          queryObject={raw}
-        />
-        <div className="flex items-center justify-end gap-x-2 border-t p-4">
-          <SplitView.Close type="button" asChild>
-            <Button variant="secondary" size="small">
-              {t("actions.cancel")}
-            </Button>
-          </SplitView.Close>
-          <Button
-            type="button"
-            variant="primary"
-            size="small"
-            onClick={handleSave}
-          >
-            {t("actions.add")}
-          </Button>
-        </div>
-      </div>
-    </SplitView.Drawer>
-  )
-}
-
-const columnHelper = createColumnHelper<HttpTypes.AdminCustomerGroup>()
-
-const useColumns = () => {
-  const base = useCustomerGroupTableColumns()
-
-  return useMemo(
-    () => [
-      columnHelper.display({
-        id: "select",
-        header: ({ table }) => {
-          return (
-            <Checkbox
-              checked={
-                table.getIsSomePageRowsSelected()
-                  ? "indeterminate"
-                  : table.getIsAllPageRowsSelected()
-              }
-              onCheckedChange={(value) =>
-                table.toggleAllPageRowsSelected(!!value)
-              }
-            />
-          )
-        },
-        cell: ({ row }) => {
-          return (
-            <Checkbox
-              checked={row.getIsSelected()}
-              onCheckedChange={(value) => row.toggleSelected(!!value)}
-              onClick={(e) => {
-                e.stopPropagation()
-              }}
-            />
-          )
-        },
-      }),
-      ...base,
-    ],
-    [base]
-  )
-}
diff --git a/packages/admin-next/dashboard/src/routes/pricing/pricing-create/index.ts b/packages/admin-next/dashboard/src/routes/pricing/pricing-create/index.ts
deleted file mode 100644
index 0bccafc207..0000000000
--- a/packages/admin-next/dashboard/src/routes/pricing/pricing-create/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { PricingCreate as Component } from "./pricing-create"
diff --git a/packages/admin-next/dashboard/src/routes/pricing/pricing-create/pricing-create.tsx b/packages/admin-next/dashboard/src/routes/pricing/pricing-create/pricing-create.tsx
deleted file mode 100644
index 35a0b87455..0000000000
--- a/packages/admin-next/dashboard/src/routes/pricing/pricing-create/pricing-create.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-import { RouteFocusModal } from "../../../components/route-modal"
-import { PricingCreateForm } from "./components/pricing-create-form"
-
-export const PricingCreate = () => {
-  return (
-    <RouteFocusModal>
-      <PricingCreateForm />
-    </RouteFocusModal>
-  )
-}
diff --git a/packages/admin-next/dashboard/src/routes/pricing/pricing-detail/components/pricing-configuration-section/index.ts b/packages/admin-next/dashboard/src/routes/pricing/pricing-detail/components/pricing-configuration-section/index.ts
deleted file mode 100644
index 50f98b9657..0000000000
--- a/packages/admin-next/dashboard/src/routes/pricing/pricing-detail/components/pricing-configuration-section/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./pricing-configuration-section"
diff --git a/packages/admin-next/dashboard/src/routes/pricing/pricing-detail/components/pricing-configuration-section/pricing-configuration-section.tsx b/packages/admin-next/dashboard/src/routes/pricing/pricing-detail/components/pricing-configuration-section/pricing-configuration-section.tsx
deleted file mode 100644
index 1b4c8d6b75..0000000000
--- a/packages/admin-next/dashboard/src/routes/pricing/pricing-detail/components/pricing-configuration-section/pricing-configuration-section.tsx
+++ /dev/null
@@ -1,90 +0,0 @@
-import { PencilSquare } from "@medusajs/icons"
-import { PriceListDTO } from "@medusajs/types"
-import { Container, Heading, Text } from "@medusajs/ui"
-import { useTranslation } from "react-i18next"
-import { ActionMenu } from "../../../../../components/common/action-menu"
-import { useDate } from "../../../../../hooks/use-date"
-
-type PricingConfigurationSectionProps = {
-  priceList: PriceListDTO
-}
-
-export const PricingConfigurationSection = ({
-  priceList,
-}: PricingConfigurationSectionProps) => {
-  const { t } = useTranslation()
-  const { getFullDate } = useDate()
-
-  // TODO: Customer groups are not available in the price list schema out-of-the-box atm.
-  // const firstCustomerGroups = priceList.customer_groups?.slice(0, 3) || []
-  // const remainingCustomerGroups = priceList.customer_groups?.slice(3) || []
-
-  return (
-    <Container className="divide-y p-0">
-      <div className="flex items-center justify-between px-6 py-4">
-        <Heading level="h2">{t("pricing.configuration.header")}</Heading>
-        <ActionMenu
-          groups={[
-            {
-              actions: [
-                {
-                  label: t("actions.edit"),
-                  to: "configuration",
-                  icon: <PencilSquare />,
-                },
-              ],
-            },
-          ]}
-        />
-      </div>
-      <div className="text-ui-fg-subtle grid grid-cols-2 items-center px-6 py-4">
-        <Text leading="compact" size="small" weight="plus">
-          {t("fields.startDate")}
-        </Text>
-        <Text size="small" className="text-pretty">
-          {priceList.starts_at
-            ? getFullDate({ date: priceList.starts_at })
-            : "-"}
-        </Text>
-      </div>
-      <div className="text-ui-fg-subtle grid grid-cols-2 items-center px-6 py-4">
-        <Text leading="compact" size="small" weight="plus">
-          {t("fields.endDate")}
-        </Text>
-        <Text size="small" className="text-pretty">
-          {priceList.ends_at ? getFullDate({ date: priceList.ends_at }) : "-"}
-        </Text>
-      </div>
-      {/* <div className="text-ui-fg-subtle grid grid-cols-2 items-center px-6 py-4">
-        <Text leading="compact" size="small" weight="plus">
-          {t("pricing.settings.customerGroupsLabel")}
-        </Text>
-        <Text size="small" className="text-pretty">
-          <span>
-            {firstCustomerGroups.length > 0
-              ? firstCustomerGroups.join(", ")
-              : "-"}
-          </span>
-          {remainingCustomerGroups.length > 0 && (
-            <Tooltip
-              content={
-                <ul>
-                  {remainingCustomerGroups.map((cg) => (
-                    <li key={cg.id}>{cg.name}</li>
-                  ))}
-                </ul>
-              }
-            >
-              <span className="text-ui-fg-muted">
-                {" "}
-                {t("general.plusCountMore", {
-                  count: remainingCustomerGroups.length,
-                })}
-              </span>
-            </Tooltip>
-          )}
-        </Text>
-      </div> */}
-    </Container>
-  )
-}
diff --git a/packages/admin-next/dashboard/src/routes/pricing/pricing-detail/components/pricing-general-section/index.ts b/packages/admin-next/dashboard/src/routes/pricing/pricing-detail/components/pricing-general-section/index.ts
deleted file mode 100644
index 6f5f081067..0000000000
--- a/packages/admin-next/dashboard/src/routes/pricing/pricing-detail/components/pricing-general-section/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./pricing-general-section"
diff --git a/packages/admin-next/dashboard/src/routes/pricing/pricing-detail/components/pricing-product-section/index.ts b/packages/admin-next/dashboard/src/routes/pricing/pricing-detail/components/pricing-product-section/index.ts
deleted file mode 100644
index 39141c59a2..0000000000
--- a/packages/admin-next/dashboard/src/routes/pricing/pricing-detail/components/pricing-product-section/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./pricing-product-section"
diff --git a/packages/admin-next/dashboard/src/routes/pricing/pricing-detail/index.ts b/packages/admin-next/dashboard/src/routes/pricing/pricing-detail/index.ts
deleted file mode 100644
index 7202090306..0000000000
--- a/packages/admin-next/dashboard/src/routes/pricing/pricing-detail/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { pricingLoader as loader } from "./loader"
-export { PricingDetail as Component } from "./pricing-detail"
diff --git a/packages/admin-next/dashboard/src/routes/pricing/pricing-edit/index.ts b/packages/admin-next/dashboard/src/routes/pricing/pricing-edit/index.ts
deleted file mode 100644
index a8bc1355ce..0000000000
--- a/packages/admin-next/dashboard/src/routes/pricing/pricing-edit/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { PricingEdit as Component } from "./pricing-edit"
diff --git a/packages/admin-next/dashboard/src/routes/pricing/pricing-list/components/pricing-list-table/index.ts b/packages/admin-next/dashboard/src/routes/pricing/pricing-list/components/pricing-list-table/index.ts
deleted file mode 100644
index 13fe4e07ee..0000000000
--- a/packages/admin-next/dashboard/src/routes/pricing/pricing-list/components/pricing-list-table/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./pricing-list-table"
diff --git a/packages/admin-next/dashboard/src/routes/pricing/pricing-list/components/pricing-list-table/pricing-table-actions.tsx b/packages/admin-next/dashboard/src/routes/pricing/pricing-list/components/pricing-list-table/pricing-table-actions.tsx
deleted file mode 100644
index 0d9a50f363..0000000000
--- a/packages/admin-next/dashboard/src/routes/pricing/pricing-list/components/pricing-list-table/pricing-table-actions.tsx
+++ /dev/null
@@ -1,61 +0,0 @@
-import { PencilSquare, Trash } from "@medusajs/icons"
-import { PriceListDTO } from "@medusajs/types"
-import { usePrompt } from "@medusajs/ui"
-import { useTranslation } from "react-i18next"
-import { ActionMenu } from "../../../../../components/common/action-menu"
-import { useDeletePriceList } from "../../../../../hooks/api/price-lists"
-
-type PricingTableActionsProps = {
-  priceList: PriceListDTO
-}
-
-export const PricingTableActions = ({
-  priceList,
-}: PricingTableActionsProps) => {
-  const { t } = useTranslation()
-  const prompt = usePrompt()
-
-  const { mutateAsync } = useDeletePriceList(priceList.id)
-
-  const handleDelete = async () => {
-    const res = await prompt({
-      title: t("general.areYouSure"),
-      description: t("pricing.deletePriceListWarning", {
-        name: priceList.title,
-      }),
-      confirmText: t("actions.delete"),
-      cancelText: t("actions.cancel"),
-    })
-
-    if (!res) {
-      return
-    }
-
-    await mutateAsync()
-  }
-
-  return (
-    <ActionMenu
-      groups={[
-        {
-          actions: [
-            {
-              label: t("actions.edit"),
-              to: `${priceList.id}/edit`,
-              icon: <PencilSquare />,
-            },
-          ],
-        },
-        {
-          actions: [
-            {
-              label: t("actions.delete"),
-              onClick: handleDelete,
-              icon: <Trash />,
-            },
-          ],
-        },
-      ]}
-    />
-  )
-}
diff --git a/packages/admin-next/dashboard/src/routes/pricing/pricing-list/components/pricing-list-table/use-pricing-table-filters.tsx b/packages/admin-next/dashboard/src/routes/pricing/pricing-list/components/pricing-list-table/use-pricing-table-filters.tsx
deleted file mode 100644
index 23777f91c3..0000000000
--- a/packages/admin-next/dashboard/src/routes/pricing/pricing-list/components/pricing-list-table/use-pricing-table-filters.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import { useTranslation } from "react-i18next"
-
-import { Filter } from "../../../../../components/table/data-table"
-
-export const usePricingTableFilters = () => {
-  const { t } = useTranslation()
-
-  const dateFilters: Filter[] = [
-    { label: t("fields.createdAt"), key: "created_at" },
-    { label: t("fields.updatedAt"), key: "updated_at" },
-  ].map((f) => ({
-    key: f.key,
-    label: f.label,
-    type: "date",
-  }))
-
-  return dateFilters
-}
diff --git a/packages/admin-next/dashboard/src/routes/pricing/pricing-list/index.ts b/packages/admin-next/dashboard/src/routes/pricing/pricing-list/index.ts
deleted file mode 100644
index 6b53600118..0000000000
--- a/packages/admin-next/dashboard/src/routes/pricing/pricing-list/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { PricingList as Component } from "./pricing-list"
diff --git a/packages/admin-next/dashboard/src/routes/pricing/pricing-products-prices/components/pricing-products-prices-form/index.ts b/packages/admin-next/dashboard/src/routes/pricing/pricing-products-prices/components/pricing-products-prices-form/index.ts
deleted file mode 100644
index 66ffc83995..0000000000
--- a/packages/admin-next/dashboard/src/routes/pricing/pricing-products-prices/components/pricing-products-prices-form/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./pricing-products-prices-form"
diff --git a/packages/admin-next/dashboard/src/routes/pricing/pricing-products-prices/components/pricing-products-prices-form/pricing-products-prices-form.tsx b/packages/admin-next/dashboard/src/routes/pricing/pricing-products-prices/components/pricing-products-prices-form/pricing-products-prices-form.tsx
deleted file mode 100644
index a0b09e926c..0000000000
--- a/packages/admin-next/dashboard/src/routes/pricing/pricing-products-prices/components/pricing-products-prices-form/pricing-products-prices-form.tsx
+++ /dev/null
@@ -1,378 +0,0 @@
-import {
-  CreatePriceListPriceDTO,
-  PriceListDTO,
-  UpdatePriceListPriceDTO,
-  HttpTypes,
-} from "@medusajs/types"
-import { Button } from "@medusajs/ui"
-import { UseFormReturn, useForm, useWatch } from "react-hook-form"
-import { useTranslation } from "react-i18next"
-import { z } from "zod"
-
-import { zodResolver } from "@hookform/resolvers/zod"
-import { useEffect, useMemo } from "react"
-import { DataGrid } from "../../../../../components/grid/data-grid"
-import {
-  RouteFocusModal,
-  useRouteModal,
-} from "../../../../../components/route-modal"
-import { useCurrencies } from "../../../../../hooks/api/currencies"
-import {
-  usePriceListAddPrices,
-  usePriceListRemovePrices,
-  useUpdatePriceList,
-} from "../../../../../hooks/api/price-lists"
-import { useStore } from "../../../../../hooks/api/store"
-import { castNumber } from "../../../../../lib/cast-number"
-import { usePriceListGridColumns } from "../../../common/hooks/use-price-list-grid-columns"
-import {
-  PricingProductsRecordSchema,
-  PricingVariantsRecordType,
-} from "../../../common/schemas"
-import { isProductRow } from "../../../common/utils"
-
-type PricingProductPricesFormProps = {
-  priceList: PriceListDTO
-  products: HttpTypes.AdminProduct[]
-}
-
-const PricingProductPricesSchema = z.object({
-  products: PricingProductsRecordSchema,
-})
-
-type VariantsPriceRecord = Record<
-  string,
-  { currency_code: string; amount: number; id: string }[]
->
-
-const initRecord = (priceList: PriceListDTO): VariantsPriceRecord => {
-  const prices = priceList.prices
-  const sortedPrices: VariantsPriceRecord = {}
-
-  if (!prices) {
-    return sortedPrices
-  }
-
-  prices.forEach((price) => {
-    // @ts-ignore - Type is wrong
-    const { variant_id, currency_code, amount, id } = price
-
-    if (!currency_code || !amount || !variant_id) {
-      return
-    }
-
-    if (!sortedPrices[variant_id]) {
-      sortedPrices[variant_id] = []
-    }
-
-    sortedPrices[variant_id] = [
-      ...sortedPrices[variant_id],
-      { currency_code, amount, id },
-    ]
-  })
-
-  return sortedPrices
-}
-
-export const PricingProductPricesForm = ({
-  priceList,
-  products,
-}: PricingProductPricesFormProps) => {
-  const { t } = useTranslation()
-  const { handleSuccess } = useRouteModal()
-
-  const record = useMemo(() => initRecord(priceList), [priceList])
-
-  const {
-    store,
-    isLoading: isStoreLoading,
-    isError: isStoreError,
-    error: storeError,
-  } = useStore()
-
-  const {
-    currencies,
-    isLoading: isCurrenciesLoading,
-    isError: isCurrencyError,
-    error: currencyError,
-  } = useCurrencies(
-    {
-      code: store?.supported_currencies?.map((c) => c.currency_code),
-    },
-    {
-      enabled: !!store,
-    }
-  )
-  const form = useForm<z.infer<typeof PricingProductPricesSchema>>({
-    defaultValues: {
-      products: {},
-    },
-    resolver: zodResolver(PricingProductPricesSchema),
-  })
-
-  const existingProducts = useWatch({
-    control: form.control,
-    name: "products",
-  })
-
-  useEffect(() => {
-    initDefaultValues(products, existingProducts, form, record)
-  }, [existingProducts, form, products, record])
-
-  const { mutateAsync: updateAsync, isPending: isUpdatePending } =
-    useUpdatePriceList(priceList.id)
-
-  const { mutateAsync: deleteAsync, isPending: isDeletePending } =
-    usePriceListRemovePrices(priceList.id)
-
-  const { mutateAsync: addAsync, isPending: isAddPending } =
-    usePriceListAddPrices(priceList.id)
-
-  const isPending = isUpdatePending || isDeletePending || isAddPending
-
-  const handleSubmit = form.handleSubmit(async (values) => {
-    const { products } = values
-
-    const { pricesToDelete, pricesToCreate, pricesToUpdate } = sortPrices(
-      products,
-      record
-    )
-
-    let failed = false
-
-    // TODO: Currently not working, need to fix the API
-    // await updateAsync(
-    //   {
-    //     // @ts-expect-error - type is wrong
-    //     prices: pricesToUpdate,
-    //   },
-    //   {
-    //     onError(error) {
-    //       console.error(error)
-    //       failed = true
-    //     },
-    //   }
-    // )
-
-    // if (failed) {
-    //   return
-    // }
-
-    if (pricesToDelete.length) {
-      await deleteAsync(
-        {
-          ids: pricesToDelete,
-        },
-        {
-          onError(error) {
-            console.error(error)
-            failed = true
-          },
-        }
-      )
-    }
-
-    if (failed) {
-      return
-    }
-
-    if (pricesToCreate.length) {
-      await addAsync(
-        {
-          // @ts-expect-error - type is wrong
-          prices: pricesToCreate,
-        },
-        {
-          onError(error) {
-            console.error(error)
-            failed = true
-          },
-        }
-      )
-    }
-
-    if (failed) {
-      return
-    }
-
-    handleSuccess()
-  })
-
-  const columns = usePriceListGridColumns({ currencies })
-
-  const initializing =
-    isStoreLoading || isCurrenciesLoading || !products || !store || !currencies
-
-  if (isStoreError) {
-    throw storeError
-  }
-
-  if (isCurrencyError) {
-    throw currencyError
-  }
-
-  return (
-    <RouteFocusModal.Form form={form}>
-      <form onSubmit={handleSubmit} className="flex size-full flex-col">
-        <RouteFocusModal.Header>
-          <div className="flex items-center justify-end gap-x-2">
-            <RouteFocusModal.Close asChild>
-              <Button size="small" variant="secondary">
-                {t("actions.cancel")}
-              </Button>
-            </RouteFocusModal.Close>
-            <Button size="small" type="submit" isLoading={isPending}>
-              {t("actions.save")}
-            </Button>
-          </div>
-        </RouteFocusModal.Header>
-        <RouteFocusModal.Body className="flex flex-col overflow-hidden">
-          <DataGrid
-            columns={columns}
-            data={products}
-            getSubRows={(row) => {
-              if (isProductRow(row)) {
-                return row.variants
-              }
-            }}
-            isLoading={initializing}
-            state={form}
-          />
-        </RouteFocusModal.Body>
-      </form>
-    </RouteFocusModal.Form>
-  )
-}
-
-function initDefaultValues(
-  products: HttpTypes.AdminProduct[],
-  existingProducts: any,
-  form: UseFormReturn<z.infer<typeof PricingProductPricesSchema>>,
-  record: VariantsPriceRecord
-) {
-  products.forEach((product) => {
-    if (existingProducts[product.id] || !product.variants) {
-      return
-    }
-
-    form.setValue(
-      `products.${product.id}.variants`,
-      {
-        ...product.variants.reduce((variants, variant) => {
-          const currencyPrices = record[variant.id] || []
-
-          variants[variant.id] = {
-            currency_prices: currencyPrices.reduce(
-              (prices, { currency_code, amount, id }) => {
-                prices[currency_code] = {
-                  amount: amount.toString(),
-                  id,
-                }
-                return prices
-              },
-              {} as Record<
-                string,
-                {
-                  amount: string
-                  id: string
-                }
-              >
-            ),
-            region_prices: {},
-          }
-
-          return variants
-        }, {} as PricingVariantsRecordType),
-      },
-      {
-        shouldDirty: false,
-        shouldTouch: false,
-        shouldValidate: false,
-      }
-    )
-  })
-}
-
-function sortPrices(
-  products: Record<
-    string,
-    {
-      variants: Record<
-        string,
-        {
-          currency_prices: Record<
-            string,
-            | { amount?: string | undefined; id?: string | null | undefined }
-            | undefined
-          >
-          region_prices: Record<
-            string,
-            | { amount?: string | undefined; id?: string | null | undefined }
-            | undefined
-          >
-        }
-      >
-    }
-  >,
-  record: VariantsPriceRecord
-) {
-  const pricesToUpdate: UpdatePriceListPriceDTO[] = []
-  const pricesToCreate: CreatePriceListPriceDTO[] = []
-  const pricesToDelete: string[] = []
-
-  for (const [_productId, product] of Object.entries(products)) {
-    const { variants } = product
-
-    for (const [variantId, variant] of Object.entries(variants)) {
-      const { currency_prices } = variant
-
-      for (const [currencyCode, currencyPrice] of Object.entries(
-        currency_prices
-      )) {
-        if (!currencyPrice) {
-          continue
-        }
-
-        if (currencyPrice.id && currencyPrice.amount) {
-          const originalPrice = record[variantId].find(
-            (p) => p.id === currencyPrice.id
-          )
-
-          // If the price has not changed, we don't need to update it
-          if (
-            originalPrice &&
-            originalPrice.amount === castNumber(currencyPrice.amount)
-          ) {
-            continue
-          }
-
-          pricesToUpdate.push({
-            id: currencyPrice.id,
-            amount: castNumber(currencyPrice.amount),
-            currency_code: currencyCode,
-            // @ts-expect-error type is wrong
-            variant_id: variantId,
-          })
-
-          continue
-        }
-
-        if (currencyPrice.id && !currencyPrice.amount) {
-          pricesToDelete.push(currencyPrice.id)
-          continue
-        }
-
-        if (!currencyPrice.id && currencyPrice.amount) {
-          pricesToCreate.push({
-            amount: castNumber(currencyPrice.amount),
-            currency_code: currencyCode,
-            // @ts-expect-error type is wrong
-            variant_id: variantId,
-          })
-          continue
-        }
-      }
-    }
-  }
-  return { pricesToDelete, pricesToCreate, pricesToUpdate }
-}
diff --git a/packages/admin-next/dashboard/src/routes/pricing/pricing-products-prices/index.ts b/packages/admin-next/dashboard/src/routes/pricing/pricing-products-prices/index.ts
deleted file mode 100644
index 02236d9d07..0000000000
--- a/packages/admin-next/dashboard/src/routes/pricing/pricing-products-prices/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { PricingProductsPrices as Component } from "./pricing-products-prices"
diff --git a/packages/admin-next/dashboard/src/routes/pricing/pricing-products/index.ts b/packages/admin-next/dashboard/src/routes/pricing/pricing-products/index.ts
deleted file mode 100644
index 7a5bb785ef..0000000000
--- a/packages/admin-next/dashboard/src/routes/pricing/pricing-products/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { PricingProducts as Component } from "./pricing-products"
diff --git a/packages/admin-next/dashboard/src/routes/pricing/pricing-products/pricing-products.tsx b/packages/admin-next/dashboard/src/routes/pricing/pricing-products/pricing-products.tsx
deleted file mode 100644
index 6e77dd4289..0000000000
--- a/packages/admin-next/dashboard/src/routes/pricing/pricing-products/pricing-products.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import { RouteFocusModal } from "../../../components/route-modal"
-
-export const PricingProducts = () => {
-  return <RouteFocusModal>Not Implemented Yet</RouteFocusModal>
-}
diff --git a/packages/admin-next/dashboard/src/routes/product-types/product-type-create/components/create-product-type-form/create-product-type-form.tsx b/packages/admin-next/dashboard/src/routes/product-types/product-type-create/components/create-product-type-form/create-product-type-form.tsx
index ad1cd9f5eb..d5d62b92e6 100644
--- a/packages/admin-next/dashboard/src/routes/product-types/product-type-create/components/create-product-type-form/create-product-type-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/product-types/product-type-create/components/create-product-type-form/create-product-type-form.tsx
@@ -7,7 +7,7 @@ import { Form } from "../../../../../components/common/form"
 import {
   RouteFocusModal,
   useRouteModal,
-} from "../../../../../components/route-modal"
+} from "../../../../../components/modals"
 import { useCreateProductType } from "../../../../../hooks/api/product-types"
 
 const CreateProductTypeSchema = z.object({
diff --git a/packages/admin-next/dashboard/src/routes/product-types/product-type-create/product-type-create.tsx b/packages/admin-next/dashboard/src/routes/product-types/product-type-create/product-type-create.tsx
index 9712dbf769..49168fe117 100644
--- a/packages/admin-next/dashboard/src/routes/product-types/product-type-create/product-type-create.tsx
+++ b/packages/admin-next/dashboard/src/routes/product-types/product-type-create/product-type-create.tsx
@@ -1,4 +1,4 @@
-import { RouteFocusModal } from "../../../components/route-modal"
+import { RouteFocusModal } from "../../../components/modals"
 import { CreateProductTypeForm } from "./components/create-product-type-form"
 
 export const ProductTypeCreate = () => {
diff --git a/packages/admin-next/dashboard/src/routes/product-types/product-type-edit/components/edit-product-type-form/edit-product-type-form.tsx b/packages/admin-next/dashboard/src/routes/product-types/product-type-edit/components/edit-product-type-form/edit-product-type-form.tsx
index 68989adf31..9f76269eed 100644
--- a/packages/admin-next/dashboard/src/routes/product-types/product-type-edit/components/edit-product-type-form/edit-product-type-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/product-types/product-type-edit/components/edit-product-type-form/edit-product-type-form.tsx
@@ -8,7 +8,7 @@ import { Form } from "../../../../../components/common/form"
 import {
   RouteDrawer,
   useRouteModal,
-} from "../../../../../components/route-modal"
+} from "../../../../../components/modals"
 import { useUpdateProductType } from "../../../../../hooks/api/product-types"
 
 const EditProductTypeSchema = z.object({
diff --git a/packages/admin-next/dashboard/src/routes/product-types/product-type-edit/product-type-edit.tsx b/packages/admin-next/dashboard/src/routes/product-types/product-type-edit/product-type-edit.tsx
index b7ac94eb8f..61a1857b69 100644
--- a/packages/admin-next/dashboard/src/routes/product-types/product-type-edit/product-type-edit.tsx
+++ b/packages/admin-next/dashboard/src/routes/product-types/product-type-edit/product-type-edit.tsx
@@ -1,7 +1,7 @@
 import { Heading } from "@medusajs/ui"
 import { useTranslation } from "react-i18next"
 import { useParams } from "react-router-dom"
-import { RouteDrawer } from "../../../components/route-modal"
+import { RouteDrawer } from "../../../components/modals"
 import { useProductType } from "../../../hooks/api/product-types"
 import { EditProductTypeForm } from "./components/edit-product-type-form"
 
diff --git a/packages/admin-next/dashboard/src/routes/product-variants/product-variant-edit/components/product-edit-variant-form/product-edit-variant-form.tsx b/packages/admin-next/dashboard/src/routes/product-variants/product-variant-edit/components/product-edit-variant-form/product-edit-variant-form.tsx
index 6d952addb8..0f0971f591 100644
--- a/packages/admin-next/dashboard/src/routes/product-variants/product-variant-edit/components/product-edit-variant-form/product-edit-variant-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/product-variants/product-variant-edit/components/product-edit-variant-form/product-edit-variant-form.tsx
@@ -4,6 +4,7 @@ import { useForm } from "react-hook-form"
 import { useTranslation } from "react-i18next"
 import { z } from "zod"
 
+import { HttpTypes } from "@medusajs/types"
 import { Divider } from "../../../../../components/common/divider"
 import { Form } from "../../../../../components/common/form"
 import { Combobox } from "../../../../../components/inputs/combobox"
@@ -11,14 +12,13 @@ import { CountrySelect } from "../../../../../components/inputs/country-select"
 import {
   RouteDrawer,
   useRouteModal,
-} from "../../../../../components/route-modal"
+} from "../../../../../components/modals"
 import { useUpdateProductVariant } from "../../../../../hooks/api/products"
 import {
   parseOptionalFormData,
   parseOptionalFormNumber,
 } from "../../../../../lib/form-helpers"
 import { optionalInt } from "../../../../../lib/validation"
-import { HttpTypes } from "@medusajs/types"
 
 type ProductEditVariantFormProps = {
   product: HttpTypes.AdminProduct
diff --git a/packages/admin-next/dashboard/src/routes/product-variants/product-variant-edit/product-variant-edit.tsx b/packages/admin-next/dashboard/src/routes/product-variants/product-variant-edit/product-variant-edit.tsx
index 22587eda0b..f1873d6402 100644
--- a/packages/admin-next/dashboard/src/routes/product-variants/product-variant-edit/product-variant-edit.tsx
+++ b/packages/admin-next/dashboard/src/routes/product-variants/product-variant-edit/product-variant-edit.tsx
@@ -1,11 +1,11 @@
+import { HttpTypes } from "@medusajs/types"
 import { Heading } from "@medusajs/ui"
 import { useTranslation } from "react-i18next"
 import { json, useLoaderData, useParams } from "react-router-dom"
-import { RouteDrawer } from "../../../components/route-modal"
+import { RouteDrawer } from "../../../components/modals"
 import { useProduct } from "../../../hooks/api/products"
 import { ProductEditVariantForm } from "./components/product-edit-variant-form"
 import { editProductVariantLoader } from "./loader"
-import { HttpTypes } from "@medusajs/types"
 
 export const ProductVariantEdit = () => {
   const initialData = useLoaderData() as Awaited<
diff --git a/packages/admin-next/dashboard/src/routes/product-variants/product-variant-manage-inventory-items/components/manage-variant-inventory-items-form/manage-variant-inventory-items-form.tsx b/packages/admin-next/dashboard/src/routes/product-variants/product-variant-manage-inventory-items/components/manage-variant-inventory-items-form/manage-variant-inventory-items-form.tsx
index 2cc45042f8..7f79cf2f55 100644
--- a/packages/admin-next/dashboard/src/routes/product-variants/product-variant-manage-inventory-items/components/manage-variant-inventory-items-form/manage-variant-inventory-items-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/product-variants/product-variant-manage-inventory-items/components/manage-variant-inventory-items-form/manage-variant-inventory-items-form.tsx
@@ -1,20 +1,20 @@
-import { Button, Heading, IconButton, Input, Label, toast } from "@medusajs/ui"
-import { useTranslation } from "react-i18next"
-import { useFieldArray, useForm } from "react-hook-form"
-import { XMarkMini } from "@medusajs/icons"
-import * as zod from "zod"
-import i18next from "i18next"
 import { zodResolver } from "@hookform/resolvers/zod"
+import { XMarkMini } from "@medusajs/icons"
 import { AdminInventoryItem, AdminProductVariant } from "@medusajs/types"
+import { Button, Heading, IconButton, Input, Label, toast } from "@medusajs/ui"
+import i18next from "i18next"
+import { useFieldArray, useForm } from "react-hook-form"
+import { useTranslation } from "react-i18next"
+import * as zod from "zod"
 
+import { Form } from "../../../../../components/common/form"
+import { Combobox } from "../../../../../components/inputs/combobox"
 import {
   RouteFocusModal,
   useRouteModal,
-} from "../../../../../components/route-modal"
-import { Form } from "../../../../../components/common/form"
-import { Combobox } from "../../../../../components/inputs/combobox"
-import { useComboboxData } from "../../../../../hooks/use-combobox-data"
+} from "../../../../../components/modals"
 import { useProductVariantsInventoryItemsBatch } from "../../../../../hooks/api/products"
+import { useComboboxData } from "../../../../../hooks/use-combobox-data"
 import { sdk } from "../../../../../lib/client"
 
 type ManageVariantInventoryItemsFormProps = {
diff --git a/packages/admin-next/dashboard/src/routes/product-variants/product-variant-manage-inventory-items/product-variant-manage-inventory-items.tsx b/packages/admin-next/dashboard/src/routes/product-variants/product-variant-manage-inventory-items/product-variant-manage-inventory-items.tsx
index 3e5d549302..59c7f0d69b 100644
--- a/packages/admin-next/dashboard/src/routes/product-variants/product-variant-manage-inventory-items/product-variant-manage-inventory-items.tsx
+++ b/packages/admin-next/dashboard/src/routes/product-variants/product-variant-manage-inventory-items/product-variant-manage-inventory-items.tsx
@@ -1,9 +1,9 @@
 import { useParams } from "react-router-dom"
 
-import { ManageVariantInventoryItemsForm } from "./components/manage-variant-inventory-items-form"
-import { RouteFocusModal } from "../../../components/route-modal"
+import { RouteFocusModal } from "../../../components/modals"
 import { useProductVariant } from "../../../hooks/api/products"
 import { VARIANT_DETAIL_FIELDS } from "../product-variant-detail/constants.ts"
+import { ManageVariantInventoryItemsForm } from "./components/manage-variant-inventory-items-form"
 
 export function ProductVariantManageInventoryItems() {
   const { id, variant_id } = useParams()
diff --git a/packages/admin-next/dashboard/src/routes/products/product-attributes/components/product-attributes-form/product-attributes-form.tsx b/packages/admin-next/dashboard/src/routes/products/product-attributes/components/product-attributes-form/product-attributes-form.tsx
index 7e550ca94f..000aa1096b 100644
--- a/packages/admin-next/dashboard/src/routes/products/product-attributes/components/product-attributes-form/product-attributes-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/products/product-attributes/components/product-attributes-form/product-attributes-form.tsx
@@ -1,4 +1,5 @@
 import { zodResolver } from "@hookform/resolvers/zod"
+import { HttpTypes } from "@medusajs/types"
 import { Button, Input } from "@medusajs/ui"
 import { useForm } from "react-hook-form"
 import { useTranslation } from "react-i18next"
@@ -8,9 +9,8 @@ import { CountrySelect } from "../../../../../components/inputs/country-select"
 import {
   RouteDrawer,
   useRouteModal,
-} from "../../../../../components/route-modal"
+} from "../../../../../components/modals"
 import { useUpdateProduct } from "../../../../../hooks/api/products"
-import { HttpTypes } from "@medusajs/types"
 
 type ProductAttributesFormProps = {
   product: HttpTypes.AdminProduct
diff --git a/packages/admin-next/dashboard/src/routes/products/product-attributes/product-attributes.tsx b/packages/admin-next/dashboard/src/routes/products/product-attributes/product-attributes.tsx
index f937773cd0..34d6d426ca 100644
--- a/packages/admin-next/dashboard/src/routes/products/product-attributes/product-attributes.tsx
+++ b/packages/admin-next/dashboard/src/routes/products/product-attributes/product-attributes.tsx
@@ -2,9 +2,9 @@ import { Heading } from "@medusajs/ui"
 import { useTranslation } from "react-i18next"
 import { useParams } from "react-router-dom"
 
-import { RouteDrawer } from "../../../components/route-modal"
-import { ProductAttributesForm } from "./components/product-attributes-form"
+import { RouteDrawer } from "../../../components/modals"
 import { useProduct } from "../../../hooks/api/products"
+import { ProductAttributesForm } from "./components/product-attributes-form"
 
 export const ProductAttributes = () => {
   const { id } = useParams()
diff --git a/packages/admin-next/dashboard/src/routes/products/product-create-option/components/create-product-option-form/create-product-option-form.tsx b/packages/admin-next/dashboard/src/routes/products/product-create-option/components/create-product-option-form/create-product-option-form.tsx
index 31ad33e393..be8d3f9af5 100644
--- a/packages/admin-next/dashboard/src/routes/products/product-create-option/components/create-product-option-form/create-product-option-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/products/product-create-option/components/create-product-option-form/create-product-option-form.tsx
@@ -4,14 +4,14 @@ import { useForm } from "react-hook-form"
 import { useTranslation } from "react-i18next"
 import { z } from "zod"
 
+import { HttpTypes } from "@medusajs/types"
 import { Form } from "../../../../../components/common/form"
 import { ChipInput } from "../../../../../components/inputs/chip-input"
 import {
   RouteDrawer,
   useRouteModal,
-} from "../../../../../components/route-modal"
+} from "../../../../../components/modals"
 import { useCreateProductOption } from "../../../../../hooks/api/products"
-import { HttpTypes } from "@medusajs/types"
 
 type EditProductOptionsFormProps = {
   product: HttpTypes.AdminProduct
diff --git a/packages/admin-next/dashboard/src/routes/products/product-create-option/product-create-option.tsx b/packages/admin-next/dashboard/src/routes/products/product-create-option/product-create-option.tsx
index 043bfe826c..3ad22b6714 100644
--- a/packages/admin-next/dashboard/src/routes/products/product-create-option/product-create-option.tsx
+++ b/packages/admin-next/dashboard/src/routes/products/product-create-option/product-create-option.tsx
@@ -1,9 +1,9 @@
 import { Heading } from "@medusajs/ui"
 import { useTranslation } from "react-i18next"
 import { useParams } from "react-router-dom"
-import { RouteDrawer } from "../../../components/route-modal"
-import { CreateProductOptionForm } from "./components/create-product-option-form"
+import { RouteDrawer } from "../../../components/modals"
 import { useProduct } from "../../../hooks/api/products"
+import { CreateProductOptionForm } from "./components/create-product-option-form"
 
 export const ProductCreateOption = () => {
   const { id } = useParams()
diff --git a/packages/admin-next/dashboard/src/routes/products/product-create-variant/components/create-product-variant-form/create-product-variant-form.tsx b/packages/admin-next/dashboard/src/routes/products/product-create-variant/components/create-product-variant-form/create-product-variant-form.tsx
index a8bc59714d..6245b3a895 100644
--- a/packages/admin-next/dashboard/src/routes/products/product-create-variant/components/create-product-variant-form/create-product-variant-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/products/product-create-variant/components/create-product-variant-form/create-product-variant-form.tsx
@@ -4,6 +4,7 @@ import { useForm } from "react-hook-form"
 import { useTranslation } from "react-i18next"
 import { z } from "zod"
 
+import { HttpTypes } from "@medusajs/types"
 import { Fragment } from "react"
 import { Divider } from "../../../../../components/common/divider"
 import { Form } from "../../../../../components/common/form"
@@ -12,11 +13,10 @@ import { CountrySelect } from "../../../../../components/inputs/country-select"
 import {
   RouteDrawer,
   useRouteModal,
-} from "../../../../../components/route-modal"
+} from "../../../../../components/modals"
 import { useCreateProductVariant } from "../../../../../hooks/api/products"
 import { castNumber } from "../../../../../lib/cast-number"
 import { optionalInt } from "../../../../../lib/validation"
-import { HttpTypes } from "@medusajs/types"
 
 type CreateProductVariantFormProps = {
   product: HttpTypes.AdminProduct
diff --git a/packages/admin-next/dashboard/src/routes/products/product-create-variant/product-create-variant.tsx b/packages/admin-next/dashboard/src/routes/products/product-create-variant/product-create-variant.tsx
index 0ab64c6eaa..7d598d2f49 100644
--- a/packages/admin-next/dashboard/src/routes/products/product-create-variant/product-create-variant.tsx
+++ b/packages/admin-next/dashboard/src/routes/products/product-create-variant/product-create-variant.tsx
@@ -1,7 +1,7 @@
 import { Heading } from "@medusajs/ui"
 import { useTranslation } from "react-i18next"
 import { useParams } from "react-router-dom"
-import { RouteDrawer } from "../../../components/route-modal"
+import { RouteDrawer } from "../../../components/modals"
 import { useProduct } from "../../../hooks/api/products"
 import { CreateProductVariantForm } from "./components/create-product-variant-form"
 
diff --git a/packages/admin-next/dashboard/src/routes/products/product-create/components/product-create-form/product-create-form.tsx b/packages/admin-next/dashboard/src/routes/products/product-create/components/product-create-form/product-create-form.tsx
index 141f3ce660..b3f0337cd7 100644
--- a/packages/admin-next/dashboard/src/routes/products/product-create/components/product-create-form/product-create-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/products/product-create/components/product-create-form/product-create-form.tsx
@@ -1,14 +1,17 @@
 import { zodResolver } from "@hookform/resolvers/zod"
+import { HttpTypes, SalesChannelDTO } from "@medusajs/types"
 import { Button, ProgressStatus, ProgressTabs, toast } from "@medusajs/ui"
 import { useEffect, useMemo, useState } from "react"
 import { useForm, useWatch } from "react-hook-form"
 import { useTranslation } from "react-i18next"
-import { SalesChannelDTO, HttpTypes } from "@medusajs/types"
 import {
   RouteFocusModal,
   useRouteModal,
-} from "../../../../../components/route-modal"
+} from "../../../../../components/modals"
 import { useCreateProduct } from "../../../../../hooks/api/products"
+import { useRegions } from "../../../../../hooks/api/regions"
+import { sdk } from "../../../../../lib/client"
+import { isFetchError } from "../../../../../lib/is-fetch-error"
 import {
   PRODUCT_CREATE_FORM_DEFAULTS,
   ProductCreateSchema,
@@ -16,12 +19,9 @@ import {
 import { ProductCreateSchemaType } from "../../types"
 import { normalizeProductFormValues } from "../../utils"
 import { ProductCreateDetailsForm } from "../product-create-details-form"
-import { ProductCreateOrganizeForm } from "../product-create-organize-form"
 import { ProductCreateInventoryKitForm } from "../product-create-inventory-kit-form"
+import { ProductCreateOrganizeForm } from "../product-create-organize-form"
 import { ProductCreateVariantsForm } from "../product-create-variants-form"
-import { isFetchError } from "../../../../../lib/is-fetch-error"
-import { sdk } from "../../../../../lib/client"
-import { useRegions } from "../../../../../hooks/api/regions.tsx"
 
 enum Tab {
   DETAILS = "details",
diff --git a/packages/admin-next/dashboard/src/routes/products/product-create/product-create.tsx b/packages/admin-next/dashboard/src/routes/products/product-create/product-create.tsx
index 1f5acf111b..156beaffdf 100644
--- a/packages/admin-next/dashboard/src/routes/products/product-create/product-create.tsx
+++ b/packages/admin-next/dashboard/src/routes/products/product-create/product-create.tsx
@@ -1,7 +1,7 @@
-import { RouteFocusModal } from "../../../components/route-modal"
-import { ProductCreateForm } from "./components/product-create-form/product-create-form"
-import { useStore } from "../../../hooks/api/store"
+import { RouteFocusModal } from "../../../components/modals"
 import { useSalesChannel } from "../../../hooks/api/sales-channels"
+import { useStore } from "../../../hooks/api/store"
+import { ProductCreateForm } from "./components/product-create-form/product-create-form"
 
 export const ProductCreate = () => {
   const { store } = useStore({
diff --git a/packages/admin-next/dashboard/src/routes/products/product-edit-option/components/edit-product-option-form/edit-product-option-form.tsx b/packages/admin-next/dashboard/src/routes/products/product-edit-option/components/edit-product-option-form/edit-product-option-form.tsx
index bc4fbb0ab6..f928014159 100644
--- a/packages/admin-next/dashboard/src/routes/products/product-edit-option/components/edit-product-option-form/edit-product-option-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/products/product-edit-option/components/edit-product-option-form/edit-product-option-form.tsx
@@ -4,14 +4,14 @@ import { useForm } from "react-hook-form"
 import { useTranslation } from "react-i18next"
 import { z } from "zod"
 
+import { HttpTypes } from "@medusajs/types"
 import { Form } from "../../../../../components/common/form"
 import { ChipInput } from "../../../../../components/inputs/chip-input"
 import {
   RouteDrawer,
   useRouteModal,
-} from "../../../../../components/route-modal"
+} from "../../../../../components/modals"
 import { useUpdateProductOption } from "../../../../../hooks/api/products"
-import { HttpTypes } from "@medusajs/types"
 
 type EditProductOptionFormProps = {
   option: HttpTypes.AdminProductOption
diff --git a/packages/admin-next/dashboard/src/routes/products/product-edit-option/product-edit-option.tsx b/packages/admin-next/dashboard/src/routes/products/product-edit-option/product-edit-option.tsx
index d56c9e085d..9ab9731c78 100644
--- a/packages/admin-next/dashboard/src/routes/products/product-edit-option/product-edit-option.tsx
+++ b/packages/admin-next/dashboard/src/routes/products/product-edit-option/product-edit-option.tsx
@@ -1,9 +1,9 @@
 import { Heading } from "@medusajs/ui"
 import { useTranslation } from "react-i18next"
 import { json, useParams } from "react-router-dom"
-import { RouteDrawer } from "../../../components/route-modal"
-import { CreateProductOptionForm } from "./components/edit-product-option-form"
+import { RouteDrawer } from "../../../components/modals"
 import { useProduct } from "../../../hooks/api/products"
+import { CreateProductOptionForm } from "./components/edit-product-option-form"
 
 export const ProductEditOption = () => {
   const { id, option_id } = useParams()
diff --git a/packages/admin-next/dashboard/src/routes/products/product-edit/components/edit-product-form/edit-product-form.tsx b/packages/admin-next/dashboard/src/routes/products/product-edit/components/edit-product-form/edit-product-form.tsx
index 7b7bbd77a8..fcb1d50788 100644
--- a/packages/admin-next/dashboard/src/routes/products/product-edit/components/edit-product-form/edit-product-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/products/product-edit/components/edit-product-form/edit-product-form.tsx
@@ -4,15 +4,15 @@ import { useForm } from "react-hook-form"
 import { useTranslation } from "react-i18next"
 import * as zod from "zod"
 
+import { HttpTypes } from "@medusajs/types"
 import { Form } from "../../../../../components/common/form"
 import { SwitchBox } from "../../../../../components/common/switch-box"
 import {
   RouteDrawer,
   useRouteModal,
-} from "../../../../../components/route-modal"
+} from "../../../../../components/modals"
 import { useUpdateProduct } from "../../../../../hooks/api/products"
 import { parseOptionalFormData } from "../../../../../lib/form-helpers"
-import { HttpTypes } from "@medusajs/types"
 
 type EditProductFormProps = {
   product: HttpTypes.AdminProduct
diff --git a/packages/admin-next/dashboard/src/routes/products/product-edit/product-edit.tsx b/packages/admin-next/dashboard/src/routes/products/product-edit/product-edit.tsx
index 09d0109b1d..4611dc41ba 100644
--- a/packages/admin-next/dashboard/src/routes/products/product-edit/product-edit.tsx
+++ b/packages/admin-next/dashboard/src/routes/products/product-edit/product-edit.tsx
@@ -2,9 +2,9 @@ import { Heading } from "@medusajs/ui"
 import { useTranslation } from "react-i18next"
 import { useParams } from "react-router-dom"
 
-import { RouteDrawer } from "../../../components/route-modal"
-import { EditProductForm } from "./components/edit-product-form"
+import { RouteDrawer } from "../../../components/modals"
 import { useProduct } from "../../../hooks/api/products"
+import { EditProductForm } from "./components/edit-product-form"
 
 export const ProductEdit = () => {
   const { id } = useParams()
diff --git a/packages/admin-next/dashboard/src/routes/products/product-media/components/edit-product-media-form/edit-product-media-form.tsx b/packages/admin-next/dashboard/src/routes/products/product-media/components/edit-product-media-form/edit-product-media-form.tsx
index 8033641210..1e3955d803 100644
--- a/packages/admin-next/dashboard/src/routes/products/product-media/components/edit-product-media-form/edit-product-media-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/products/product-media/components/edit-product-media-form/edit-product-media-form.tsx
@@ -5,20 +5,20 @@ import { useFieldArray, useForm } from "react-hook-form"
 import { useTranslation } from "react-i18next"
 import { z } from "zod"
 
+import { HttpTypes } from "@medusajs/types"
 import { Link } from "react-router-dom"
 import {
   RouteFocusModal,
   useRouteModal,
-} from "../../../../../components/route-modal"
+} from "../../../../../components/modals"
 import { useUpdateProduct } from "../../../../../hooks/api/products"
 import { sdk } from "../../../../../lib/client"
+import { MediaGrid } from "../../../common/components/media-grid-view"
+import { UploadMediaFormItem } from "../../../common/components/upload-media-form-item"
 import {
   EditProductMediaSchema,
   MediaSchema,
 } from "../../../product-create/constants"
-import { HttpTypes } from "@medusajs/types"
-import { MediaGrid } from "../../../common/components/media-grid-view"
-import { UploadMediaFormItem } from "../../../common/components/upload-media-form-item"
 import { EditProductMediaSchemaType } from "../../../product-create/types"
 
 type ProductMediaViewProps = {
diff --git a/packages/admin-next/dashboard/src/routes/products/product-media/components/product-media-gallery/product-media-gallery.tsx b/packages/admin-next/dashboard/src/routes/products/product-media/components/product-media-gallery/product-media-gallery.tsx
index c7062caf92..260af1f461 100644
--- a/packages/admin-next/dashboard/src/routes/products/product-media/components/product-media-gallery/product-media-gallery.tsx
+++ b/packages/admin-next/dashboard/src/routes/products/product-media/components/product-media-gallery/product-media-gallery.tsx
@@ -10,9 +10,9 @@ import { useCallback, useEffect, useState } from "react"
 import { useTranslation } from "react-i18next"
 import { Link, useLocation } from "react-router-dom"
 
-import { RouteFocusModal } from "../../../../../components/route-modal"
-import { useUpdateProduct } from "../../../../../hooks/api/products"
 import { HttpTypes } from "@medusajs/types"
+import { RouteFocusModal } from "../../../../../components/modals"
+import { useUpdateProduct } from "../../../../../hooks/api/products"
 
 type ProductMediaGalleryProps = {
   product: HttpTypes.AdminProduct
diff --git a/packages/admin-next/dashboard/src/routes/products/product-media/product-media.tsx b/packages/admin-next/dashboard/src/routes/products/product-media/product-media.tsx
index 34a3b3cce0..03a2334cb5 100644
--- a/packages/admin-next/dashboard/src/routes/products/product-media/product-media.tsx
+++ b/packages/admin-next/dashboard/src/routes/products/product-media/product-media.tsx
@@ -1,7 +1,7 @@
 import { useParams } from "react-router-dom"
-import { RouteFocusModal } from "../../../components/route-modal"
-import { ProductMediaView } from "./components/product-media-view"
+import { RouteFocusModal } from "../../../components/modals"
 import { useProduct } from "../../../hooks/api/products"
+import { ProductMediaView } from "./components/product-media-view"
 
 export const ProductMedia = () => {
   const { id } = useParams()
diff --git a/packages/admin-next/dashboard/src/routes/products/product-organization/components/product-organization-form/product-organization-form.tsx b/packages/admin-next/dashboard/src/routes/products/product-organization/components/product-organization-form/product-organization-form.tsx
index bdcac097b1..3e519cc4c7 100644
--- a/packages/admin-next/dashboard/src/routes/products/product-organization/components/product-organization-form/product-organization-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/products/product-organization/components/product-organization-form/product-organization-form.tsx
@@ -9,7 +9,7 @@ import { Combobox } from "../../../../../components/inputs/combobox"
 import {
   RouteDrawer,
   useRouteModal,
-} from "../../../../../components/route-modal"
+} from "../../../../../components/modals"
 import { useUpdateProduct } from "../../../../../hooks/api/products"
 import { useComboboxData } from "../../../../../hooks/use-combobox-data"
 import { client, sdk } from "../../../../../lib/client"
diff --git a/packages/admin-next/dashboard/src/routes/products/product-organization/product-organization.tsx b/packages/admin-next/dashboard/src/routes/products/product-organization/product-organization.tsx
index 0852e9c612..b0f79b64f1 100644
--- a/packages/admin-next/dashboard/src/routes/products/product-organization/product-organization.tsx
+++ b/packages/admin-next/dashboard/src/routes/products/product-organization/product-organization.tsx
@@ -2,7 +2,7 @@ import { Heading } from "@medusajs/ui"
 import { useTranslation } from "react-i18next"
 import { useParams } from "react-router-dom"
 
-import { RouteDrawer } from "../../../components/route-modal"
+import { RouteDrawer } from "../../../components/modals"
 import { useProduct } from "../../../hooks/api/products"
 import { PRODUCT_DETAIL_FIELDS } from "../product-detail/constants"
 import { ProductOrganizationForm } from "./components/product-organization-form"
diff --git a/packages/admin-next/dashboard/src/routes/products/product-prices/pricing-edit.tsx b/packages/admin-next/dashboard/src/routes/products/product-prices/pricing-edit.tsx
index 87c53c0352..a415c729cf 100644
--- a/packages/admin-next/dashboard/src/routes/products/product-prices/pricing-edit.tsx
+++ b/packages/admin-next/dashboard/src/routes/products/product-prices/pricing-edit.tsx
@@ -1,16 +1,15 @@
 import { zodResolver } from "@hookform/resolvers/zod"
+import { HttpTypes } from "@medusajs/types"
 import { Button } from "@medusajs/ui"
+import { useMemo } from "react"
 import { useForm } from "react-hook-form"
 import { useTranslation } from "react-i18next"
 import * as zod from "zod"
-import { HttpTypes } from "@medusajs/types"
 
-import { RouteFocusModal, useRouteModal } from "../../../components/route-modal"
+import { RouteFocusModal, useRouteModal } from "../../../components/modals"
 import { useUpdateProductVariantsBatch } from "../../../hooks/api/products"
-import { VariantPricingForm } from "../common/variant-pricing-form"
+import { useRegions } from "../../../hooks/api/regions"
 import { castNumber } from "../../../lib/cast-number"
-import { useRegions } from "../../../hooks/api/regions.tsx"
-import { useMemo } from "react"
 
 export const UpdateVariantPricesSchema = zod.object({
   variants: zod.array(
diff --git a/packages/admin-next/dashboard/src/routes/products/product-prices/product-prices.tsx b/packages/admin-next/dashboard/src/routes/products/product-prices/product-prices.tsx
index b103966229..90ea3d888d 100644
--- a/packages/admin-next/dashboard/src/routes/products/product-prices/product-prices.tsx
+++ b/packages/admin-next/dashboard/src/routes/products/product-prices/product-prices.tsx
@@ -1,7 +1,7 @@
 import { useParams } from "react-router-dom"
 
+import { RouteFocusModal } from "../../../components/modals"
 import { useProduct } from "../../../hooks/api/products"
-import { RouteFocusModal } from "../../../components/route-modal"
 import { PricingEdit } from "./pricing-edit"
 
 export const ProductPrices = () => {
diff --git a/packages/admin-next/dashboard/src/routes/products/product-sales-channels/components/edit-sales-channels-form/edit-sales-channels-form.tsx b/packages/admin-next/dashboard/src/routes/products/product-sales-channels/components/edit-sales-channels-form/edit-sales-channels-form.tsx
index 5879bc6f2a..0f485b44cb 100644
--- a/packages/admin-next/dashboard/src/routes/products/product-sales-channels/components/edit-sales-channels-form/edit-sales-channels-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/products/product-sales-channels/components/edit-sales-channels-form/edit-sales-channels-form.tsx
@@ -6,19 +6,19 @@ import { useTranslation } from "react-i18next"
 import * as zod from "zod"
 
 import { zodResolver } from "@hookform/resolvers/zod"
+import { HttpTypes } from "@medusajs/types"
 import { useForm } from "react-hook-form"
 import {
   RouteFocusModal,
   useRouteModal,
-} from "../../../../../components/route-modal"
+} from "../../../../../components/modals"
 import { DataTable } from "../../../../../components/table/data-table"
+import { useUpdateProduct } from "../../../../../hooks/api/products"
+import { useSalesChannels } from "../../../../../hooks/api/sales-channels"
 import { useSalesChannelTableColumns } from "../../../../../hooks/table/columns/use-sales-channel-table-columns"
 import { useSalesChannelTableFilters } from "../../../../../hooks/table/filters/use-sales-channel-table-filters"
 import { useSalesChannelTableQuery } from "../../../../../hooks/table/query/use-sales-channel-table-query"
 import { useDataTable } from "../../../../../hooks/use-data-table"
-import { useSalesChannels } from "../../../../../hooks/api/sales-channels"
-import { useUpdateProduct } from "../../../../../hooks/api/products"
-import { HttpTypes } from "@medusajs/types"
 
 type EditSalesChannelsFormProps = {
   product: HttpTypes.AdminProduct
diff --git a/packages/admin-next/dashboard/src/routes/products/product-sales-channels/product-sales-channels.tsx b/packages/admin-next/dashboard/src/routes/products/product-sales-channels/product-sales-channels.tsx
index 9c886e7491..b2aa39ebfc 100644
--- a/packages/admin-next/dashboard/src/routes/products/product-sales-channels/product-sales-channels.tsx
+++ b/packages/admin-next/dashboard/src/routes/products/product-sales-channels/product-sales-channels.tsx
@@ -1,8 +1,8 @@
 import { useParams } from "react-router-dom"
 
-import { RouteFocusModal } from "../../../components/route-modal"
-import { EditSalesChannelsForm } from "./components/edit-sales-channels-form"
+import { RouteFocusModal } from "../../../components/modals"
 import { useProduct } from "../../../hooks/api/products"
+import { EditSalesChannelsForm } from "./components/edit-sales-channels-form"
 
 export const ProductSalesChannels = () => {
   const { id } = useParams()
diff --git a/packages/admin-next/dashboard/src/routes/profile/profile-edit/components/edit-profile-form/edit-profile-form.tsx b/packages/admin-next/dashboard/src/routes/profile/profile-edit/components/edit-profile-form/edit-profile-form.tsx
index e51edfe165..78aa60581f 100644
--- a/packages/admin-next/dashboard/src/routes/profile/profile-edit/components/edit-profile-form/edit-profile-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/profile/profile-edit/components/edit-profile-form/edit-profile-form.tsx
@@ -9,7 +9,7 @@ import { Form } from "../../../../../components/common/form"
 import {
   RouteDrawer,
   useRouteModal,
-} from "../../../../../components/route-modal"
+} from "../../../../../components/modals"
 import { useUpdateUser } from "../../../../../hooks/api/users"
 import { languages } from "../../../../../i18n/languages"
 
diff --git a/packages/admin-next/dashboard/src/routes/profile/profile-edit/profile-edit.tsx b/packages/admin-next/dashboard/src/routes/profile/profile-edit/profile-edit.tsx
index 1658f0a4ef..4bc89eb4e5 100644
--- a/packages/admin-next/dashboard/src/routes/profile/profile-edit/profile-edit.tsx
+++ b/packages/admin-next/dashboard/src/routes/profile/profile-edit/profile-edit.tsx
@@ -1,6 +1,6 @@
 import { Heading } from "@medusajs/ui"
 import { useTranslation } from "react-i18next"
-import { RouteDrawer } from "../../../components/route-modal"
+import { RouteDrawer } from "../../../components/modals"
 import { useMe } from "../../../hooks/api/users"
 import { EditProfileForm } from "./components/edit-profile-form/edit-profile-form"
 
diff --git a/packages/admin-next/dashboard/src/routes/promotions/common/edit-rules/components/edit-rules-form/edit-rules-form.tsx b/packages/admin-next/dashboard/src/routes/promotions/common/edit-rules/components/edit-rules-form/edit-rules-form.tsx
index e10bf1a2d3..9c97b08514 100644
--- a/packages/admin-next/dashboard/src/routes/promotions/common/edit-rules/components/edit-rules-form/edit-rules-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/promotions/common/edit-rules/components/edit-rules-form/edit-rules-form.tsx
@@ -4,7 +4,7 @@ import { Button } from "@medusajs/ui"
 import { useState } from "react"
 import { useForm } from "react-hook-form"
 import { useTranslation } from "react-i18next"
-import { RouteDrawer } from "../../../../../../components/route-modal"
+import { RouteDrawer } from "../../../../../../components/modals"
 import { RuleTypeValues } from "../../edit-rules"
 import { RulesFormField } from "../rules-form-field"
 import { EditRules, EditRulesType } from "./form-schema"
diff --git a/packages/admin-next/dashboard/src/routes/promotions/common/edit-rules/components/edit-rules-wrapper/edit-rules-wrapper.tsx b/packages/admin-next/dashboard/src/routes/promotions/common/edit-rules/components/edit-rules-wrapper/edit-rules-wrapper.tsx
index 76c4c4c7fa..0e2328a7d0 100644
--- a/packages/admin-next/dashboard/src/routes/promotions/common/edit-rules/components/edit-rules-wrapper/edit-rules-wrapper.tsx
+++ b/packages/admin-next/dashboard/src/routes/promotions/common/edit-rules/components/edit-rules-wrapper/edit-rules-wrapper.tsx
@@ -5,7 +5,7 @@ import {
   PromotionRuleOperatorValues,
   PromotionRuleResponse,
 } from "@medusajs/types"
-import { useRouteModal } from "../../../../../../components/route-modal"
+import { useRouteModal } from "../../../../../../components/modals"
 import {
   usePromotionAddRules,
   usePromotionRemoveRules,
diff --git a/packages/admin-next/dashboard/src/routes/promotions/common/edit-rules/edit-rules.tsx b/packages/admin-next/dashboard/src/routes/promotions/common/edit-rules/edit-rules.tsx
index 437d571592..31afa9684b 100644
--- a/packages/admin-next/dashboard/src/routes/promotions/common/edit-rules/edit-rules.tsx
+++ b/packages/admin-next/dashboard/src/routes/promotions/common/edit-rules/edit-rules.tsx
@@ -2,7 +2,7 @@ import { PromotionRuleDTO } from "@medusajs/types"
 import { Heading } from "@medusajs/ui"
 import { useTranslation } from "react-i18next"
 import { useParams } from "react-router-dom"
-import { RouteDrawer } from "../../../../components/route-modal"
+import { RouteDrawer } from "../../../../components/modals"
 import { usePromotion } from "../../../../hooks/api/promotions"
 import { EditRulesWrapper } from "./components/edit-rules-wrapper"
 
diff --git a/packages/admin-next/dashboard/src/routes/promotions/promotion-add-campaign/components/add-campaign-promotion-form/add-campaign-promotion-form.tsx b/packages/admin-next/dashboard/src/routes/promotions/promotion-add-campaign/components/add-campaign-promotion-form/add-campaign-promotion-form.tsx
index 4e34106c89..b4bcc5e119 100644
--- a/packages/admin-next/dashboard/src/routes/promotions/promotion-add-campaign/components/add-campaign-promotion-form/add-campaign-promotion-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/promotions/promotion-add-campaign/components/add-campaign-promotion-form/add-campaign-promotion-form.tsx
@@ -9,7 +9,7 @@ import { Form } from "../../../../../components/common/form"
 import {
   RouteDrawer,
   useRouteModal,
-} from "../../../../../components/route-modal"
+} from "../../../../../components/modals"
 import { useUpdatePromotion } from "../../../../../hooks/api/promotions"
 import { CreateCampaignFormFields } from "../../../../campaigns/common/components/create-campaign-form-fields"
 import { CampaignDetails } from "./campaign-details"
diff --git a/packages/admin-next/dashboard/src/routes/promotions/promotion-add-campaign/promotion-add-campaign.tsx b/packages/admin-next/dashboard/src/routes/promotions/promotion-add-campaign/promotion-add-campaign.tsx
index 6b352dc0c3..f66549b3c1 100644
--- a/packages/admin-next/dashboard/src/routes/promotions/promotion-add-campaign/promotion-add-campaign.tsx
+++ b/packages/admin-next/dashboard/src/routes/promotions/promotion-add-campaign/promotion-add-campaign.tsx
@@ -2,7 +2,7 @@ import { Heading } from "@medusajs/ui"
 import { useTranslation } from "react-i18next"
 import { useParams } from "react-router-dom"
 
-import { RouteDrawer } from "../../../components/route-modal"
+import { RouteDrawer } from "../../../components/modals"
 import { useCampaigns } from "../../../hooks/api/campaigns"
 import { usePromotion } from "../../../hooks/api/promotions"
 import { AddCampaignPromotionForm } from "./components/add-campaign-promotion-form"
diff --git a/packages/admin-next/dashboard/src/routes/promotions/promotion-create/components/create-promotion-form/create-promotion-form.tsx b/packages/admin-next/dashboard/src/routes/promotions/promotion-create/components/create-promotion-form/create-promotion-form.tsx
index dc52c6ed72..1b3958387f 100644
--- a/packages/admin-next/dashboard/src/routes/promotions/promotion-create/components/create-promotion-form/create-promotion-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/promotions/promotion-create/components/create-promotion-form/create-promotion-form.tsx
@@ -29,7 +29,7 @@ import { PercentageInput } from "../../../../../components/inputs/percentage-inp
 import {
   RouteFocusModal,
   useRouteModal,
-} from "../../../../../components/route-modal"
+} from "../../../../../components/modals"
 import { useCampaigns } from "../../../../../hooks/api/campaigns"
 import { useCreatePromotion } from "../../../../../hooks/api/promotions"
 import { getCurrencySymbol } from "../../../../../lib/currencies"
diff --git a/packages/admin-next/dashboard/src/routes/promotions/promotion-create/promotion-create.tsx b/packages/admin-next/dashboard/src/routes/promotions/promotion-create/promotion-create.tsx
index 4ee373f631..011f7909aa 100644
--- a/packages/admin-next/dashboard/src/routes/promotions/promotion-create/promotion-create.tsx
+++ b/packages/admin-next/dashboard/src/routes/promotions/promotion-create/promotion-create.tsx
@@ -1,4 +1,4 @@
-import { RouteFocusModal } from "../../../components/route-modal"
+import { RouteFocusModal } from "../../../components/modals"
 import { CreatePromotionForm } from "./components/create-promotion-form/create-promotion-form"
 
 export const PromotionCreate = () => {
diff --git a/packages/admin-next/dashboard/src/routes/promotions/promotion-edit-details/components/edit-promotion-form/edit-promotion-details-form.tsx b/packages/admin-next/dashboard/src/routes/promotions/promotion-edit-details/components/edit-promotion-form/edit-promotion-details-form.tsx
index c5f6bb3a80..8ecd8aa803 100644
--- a/packages/admin-next/dashboard/src/routes/promotions/promotion-edit-details/components/edit-promotion-form/edit-promotion-details-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/promotions/promotion-edit-details/components/edit-promotion-form/edit-promotion-details-form.tsx
@@ -17,7 +17,7 @@ import { PercentageInput } from "../../../../../components/inputs/percentage-inp
 import {
   RouteDrawer,
   useRouteModal,
-} from "../../../../../components/route-modal"
+} from "../../../../../components/modals"
 import { useUpdatePromotion } from "../../../../../hooks/api/promotions"
 import { getCurrencySymbol } from "../../../../../lib/currencies"
 
diff --git a/packages/admin-next/dashboard/src/routes/promotions/promotion-edit-details/promotion-edit-details.tsx b/packages/admin-next/dashboard/src/routes/promotions/promotion-edit-details/promotion-edit-details.tsx
index 5734de5895..94c2177a89 100644
--- a/packages/admin-next/dashboard/src/routes/promotions/promotion-edit-details/promotion-edit-details.tsx
+++ b/packages/admin-next/dashboard/src/routes/promotions/promotion-edit-details/promotion-edit-details.tsx
@@ -2,7 +2,7 @@ import { Heading } from "@medusajs/ui"
 import { useTranslation } from "react-i18next"
 import { useParams } from "react-router-dom"
 
-import { RouteDrawer } from "../../../components/route-modal"
+import { RouteDrawer } from "../../../components/modals"
 import { usePromotion } from "../../../hooks/api/promotions"
 import { EditPromotionDetailsForm } from "./components/edit-promotion-form"
 
diff --git a/packages/admin-next/dashboard/src/routes/regions/region-add-countries/components/add-countries-form/add-countries-form.tsx b/packages/admin-next/dashboard/src/routes/regions/region-add-countries/components/add-countries-form/add-countries-form.tsx
index f32ef82e2d..8f90a81214 100644
--- a/packages/admin-next/dashboard/src/routes/regions/region-add-countries/components/add-countries-form/add-countries-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/regions/region-add-countries/components/add-countries-form/add-countries-form.tsx
@@ -9,19 +9,19 @@ import { useForm } from "react-hook-form"
 import { useTranslation } from "react-i18next"
 import * as zod from "zod"
 
+import { HttpTypes } from "@medusajs/types"
 import { Button, Checkbox, toast } from "@medusajs/ui"
 import {
   RouteFocusModal,
   useRouteModal,
-} from "../../../../../components/route-modal"
+} from "../../../../../components/modals"
 import { DataTable } from "../../../../../components/table/data-table"
+import { useUpdateRegion } from "../../../../../hooks/api/regions"
 import { useDataTable } from "../../../../../hooks/use-data-table"
 import { countries as staticCountries } from "../../../../../lib/countries"
 import { useCountries } from "../../../common/hooks/use-countries"
 import { useCountryTableColumns } from "../../../common/hooks/use-country-table-columns"
 import { useCountryTableQuery } from "../../../common/hooks/use-country-table-query"
-import { useUpdateRegion } from "../../../../../hooks/api/regions"
-import { HttpTypes } from "@medusajs/types"
 
 type AddCountriesFormProps = {
   region: HttpTypes.AdminRegion
diff --git a/packages/admin-next/dashboard/src/routes/regions/region-add-countries/region-add-countries.tsx b/packages/admin-next/dashboard/src/routes/regions/region-add-countries/region-add-countries.tsx
index caa5303d2b..4f56b88d0a 100644
--- a/packages/admin-next/dashboard/src/routes/regions/region-add-countries/region-add-countries.tsx
+++ b/packages/admin-next/dashboard/src/routes/regions/region-add-countries/region-add-countries.tsx
@@ -1,7 +1,7 @@
 import { useParams } from "react-router-dom"
-import { RouteFocusModal } from "../../../components/route-modal"
-import { AddCountriesForm } from "./components/add-countries-form"
+import { RouteFocusModal } from "../../../components/modals"
 import { useRegion } from "../../../hooks/api/regions"
+import { AddCountriesForm } from "./components/add-countries-form"
 
 export const RegionAddCountries = () => {
   const { id } = useParams()
diff --git a/packages/admin-next/dashboard/src/routes/regions/region-create/components/create-region-form/create-region-form.tsx b/packages/admin-next/dashboard/src/routes/regions/region-create/components/create-region-form/create-region-form.tsx
index 232c3d2d67..6312fd41a8 100644
--- a/packages/admin-next/dashboard/src/routes/regions/region-create/components/create-region-form/create-region-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/regions/region-create/components/create-region-form/create-region-form.tsx
@@ -25,7 +25,7 @@ import { SplitView } from "../../../../../components/layout/split-view"
 import {
   RouteFocusModal,
   useRouteModal,
-} from "../../../../../components/route-modal"
+} from "../../../../../components/modals"
 import { DataTable } from "../../../../../components/table/data-table"
 import { useCreateRegion } from "../../../../../hooks/api/regions"
 import { useDataTable } from "../../../../../hooks/use-data-table"
diff --git a/packages/admin-next/dashboard/src/routes/regions/region-create/region-create.tsx b/packages/admin-next/dashboard/src/routes/regions/region-create/region-create.tsx
index ee3c38f686..551f9ca500 100644
--- a/packages/admin-next/dashboard/src/routes/regions/region-create/region-create.tsx
+++ b/packages/admin-next/dashboard/src/routes/regions/region-create/region-create.tsx
@@ -1,8 +1,8 @@
-import { RouteFocusModal } from "../../../components/route-modal/route-focus-modal"
-import { CreateRegionForm } from "./components/create-region-form"
-import { currencies } from "../../../lib/currencies"
+import { RouteFocusModal } from "../../../components/modals/route-focus-modal"
 import { usePaymentProviders } from "../../../hooks/api/payments"
 import { useStore } from "../../../hooks/api/store"
+import { currencies } from "../../../lib/currencies"
+import { CreateRegionForm } from "./components/create-region-form"
 
 export const RegionCreate = () => {
   const { store, isPending: isLoading, isError, error } = useStore()
diff --git a/packages/admin-next/dashboard/src/routes/regions/region-edit/components/edit-region-form/edit-region-form.tsx b/packages/admin-next/dashboard/src/routes/regions/region-edit/components/edit-region-form/edit-region-form.tsx
index 16ec6dddb5..7fc950afe8 100644
--- a/packages/admin-next/dashboard/src/routes/regions/region-edit/components/edit-region-form/edit-region-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/regions/region-edit/components/edit-region-form/edit-region-form.tsx
@@ -9,7 +9,7 @@ import { Combobox } from "../../../../../components/inputs/combobox/index.ts"
 import {
   RouteDrawer,
   useRouteModal,
-} from "../../../../../components/route-modal/index.ts"
+} from "../../../../../components/modals/index.ts"
 import { useUpdateRegion } from "../../../../../hooks/api/regions.tsx"
 import { CurrencyInfo } from "../../../../../lib/currencies.ts"
 import { formatProvider } from "../../../../../lib/format-provider.ts"
diff --git a/packages/admin-next/dashboard/src/routes/regions/region-edit/region-edit.tsx b/packages/admin-next/dashboard/src/routes/regions/region-edit/region-edit.tsx
index 3d233818ed..23547a7cec 100644
--- a/packages/admin-next/dashboard/src/routes/regions/region-edit/region-edit.tsx
+++ b/packages/admin-next/dashboard/src/routes/regions/region-edit/region-edit.tsx
@@ -2,12 +2,12 @@ import { Heading } from "@medusajs/ui"
 import { useTranslation } from "react-i18next"
 import { useParams } from "react-router-dom"
 
-import { RouteDrawer } from "../../../components/route-modal"
-import { EditRegionForm } from "./components/edit-region-form"
-import { currencies } from "../../../lib/currencies"
-import { useRegion } from "../../../hooks/api/regions"
+import { RouteDrawer } from "../../../components/modals"
 import { usePaymentProviders } from "../../../hooks/api/payments"
+import { useRegion } from "../../../hooks/api/regions"
 import { useStore } from "../../../hooks/api/store"
+import { currencies } from "../../../lib/currencies"
+import { EditRegionForm } from "./components/edit-region-form"
 
 export const RegionEdit = () => {
   const { t } = useTranslation()
diff --git a/packages/admin-next/dashboard/src/routes/reservations/reservation-detail/components/edit-reservation/components/edit-reservation-form.tsx b/packages/admin-next/dashboard/src/routes/reservations/reservation-detail/components/edit-reservation/components/edit-reservation-form.tsx
index a71be9bf15..ce9ba0bc12 100644
--- a/packages/admin-next/dashboard/src/routes/reservations/reservation-detail/components/edit-reservation/components/edit-reservation-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/reservations/reservation-detail/components/edit-reservation/components/edit-reservation-form.tsx
@@ -1,19 +1,19 @@
 import * as zod from "zod"
 
-import { Button, Input, Select, Text, Textarea, toast } from "@medusajs/ui"
 import { InventoryTypes, StockLocationDTO } from "@medusajs/types"
+import { Button, Input, Select, Text, Textarea, toast } from "@medusajs/ui"
 import {
   RouteDrawer,
   useRouteModal,
-} from "../../../../../../components/route-modal"
+} from "../../../../../../components/modals"
 
-import { Form } from "../../../../../../components/common/form"
-import { InventoryItemRes } from "../../../../../../types/api-responses"
+import { zodResolver } from "@hookform/resolvers/zod"
 import { useForm } from "react-hook-form"
 import { useTranslation } from "react-i18next"
-import { useUpdateReservationItem } from "../../../../../../hooks/api/reservations"
 import { z } from "zod"
-import { zodResolver } from "@hookform/resolvers/zod"
+import { Form } from "../../../../../../components/common/form"
+import { useUpdateReservationItem } from "../../../../../../hooks/api/reservations"
+import { InventoryItemRes } from "../../../../../../types/api-responses"
 
 type EditReservationFormProps = {
   reservation: InventoryTypes.ReservationItemDTO
diff --git a/packages/admin-next/dashboard/src/routes/reservations/reservation-detail/components/edit-reservation/edit-reservation-modal.tsx b/packages/admin-next/dashboard/src/routes/reservations/reservation-detail/components/edit-reservation/edit-reservation-modal.tsx
index e3feb44e17..213fd8d166 100644
--- a/packages/admin-next/dashboard/src/routes/reservations/reservation-detail/components/edit-reservation/edit-reservation-modal.tsx
+++ b/packages/admin-next/dashboard/src/routes/reservations/reservation-detail/components/edit-reservation/edit-reservation-modal.tsx
@@ -1,12 +1,12 @@
-import { EditReservationForm } from "./components/edit-reservation-form"
-import { Heading } from "@medusajs/ui"
 import { InventoryTypes } from "@medusajs/types"
-import { RouteDrawer } from "../../../../../components/route-modal"
-import { useInventoryItem } from "../../../../../hooks/api/inventory"
+import { Heading } from "@medusajs/ui"
+import { useTranslation } from "react-i18next"
 import { useParams } from "react-router-dom"
+import { RouteDrawer } from "../../../../../components/modals"
+import { useInventoryItem } from "../../../../../hooks/api/inventory"
 import { useReservationItem } from "../../../../../hooks/api/reservations"
 import { useStockLocations } from "../../../../../hooks/api/stock-locations"
-import { useTranslation } from "react-i18next"
+import { EditReservationForm } from "./components/edit-reservation-form"
 
 export const ReservationEdit = () => {
   const { id } = useParams()
diff --git a/packages/admin-next/dashboard/src/routes/reservations/reservation-list/create-reservation/components/create-reservation-form/create-reservation-form.tsx b/packages/admin-next/dashboard/src/routes/reservations/reservation-list/create-reservation/components/create-reservation-form/create-reservation-form.tsx
index b749d46256..fd5fd902e0 100644
--- a/packages/admin-next/dashboard/src/routes/reservations/reservation-list/create-reservation/components/create-reservation-form/create-reservation-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/reservations/reservation-list/create-reservation/components/create-reservation-form/create-reservation-form.tsx
@@ -4,7 +4,7 @@ import { Button, Heading, Input, Text, Textarea, toast } from "@medusajs/ui"
 import {
   RouteFocusModal,
   useRouteModal,
-} from "../../../../../../components/route-modal"
+} from "../../../../../../components/modals"
 
 import { zodResolver } from "@hookform/resolvers/zod"
 import { InventoryTypes } from "@medusajs/types"
diff --git a/packages/admin-next/dashboard/src/routes/reservations/reservation-list/create-reservation/create-reservation-modal.tsx b/packages/admin-next/dashboard/src/routes/reservations/reservation-list/create-reservation/create-reservation-modal.tsx
index e6fd6850c1..05178bdb14 100644
--- a/packages/admin-next/dashboard/src/routes/reservations/reservation-list/create-reservation/create-reservation-modal.tsx
+++ b/packages/admin-next/dashboard/src/routes/reservations/reservation-list/create-reservation/create-reservation-modal.tsx
@@ -1,6 +1,6 @@
-import { CreateReservationForm } from "./components/create-reservation-form"
-import { RouteFocusModal } from "../../../../components/route-modal"
 import { useSearchParams } from "react-router-dom"
+import { RouteFocusModal } from "../../../../components/modals"
+import { CreateReservationForm } from "./components/create-reservation-form"
 
 export const CreateReservationModal = () => {
   const [params] = useSearchParams()
diff --git a/packages/admin-next/dashboard/src/routes/sales-channels/sales-channel-add-products/components/add-products-to-sales-channel-form.tsx b/packages/admin-next/dashboard/src/routes/sales-channels/sales-channel-add-products/components/add-products-to-sales-channel-form.tsx
index 7221d57d17..b18aee56b9 100644
--- a/packages/admin-next/dashboard/src/routes/sales-channels/sales-channel-add-products/components/add-products-to-sales-channel-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/sales-channels/sales-channel-add-products/components/add-products-to-sales-channel-form.tsx
@@ -1,11 +1,11 @@
 import { zodResolver } from "@hookform/resolvers/zod"
-import { SalesChannelDTO } from "@medusajs/types"
+import { HttpTypes, SalesChannelDTO } from "@medusajs/types"
 import { Button, Checkbox, Hint, toast, Tooltip } from "@medusajs/ui"
 import { keepPreviousData } from "@tanstack/react-query"
 import {
+  createColumnHelper,
   OnChangeFn,
   RowSelectionState,
-  createColumnHelper,
 } from "@tanstack/react-table"
 import { useMemo, useState } from "react"
 import { useForm } from "react-hook-form"
@@ -14,7 +14,7 @@ import * as zod from "zod"
 import {
   RouteFocusModal,
   useRouteModal,
-} from "../../../../components/route-modal"
+} from "../../../../components/modals"
 import { DataTable } from "../../../../components/table/data-table"
 import { useProducts } from "../../../../hooks/api/products"
 import { useSalesChannelAddProducts } from "../../../../hooks/api/sales-channels"
@@ -22,7 +22,6 @@ import { useProductTableColumns } from "../../../../hooks/table/columns/use-prod
 import { useProductTableFilters } from "../../../../hooks/table/filters/use-product-table-filters"
 import { useProductTableQuery } from "../../../../hooks/table/query/use-product-table-query"
 import { useDataTable } from "../../../../hooks/use-data-table"
-import { HttpTypes } from "@medusajs/types"
 
 type AddProductsToSalesChannelFormProps = {
   salesChannel: SalesChannelDTO
diff --git a/packages/admin-next/dashboard/src/routes/sales-channels/sales-channel-add-products/sales-channel-add-products.tsx b/packages/admin-next/dashboard/src/routes/sales-channels/sales-channel-add-products/sales-channel-add-products.tsx
index 1e88d02780..50e4b17d68 100644
--- a/packages/admin-next/dashboard/src/routes/sales-channels/sales-channel-add-products/sales-channel-add-products.tsx
+++ b/packages/admin-next/dashboard/src/routes/sales-channels/sales-channel-add-products/sales-channel-add-products.tsx
@@ -1,5 +1,5 @@
 import { useParams } from "react-router-dom"
-import { RouteFocusModal } from "../../../components/route-modal"
+import { RouteFocusModal } from "../../../components/modals"
 import { useSalesChannel } from "../../../hooks/api/sales-channels"
 import { AddProductsToSalesChannelForm } from "./components"
 
diff --git a/packages/admin-next/dashboard/src/routes/sales-channels/sales-channel-create/components/create-sales-channel-form/create-sales-channel-form.tsx b/packages/admin-next/dashboard/src/routes/sales-channels/sales-channel-create/components/create-sales-channel-form/create-sales-channel-form.tsx
index e93fb1d305..e45836d0d3 100644
--- a/packages/admin-next/dashboard/src/routes/sales-channels/sales-channel-create/components/create-sales-channel-form/create-sales-channel-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/sales-channels/sales-channel-create/components/create-sales-channel-form/create-sales-channel-form.tsx
@@ -16,7 +16,7 @@ import { Form } from "../../../../../components/common/form"
 import {
   RouteFocusModal,
   useRouteModal,
-} from "../../../../../components/route-modal"
+} from "../../../../../components/modals"
 import { useCreateSalesChannel } from "../../../../../hooks/api/sales-channels"
 
 const CreateSalesChannelSchema = zod.object({
diff --git a/packages/admin-next/dashboard/src/routes/sales-channels/sales-channel-create/sales-channel-create.tsx b/packages/admin-next/dashboard/src/routes/sales-channels/sales-channel-create/sales-channel-create.tsx
index d4abcb0126..0b25fe4fe8 100644
--- a/packages/admin-next/dashboard/src/routes/sales-channels/sales-channel-create/sales-channel-create.tsx
+++ b/packages/admin-next/dashboard/src/routes/sales-channels/sales-channel-create/sales-channel-create.tsx
@@ -1,4 +1,4 @@
-import { RouteFocusModal } from "../../../components/route-modal"
+import { RouteFocusModal } from "../../../components/modals"
 import { CreateSalesChannelForm } from "./components/create-sales-channel-form"
 
 export const SalesChannelCreate = () => {
diff --git a/packages/admin-next/dashboard/src/routes/sales-channels/sales-channel-edit/components/edit-sales-channel-form/edit-sales-channel-form.tsx b/packages/admin-next/dashboard/src/routes/sales-channels/sales-channel-edit/components/edit-sales-channel-form/edit-sales-channel-form.tsx
index ee450f3eac..adf6c5ce63 100644
--- a/packages/admin-next/dashboard/src/routes/sales-channels/sales-channel-edit/components/edit-sales-channel-form/edit-sales-channel-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/sales-channels/sales-channel-edit/components/edit-sales-channel-form/edit-sales-channel-form.tsx
@@ -9,7 +9,7 @@ import { Form } from "../../../../../components/common/form"
 import {
   RouteDrawer,
   useRouteModal,
-} from "../../../../../components/route-modal"
+} from "../../../../../components/modals"
 import { useUpdateSalesChannel } from "../../../../../hooks/api/sales-channels"
 
 type EditSalesChannelFormProps = {
diff --git a/packages/admin-next/dashboard/src/routes/sales-channels/sales-channel-edit/sales-channel-edit.tsx b/packages/admin-next/dashboard/src/routes/sales-channels/sales-channel-edit/sales-channel-edit.tsx
index 36641ea6da..38dd6e29a6 100644
--- a/packages/admin-next/dashboard/src/routes/sales-channels/sales-channel-edit/sales-channel-edit.tsx
+++ b/packages/admin-next/dashboard/src/routes/sales-channels/sales-channel-edit/sales-channel-edit.tsx
@@ -2,7 +2,7 @@ import { Heading } from "@medusajs/ui"
 import { useTranslation } from "react-i18next"
 import { useParams } from "react-router-dom"
 
-import { RouteDrawer } from "../../../components/route-modal"
+import { RouteDrawer } from "../../../components/modals"
 import { useSalesChannel } from "../../../hooks/api/sales-channels"
 import { EditSalesChannelForm } from "./components/edit-sales-channel-form"
 
diff --git a/packages/admin-next/dashboard/src/routes/shipping-profiles/shipping-profile-create/components/create-shipping-profile-form/create-shipping-profile-form.tsx b/packages/admin-next/dashboard/src/routes/shipping-profiles/shipping-profile-create/components/create-shipping-profile-form/create-shipping-profile-form.tsx
index 336f1683d4..eaa0e7796c 100644
--- a/packages/admin-next/dashboard/src/routes/shipping-profiles/shipping-profile-create/components/create-shipping-profile-form/create-shipping-profile-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/shipping-profiles/shipping-profile-create/components/create-shipping-profile-form/create-shipping-profile-form.tsx
@@ -8,7 +8,7 @@ import { Form } from "../../../../../components/common/form"
 import {
   RouteFocusModal,
   useRouteModal,
-} from "../../../../../components/route-modal"
+} from "../../../../../components/modals"
 import { useCreateShippingProfile } from "../../../../../hooks/api/shipping-profiles"
 
 const CreateShippingOptionsSchema = zod.object({
diff --git a/packages/admin-next/dashboard/src/routes/shipping-profiles/shipping-profile-create/shipping-profile-create.tsx b/packages/admin-next/dashboard/src/routes/shipping-profiles/shipping-profile-create/shipping-profile-create.tsx
index 9b214de52f..775c5ea240 100644
--- a/packages/admin-next/dashboard/src/routes/shipping-profiles/shipping-profile-create/shipping-profile-create.tsx
+++ b/packages/admin-next/dashboard/src/routes/shipping-profiles/shipping-profile-create/shipping-profile-create.tsx
@@ -1,6 +1,5 @@
-import React from "react"
 
-import { RouteFocusModal } from "../../../components/route-modal"
+import { RouteFocusModal } from "../../../components/modals"
 import { CreateShippingProfileForm } from "./components/create-shipping-profile-form"
 
 export function ShippingProfileCreate() {
diff --git a/packages/admin-next/dashboard/src/routes/store/store-add-currencies/components/add-currencies-form/add-currencies-form.tsx b/packages/admin-next/dashboard/src/routes/store/store-add-currencies/components/add-currencies-form/add-currencies-form.tsx
index 41f3a35276..67f452e2d4 100644
--- a/packages/admin-next/dashboard/src/routes/store/store-add-currencies/components/add-currencies-form/add-currencies-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/store/store-add-currencies/components/add-currencies-form/add-currencies-form.tsx
@@ -1,9 +1,9 @@
 import { Currency } from "@medusajs/medusa"
 import { Button, Checkbox, Hint, toast, Tooltip } from "@medusajs/ui"
 import {
+  createColumnHelper,
   OnChangeFn,
   RowSelectionState,
-  createColumnHelper,
 } from "@tanstack/react-table"
 import { useMemo, useState } from "react"
 import { useTranslation } from "react-i18next"
@@ -16,7 +16,7 @@ import { useForm } from "react-hook-form"
 import {
   RouteFocusModal,
   useRouteModal,
-} from "../../../../../components/route-modal"
+} from "../../../../../components/modals"
 import { DataTable } from "../../../../../components/table/data-table"
 import { useCurrencies } from "../../../../../hooks/api/currencies"
 import { useUpdateStore } from "../../../../../hooks/api/store"
diff --git a/packages/admin-next/dashboard/src/routes/store/store-add-currencies/store-add-currencies.tsx b/packages/admin-next/dashboard/src/routes/store/store-add-currencies/store-add-currencies.tsx
index 63677fa164..9944bc935a 100644
--- a/packages/admin-next/dashboard/src/routes/store/store-add-currencies/store-add-currencies.tsx
+++ b/packages/admin-next/dashboard/src/routes/store/store-add-currencies/store-add-currencies.tsx
@@ -1,4 +1,4 @@
-import { RouteFocusModal } from "../../../components/route-modal"
+import { RouteFocusModal } from "../../../components/modals"
 import { useStore } from "../../../hooks/api/store"
 import { AddCurrenciesForm } from "./components/add-currencies-form/add-currencies-form"
 
diff --git a/packages/admin-next/dashboard/src/routes/store/store-detail/components/store-currency-section/store-currencies-section.tsx/store-currency-section.tsx b/packages/admin-next/dashboard/src/routes/store/store-detail/components/store-currency-section/store-currencies-section.tsx/store-currency-section.tsx
index 5967952f65..2f1b3e3814 100644
--- a/packages/admin-next/dashboard/src/routes/store/store-detail/components/store-currency-section/store-currencies-section.tsx/store-currency-section.tsx
+++ b/packages/admin-next/dashboard/src/routes/store/store-detail/components/store-currency-section/store-currencies-section.tsx/store-currency-section.tsx
@@ -32,19 +32,14 @@ export const StoreCurrencySection = ({ store }: StoreCurrencySectionProps) => {
 
   const { searchParams, raw } = useCurrenciesTableQuery({ pageSize: PAGE_SIZE })
 
-  const {
-    currencies,
-    count,
-    isPending: isLoading,
-    isError,
-    error,
-  } = useCurrencies(
+  const { currencies, count, isPending, isError, error } = useCurrencies(
     {
       code: store.supported_currencies?.map((c) => c.currency_code),
       ...searchParams,
     },
     {
       placeholderData: keepPreviousData,
+      enabled: !!store.supported_currencies?.length,
     }
   )
 
@@ -140,8 +135,8 @@ export const StoreCurrencySection = ({ store }: StoreCurrencySectionProps) => {
         table={table}
         pageSize={PAGE_SIZE}
         columns={columns}
-        count={count}
-        isLoading={isLoading}
+        count={!store.supported_currencies?.length ? 0 : count}
+        isLoading={!store.supported_currencies?.length ? false : isPending}
         queryObject={raw}
       />
       <CommandBar open={!!Object.keys(rowSelection).length}>
diff --git a/packages/admin-next/dashboard/src/routes/store/store-detail/store-detail.tsx b/packages/admin-next/dashboard/src/routes/store/store-detail/store-detail.tsx
index 204713b35a..e398889bb9 100644
--- a/packages/admin-next/dashboard/src/routes/store/store-detail/store-detail.tsx
+++ b/packages/admin-next/dashboard/src/routes/store/store-detail/store-detail.tsx
@@ -17,7 +17,7 @@ export const StoreDetail = () => {
     isPending: isLoading,
     isError,
     error,
-  } = useStore({
+  } = useStore(undefined, {
     initialData,
   })
 
diff --git a/packages/admin-next/dashboard/src/routes/store/store-edit/components/edit-store-form/edit-store-form.tsx b/packages/admin-next/dashboard/src/routes/store/store-edit/components/edit-store-form/edit-store-form.tsx
index 59f9f09d4c..f3098507dd 100644
--- a/packages/admin-next/dashboard/src/routes/store/store-edit/components/edit-store-form/edit-store-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/store/store-edit/components/edit-store-form/edit-store-form.tsx
@@ -8,10 +8,10 @@ import { Form } from "../../../../../components/common/form"
 import {
   RouteDrawer,
   useRouteModal,
-} from "../../../../../components/route-modal"
+} from "../../../../../components/modals"
+import { useRegions } from "../../../../../hooks/api/regions"
 import { useUpdateStore } from "../../../../../hooks/api/store"
 import { ExtendedStoreDTO } from "../../../../../types/api-responses"
-import { useRegions } from "../../../../../hooks/api/regions"
 
 type EditStoreFormProps = {
   store: ExtendedStoreDTO
diff --git a/packages/admin-next/dashboard/src/routes/store/store-edit/store-edit.tsx b/packages/admin-next/dashboard/src/routes/store/store-edit/store-edit.tsx
index 380d27f7ec..e337fbfd10 100644
--- a/packages/admin-next/dashboard/src/routes/store/store-edit/store-edit.tsx
+++ b/packages/admin-next/dashboard/src/routes/store/store-edit/store-edit.tsx
@@ -1,6 +1,6 @@
 import { Heading } from "@medusajs/ui"
 import { useTranslation } from "react-i18next"
-import { RouteDrawer } from "../../../components/route-modal"
+import { RouteDrawer } from "../../../components/modals"
 import { useStore } from "../../../hooks/api/store"
 import { EditStoreForm } from "./components/edit-store-form/edit-store-form"
 
diff --git a/packages/admin-next/dashboard/src/routes/taxes/common/components/tax-region-create-form/tax-region-create-form.tsx b/packages/admin-next/dashboard/src/routes/taxes/common/components/tax-region-create-form/tax-region-create-form.tsx
index 0d2c16b06a..ba3b3434b1 100644
--- a/packages/admin-next/dashboard/src/routes/taxes/common/components/tax-region-create-form/tax-region-create-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/taxes/common/components/tax-region-create-form/tax-region-create-form.tsx
@@ -8,9 +8,9 @@ import { TaxRegionResponse } from "@medusajs/types"
 import { Form } from "../../../../../components/common/form"
 import { PercentageInput } from "../../../../../components/inputs/percentage-input"
 import {
-    RouteFocusModal,
-    useRouteModal,
-} from "../../../../../components/route-modal"
+  RouteFocusModal,
+  useRouteModal,
+} from "../../../../../components/modals"
 import { useCreateTaxRegion } from "../../../../../hooks/api/tax-regions"
 import { countries } from "../../../../../lib/countries"
 
diff --git a/packages/admin-next/dashboard/src/routes/taxes/tax-province-create/tax-province-create.tsx b/packages/admin-next/dashboard/src/routes/taxes/tax-province-create/tax-province-create.tsx
index 031809dda8..70dbe22abc 100644
--- a/packages/admin-next/dashboard/src/routes/taxes/tax-province-create/tax-province-create.tsx
+++ b/packages/admin-next/dashboard/src/routes/taxes/tax-province-create/tax-province-create.tsx
@@ -1,6 +1,6 @@
 import { useParams } from "react-router-dom"
 import * as zod from "zod"
-import { RouteFocusModal } from "../../../components/route-modal"
+import { RouteFocusModal } from "../../../components/modals"
 import { useTaxRegion } from "../../../hooks/api/tax-regions"
 import { TaxRegionCreateForm } from "../common/components/tax-region-create-form"
 
diff --git a/packages/admin-next/dashboard/src/routes/taxes/tax-rate-create/components/tax-rate-create-form/tax-rate-create-form.tsx b/packages/admin-next/dashboard/src/routes/taxes/tax-rate-create/components/tax-rate-create-form/tax-rate-create-form.tsx
index ae5ab62592..c0342705c0 100644
--- a/packages/admin-next/dashboard/src/routes/taxes/tax-rate-create/components/tax-rate-create-form/tax-rate-create-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/taxes/tax-rate-create/components/tax-rate-create-form/tax-rate-create-form.tsx
@@ -22,7 +22,7 @@ import { SplitView } from "../../../../../components/layout/split-view"
 import {
   RouteFocusModal,
   useRouteModal,
-} from "../../../../../components/route-modal"
+} from "../../../../../components/modals"
 import { useCreateTaxRate } from "../../../../../hooks/api/tax-rates"
 import { useTaxRegions } from "../../../../../hooks/api/tax-regions"
 import { ConditionsDrawer } from "../../../common/components/conditions-drawer"
diff --git a/packages/admin-next/dashboard/src/routes/taxes/tax-rate-create/tax-rate-create.tsx b/packages/admin-next/dashboard/src/routes/taxes/tax-rate-create/tax-rate-create.tsx
index 37d03e5206..807584d506 100644
--- a/packages/admin-next/dashboard/src/routes/taxes/tax-rate-create/tax-rate-create.tsx
+++ b/packages/admin-next/dashboard/src/routes/taxes/tax-rate-create/tax-rate-create.tsx
@@ -1,5 +1,5 @@
 import { useParams } from "react-router-dom"
-import { RouteFocusModal } from "../../../components/route-modal"
+import { RouteFocusModal } from "../../../components/modals"
 import { useTaxRegion } from "../../../hooks/api/tax-regions"
 import { TaxRateCreateForm } from "./components"
 
diff --git a/packages/admin-next/dashboard/src/routes/taxes/tax-rate-edit/components/tax-rate-edit-form/tax-rate-edit-form.tsx b/packages/admin-next/dashboard/src/routes/taxes/tax-rate-edit/components/tax-rate-edit-form/tax-rate-edit-form.tsx
index 93a9406b70..df2ab897f7 100644
--- a/packages/admin-next/dashboard/src/routes/taxes/tax-rate-edit/components/tax-rate-edit-form/tax-rate-edit-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/taxes/tax-rate-edit/components/tax-rate-edit-form/tax-rate-edit-form.tsx
@@ -1,12 +1,12 @@
 import { zodResolver } from "@hookform/resolvers/zod"
 import {
-    Button,
-    clx,
-    DropdownMenu,
-    Heading,
-    Input,
-    Switch,
-    Text,
+  Button,
+  clx,
+  DropdownMenu,
+  Heading,
+  Input,
+  Switch,
+  Text,
 } from "@medusajs/ui"
 import { useForm, useWatch } from "react-hook-form"
 import { useTranslation } from "react-i18next"
@@ -19,9 +19,9 @@ import { Form } from "../../../../../components/common/form"
 import { PercentageInput } from "../../../../../components/inputs/percentage-input"
 import { SplitView } from "../../../../../components/layout/split-view"
 import {
-    RouteFocusModal,
-    useRouteModal,
-} from "../../../../../components/route-modal"
+  RouteFocusModal,
+  useRouteModal,
+} from "../../../../../components/modals"
 import { useUpdateTaxRate } from "../../../../../hooks/api/tax-rates"
 import { ConditionsDrawer } from "../../../common/components/conditions-drawer"
 import { ConditionEntities, Operators } from "../../../common/constants"
diff --git a/packages/admin-next/dashboard/src/routes/taxes/tax-rate-edit/tax-rate-edit.tsx b/packages/admin-next/dashboard/src/routes/taxes/tax-rate-edit/tax-rate-edit.tsx
index a6196b38af..92f9a52554 100644
--- a/packages/admin-next/dashboard/src/routes/taxes/tax-rate-edit/tax-rate-edit.tsx
+++ b/packages/admin-next/dashboard/src/routes/taxes/tax-rate-edit/tax-rate-edit.tsx
@@ -1,5 +1,5 @@
 import { useParams } from "react-router-dom"
-import { RouteFocusModal } from "../../../components/route-modal"
+import { RouteFocusModal } from "../../../components/modals"
 import { useTaxRate } from "../../../hooks/api/tax-rates"
 import { useTaxRegion } from "../../../hooks/api/tax-regions"
 import { TaxRateEditForm } from "./components"
diff --git a/packages/admin-next/dashboard/src/routes/taxes/tax-region-create/tax-region-create.tsx b/packages/admin-next/dashboard/src/routes/taxes/tax-region-create/tax-region-create.tsx
index ae6a4115f6..9809f89d4e 100644
--- a/packages/admin-next/dashboard/src/routes/taxes/tax-region-create/tax-region-create.tsx
+++ b/packages/admin-next/dashboard/src/routes/taxes/tax-region-create/tax-region-create.tsx
@@ -1,5 +1,5 @@
 import * as zod from "zod"
-import { RouteFocusModal } from "../../../components/route-modal"
+import { RouteFocusModal } from "../../../components/modals"
 import { TaxRegionCreateForm } from "../common/components/tax-region-create-form"
 
 const CreateTaxRegionForm = zod.object({
diff --git a/packages/admin-next/dashboard/src/routes/users/user-edit/components/edit-user-form/edit-user-form.tsx b/packages/admin-next/dashboard/src/routes/users/user-edit/components/edit-user-form/edit-user-form.tsx
index f0c0cad5ec..f9678aa98e 100644
--- a/packages/admin-next/dashboard/src/routes/users/user-edit/components/edit-user-form/edit-user-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/users/user-edit/components/edit-user-form/edit-user-form.tsx
@@ -9,7 +9,7 @@ import { Form } from "../../../../../components/common/form"
 import {
   RouteDrawer,
   useRouteModal,
-} from "../../../../../components/route-modal"
+} from "../../../../../components/modals"
 import { useUpdateUser } from "../../../../../hooks/api/users"
 
 type EditUserFormProps = {
diff --git a/packages/admin-next/dashboard/src/routes/users/user-edit/user-edit.tsx b/packages/admin-next/dashboard/src/routes/users/user-edit/user-edit.tsx
index efe740f611..f5fd2a2885 100644
--- a/packages/admin-next/dashboard/src/routes/users/user-edit/user-edit.tsx
+++ b/packages/admin-next/dashboard/src/routes/users/user-edit/user-edit.tsx
@@ -1,7 +1,7 @@
 import { Heading } from "@medusajs/ui"
 import { useTranslation } from "react-i18next"
 import { useParams } from "react-router-dom"
-import { RouteDrawer } from "../../../components/route-modal"
+import { RouteDrawer } from "../../../components/modals"
 import { useUser } from "../../../hooks/api/users"
 import { EditUserForm } from "./components/edit-user-form"
 
diff --git a/packages/admin-next/dashboard/src/routes/users/user-invite/components/invite-user-form/invite-user-form.tsx b/packages/admin-next/dashboard/src/routes/users/user-invite/components/invite-user-form/invite-user-form.tsx
index 7bd4cd6b89..f1875cd73e 100644
--- a/packages/admin-next/dashboard/src/routes/users/user-invite/components/invite-user-form/invite-user-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/users/user-invite/components/invite-user-form/invite-user-form.tsx
@@ -13,24 +13,24 @@ import {
   usePrompt,
 } from "@medusajs/ui"
 import { createColumnHelper } from "@tanstack/react-table"
+import copy from "copy-to-clipboard"
 import { format } from "date-fns"
 import { useMemo } from "react"
 import { useForm } from "react-hook-form"
 import { Trans, useTranslation } from "react-i18next"
 import * as zod from "zod"
 import { ActionMenu } from "../../../../../components/common/action-menu"
-import { useDataTable } from "../../../../../hooks/use-data-table"
 import { Form } from "../../../../../components/common/form"
-import { RouteFocusModal } from "../../../../../components/route-modal"
-import copy from "copy-to-clipboard"
+import { RouteFocusModal } from "../../../../../components/modals/index.ts"
+import { DataTable } from "../../../../../components/table/data-table"
 import {
   useCreateInvite,
   useDeleteInvite,
   useInvites,
   useResendInvite,
 } from "../../../../../hooks/api/invites"
-import { DataTable } from "../../../../../components/table/data-table"
 import { useUserInviteTableQuery } from "../../../../../hooks/table/query/use-user-invite-table-query"
+import { useDataTable } from "../../../../../hooks/use-data-table"
 import { backendUrl } from "../../../../../lib/client"
 import { isFetchError } from "../../../../../lib/is-fetch-error.ts"
 
diff --git a/packages/admin-next/dashboard/src/routes/users/user-invite/user-invite.tsx b/packages/admin-next/dashboard/src/routes/users/user-invite/user-invite.tsx
index 23432b8d22..ab545a4b53 100644
--- a/packages/admin-next/dashboard/src/routes/users/user-invite/user-invite.tsx
+++ b/packages/admin-next/dashboard/src/routes/users/user-invite/user-invite.tsx
@@ -1,4 +1,4 @@
-import { RouteFocusModal } from "../../../components/route-modal"
+import { RouteFocusModal } from "../../../components/modals"
 import { InviteUserForm } from "./components/invite-user-form/invite-user-form"
 
 export const UserInvite = () => {
diff --git a/packages/core/js-sdk/src/admin/index.ts b/packages/core/js-sdk/src/admin/index.ts
index ea00a5d4a9..50b18618cb 100644
--- a/packages/core/js-sdk/src/admin/index.ts
+++ b/packages/core/js-sdk/src/admin/index.ts
@@ -16,6 +16,7 @@ import { SalesChannel } from "./sales-channel"
 import { ShippingOption } from "./shipping-option"
 import { ShippingProfile } from "./shipping-profile"
 import { StockLocation } from "./stock-location"
+import { Store } from "./store"
 import { TaxRate } from "./tax-rate"
 import { TaxRegion } from "./tax-region"
 import { Upload } from "./upload"
@@ -41,6 +42,7 @@ export class Admin {
   public order: Order
   public taxRate: TaxRate
   public taxRegion: TaxRegion
+  public store: Store
 
   constructor(client: Client) {
     this.invite = new Invite(client)
@@ -63,5 +65,6 @@ export class Admin {
     this.order = new Order(client)
     this.taxRate = new TaxRate(client)
     this.taxRegion = new TaxRegion(client)
+    this.store = new Store(client)
   }
 }
diff --git a/packages/core/js-sdk/src/admin/price-list.ts b/packages/core/js-sdk/src/admin/price-list.ts
index 395a9bd694..29ed37b97f 100644
--- a/packages/core/js-sdk/src/admin/price-list.ts
+++ b/packages/core/js-sdk/src/admin/price-list.ts
@@ -9,6 +9,95 @@ export class PriceList {
     this.client = client
   }
 
+  async retrieve(
+    id: string,
+    query?: HttpTypes.AdminPriceListParams,
+    headers?: ClientHeaders
+  ) {
+    return this.client.fetch<HttpTypes.AdminPriceListResponse>(
+      `/admin/price-lists/${id}`,
+      {
+        method: "GET",
+        headers,
+        query,
+      }
+    )
+  }
+
+  async list(
+    query?: HttpTypes.AdminPriceListListParams,
+    headers?: ClientHeaders
+  ) {
+    return this.client.fetch<HttpTypes.AdminPriceListListResponse>(
+      `/admin/price-lists`,
+      {
+        method: "GET",
+        headers,
+        query,
+      }
+    )
+  }
+
+  async create(
+    body: HttpTypes.AdminCreatePriceList,
+    query?: HttpTypes.AdminPriceListParams,
+    headers?: ClientHeaders
+  ) {
+    return this.client.fetch<HttpTypes.AdminPriceListResponse>(
+      `/admin/price-lists`,
+      {
+        method: "POST",
+        headers,
+        body,
+        query,
+      }
+    )
+  }
+
+  async update(
+    id: string,
+    body: HttpTypes.AdminUpdatePriceList,
+    query?: HttpTypes.AdminPriceListParams,
+    headers?: ClientHeaders
+  ) {
+    return this.client.fetch<HttpTypes.AdminPriceListResponse>(
+      `/admin/price-lists/${id}`,
+      {
+        method: "POST",
+        headers,
+        body,
+        query,
+      }
+    )
+  }
+
+  async delete(id: string, headers?: ClientHeaders) {
+    return this.client.fetch<HttpTypes.AdminPriceListDeleteResponse>(
+      `/admin/price-lists/${id}`,
+      {
+        method: "DELETE",
+        headers,
+      }
+    )
+  }
+
+  async batchPrices(
+    id: string,
+    body: HttpTypes.AdminBatchPriceListPrice,
+    query?: HttpTypes.AdminPriceListParams,
+    headers?: ClientHeaders
+  ) {
+    return this.client.fetch<HttpTypes.AdminPriceListResponse>(
+      `/admin/price-lists/${id}/prices/batch`,
+      {
+        method: "POST",
+        headers,
+        body,
+        query,
+      }
+    )
+  }
+
   async linkProducts(
     id: string,
     body: HttpTypes.AdminLinkPriceListProducts,
diff --git a/packages/core/js-sdk/src/admin/store.ts b/packages/core/js-sdk/src/admin/store.ts
new file mode 100644
index 0000000000..96002587a2
--- /dev/null
+++ b/packages/core/js-sdk/src/admin/store.ts
@@ -0,0 +1,53 @@
+import { HttpTypes, SelectParams } from "@medusajs/types"
+import { Client } from "../client"
+import { ClientHeaders } from "../types"
+
+export class Store {
+  private client: Client
+  constructor(client: Client) {
+    this.client = client
+  }
+
+  async retrieve(
+    id: string,
+    query?: HttpTypes.AdminStoreParams,
+    headers?: ClientHeaders
+  ) {
+    return await this.client.fetch<HttpTypes.AdminStoreResponse>(
+      `/admin/stores/${id}`,
+      {
+        method: "GET",
+        headers,
+        query,
+      }
+    )
+  }
+
+  async list(query?: HttpTypes.AdminStoreListParams, headers?: ClientHeaders) {
+    return await this.client.fetch<HttpTypes.AdminStoreListResponse>(
+      `/admin/stores`,
+      {
+        method: "GET",
+        headers,
+        query,
+      }
+    )
+  }
+
+  async update(
+    id: string,
+    body: HttpTypes.AdminUpdateStore,
+    query?: SelectParams,
+    headers?: ClientHeaders
+  ) {
+    return await this.client.fetch<HttpTypes.AdminStoreResponse>(
+      `/admin/stores/${id}`,
+      {
+        method: "POST",
+        headers,
+        body,
+        query,
+      }
+    )
+  }
+}
diff --git a/packages/core/types/src/common/common.ts b/packages/core/types/src/common/common.ts
index 20f3c64e41..1697c4f5c4 100644
--- a/packages/core/types/src/common/common.ts
+++ b/packages/core/types/src/common/common.ts
@@ -363,3 +363,8 @@ export type KebabCase<S extends string> =
     : S
 
 export type MetadataType = Record<string, unknown> | null
+
+export type RawRounding = {
+  value: string
+  precision: number
+}
diff --git a/packages/core/types/src/http/currency/admin/entities.ts b/packages/core/types/src/http/currency/admin/entities.ts
new file mode 100644
index 0000000000..e644713e4e
--- /dev/null
+++ b/packages/core/types/src/http/currency/admin/entities.ts
@@ -0,0 +1,14 @@
+import { RawRounding } from "../../../common"
+
+export interface AdminCurrency {
+  code: string
+  symbol: string
+  symbol_native: string
+  name: string
+  decimal_digits: number
+  raw_rounding: RawRounding
+  rounding: number
+  created_at: string
+  updated_at: string
+  deleted_at: string | null
+}
diff --git a/packages/core/types/src/http/currency/admin/index.ts b/packages/core/types/src/http/currency/admin/index.ts
new file mode 100644
index 0000000000..8270e0b265
--- /dev/null
+++ b/packages/core/types/src/http/currency/admin/index.ts
@@ -0,0 +1 @@
+export * from "./entities"
diff --git a/packages/core/types/src/http/currency/index.ts b/packages/core/types/src/http/currency/index.ts
new file mode 100644
index 0000000000..26b8eb9dad
--- /dev/null
+++ b/packages/core/types/src/http/currency/index.ts
@@ -0,0 +1 @@
+export * from "./admin"
diff --git a/packages/core/types/src/http/index.ts b/packages/core/types/src/http/index.ts
index ccc184a688..894f7749ea 100644
--- a/packages/core/types/src/http/index.ts
+++ b/packages/core/types/src/http/index.ts
@@ -3,6 +3,7 @@ export * from "./campaign"
 export * from "./cart"
 export * from "./collection"
 export * from "./common"
+export * from "./currency"
 export * from "./customer"
 export * from "./file"
 export * from "./fulfillment"
@@ -13,6 +14,7 @@ export * from "./inventory-level"
 export * from "./invite"
 export * from "./order"
 export * from "./payment"
+export * from "./price-list"
 export * from "./pricing"
 export * from "./product"
 export * from "./product-category"
@@ -24,6 +26,7 @@ export * from "./sales-channel"
 export * from "./shipping-option"
 export * from "./shipping-profile"
 export * from "./stock-locations"
+export * from "./store"
 export * from "./tax-rate"
 export * from "./tax-region"
 export * from "./user"
diff --git a/packages/core/types/src/http/price-list/admin/entities.ts b/packages/core/types/src/http/price-list/admin/entities.ts
new file mode 100644
index 0000000000..b5aa369050
--- /dev/null
+++ b/packages/core/types/src/http/price-list/admin/entities.ts
@@ -0,0 +1,22 @@
+import { PriceListStatus, PriceListType } from "../../../pricing"
+import { AdminPrice } from "../../pricing"
+
+export interface AdminPriceListPrice extends AdminPrice {
+  variant_id: string
+  rules: Record<string, unknown>
+}
+
+export interface AdminPriceList {
+  id: string
+  title: string
+  description: string
+  rules: Record<string, any>
+  starts_at: string | null
+  ends_at: string | null
+  status: PriceListStatus
+  type: PriceListType
+  prices: AdminPriceListPrice[]
+  created_at: string
+  updated_at: string
+  deleted_at: string | null
+}
diff --git a/packages/core/types/src/http/price-list/admin/index.ts b/packages/core/types/src/http/price-list/admin/index.ts
new file mode 100644
index 0000000000..1f82a2ead5
--- /dev/null
+++ b/packages/core/types/src/http/price-list/admin/index.ts
@@ -0,0 +1,4 @@
+export * from "./entities"
+export * from "./payloads"
+export * from "./queries"
+export * from "./responses"
diff --git a/packages/core/types/src/http/price-list/admin/payloads.ts b/packages/core/types/src/http/price-list/admin/payloads.ts
new file mode 100644
index 0000000000..e7c94063e7
--- /dev/null
+++ b/packages/core/types/src/http/price-list/admin/payloads.ts
@@ -0,0 +1,51 @@
+import { PriceListStatus, PriceListType } from "../../../pricing"
+
+export interface AdminCreatePriceListPrice {
+  currency_code: string
+  amount: number
+  variant_id: string
+  min_quantity?: number | null
+  max_quantity?: number | null
+  rules?: Record<string, string>
+}
+
+export interface AdminCreatePriceList {
+  title: string
+  description?: string | null
+  starts_at?: string | null
+  ends_at?: string | null
+  status: PriceListStatus
+  type: PriceListType
+  rules?: Record<string, string[]>
+  prices?: AdminCreatePriceListPrice[]
+}
+
+export interface AdminUpdatePriceListPrice {
+  id: string
+  currency_code?: string
+  amount?: number
+  variant_id: string
+  min_quantity?: number | null
+  max_quantity?: number | null
+  rules?: Record<string, string>
+}
+
+export interface AdminUpdatePriceList {
+  title?: string
+  description?: string
+  starts_at?: string | null
+  ends_at?: string | null
+  status?: PriceListStatus
+  type?: PriceListType
+  rules?: Record<string, string[]>
+}
+
+export interface AdminBatchPriceListPrice {
+  create?: AdminCreatePriceListPrice[]
+  update?: AdminUpdatePriceListPrice[]
+  delete?: string[]
+}
+
+export interface AdminLinkPriceListProducts {
+  remove?: string[]
+}
diff --git a/packages/core/types/src/http/price-list/admin/queries.ts b/packages/core/types/src/http/price-list/admin/queries.ts
new file mode 100644
index 0000000000..0f5acf6a3d
--- /dev/null
+++ b/packages/core/types/src/http/price-list/admin/queries.ts
@@ -0,0 +1,16 @@
+import { BaseFilterable, OperatorMap } from "../../../dal"
+import { PriceListStatus } from "../../../pricing"
+import { FindParams, SelectParams } from "../../common"
+
+export interface AdminPriceListListParams
+  extends FindParams,
+    BaseFilterable<AdminPriceListListParams> {
+  q?: string
+  id?: string | string[]
+  starts_at?: OperatorMap<string>
+  ends_at?: OperatorMap<string>
+  status?: PriceListStatus[]
+  rules_count?: number[]
+}
+
+export interface AdminPriceListParams extends SelectParams {}
diff --git a/packages/core/types/src/http/price-list/admin/responses.ts b/packages/core/types/src/http/price-list/admin/responses.ts
new file mode 100644
index 0000000000..99408d75e1
--- /dev/null
+++ b/packages/core/types/src/http/price-list/admin/responses.ts
@@ -0,0 +1,14 @@
+import { DeleteResponse, PaginatedResponse } from "../../common"
+import { AdminPriceList } from "./entities"
+
+export interface AdminPriceListResponse {
+  price_list: AdminPriceList
+}
+
+export interface AdminPriceListListResponse
+  extends PaginatedResponse<{
+    price_lists: AdminPriceList[]
+  }> {}
+
+export interface AdminPriceListDeleteResponse
+  extends DeleteResponse<"price_list"> {}
diff --git a/packages/core/types/src/http/price-list/index.ts b/packages/core/types/src/http/price-list/index.ts
new file mode 100644
index 0000000000..26b8eb9dad
--- /dev/null
+++ b/packages/core/types/src/http/price-list/index.ts
@@ -0,0 +1 @@
+export * from "./admin"
diff --git a/packages/core/types/src/http/pricing/admin/entities.ts b/packages/core/types/src/http/pricing/admin/entities.ts
index 4c11150a7a..5e5a368dc0 100644
--- a/packages/core/types/src/http/pricing/admin/entities.ts
+++ b/packages/core/types/src/http/pricing/admin/entities.ts
@@ -1,5 +1,3 @@
-import { PriceListStatus, PriceListType } from "../../../pricing"
-
 /**
  * TODO: Not sure how to type this properly, as it's unclear to me what is returned
  * by our API. As an example we return `price_list: null` but `price_list_id` is missing.
@@ -31,17 +29,3 @@ export interface AdminPrice {
   updated_at: string
   deleted_at: string | null
 }
-
-export interface AdminPriceList {
-  id: string
-  title: string
-  description: string
-  rules: Record<string, any>
-  starts_at: string | null
-  ends_at: string | null
-  status: PriceListStatus
-  type: PriceListType
-  prices: AdminPrice[]
-  created_at: string
-  updated_at: string
-}
diff --git a/packages/core/types/src/http/pricing/admin/index.ts b/packages/core/types/src/http/pricing/admin/index.ts
index 1f82a2ead5..8270e0b265 100644
--- a/packages/core/types/src/http/pricing/admin/index.ts
+++ b/packages/core/types/src/http/pricing/admin/index.ts
@@ -1,4 +1 @@
 export * from "./entities"
-export * from "./payloads"
-export * from "./queries"
-export * from "./responses"
diff --git a/packages/core/types/src/http/pricing/admin/payloads.ts b/packages/core/types/src/http/pricing/admin/payloads.ts
deleted file mode 100644
index cd2d6fa169..0000000000
--- a/packages/core/types/src/http/pricing/admin/payloads.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export interface AdminLinkPriceListProducts {
-  remove?: string[]
-}
diff --git a/packages/core/types/src/http/pricing/admin/queries.ts b/packages/core/types/src/http/pricing/admin/queries.ts
deleted file mode 100644
index ed59fe4b81..0000000000
--- a/packages/core/types/src/http/pricing/admin/queries.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { SelectParams } from "../../common"
-
-export interface AdminPriceListParams extends SelectParams {}
diff --git a/packages/core/types/src/http/pricing/admin/responses.ts b/packages/core/types/src/http/pricing/admin/responses.ts
deleted file mode 100644
index 8acfad59ad..0000000000
--- a/packages/core/types/src/http/pricing/admin/responses.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { AdminPriceList } from "./entities"
-
-export interface AdminPriceListResponse {
-  price_list: AdminPriceList
-}
diff --git a/packages/core/types/src/http/store/admin/entities.ts b/packages/core/types/src/http/store/admin/entities.ts
new file mode 100644
index 0000000000..cbeaf01d4d
--- /dev/null
+++ b/packages/core/types/src/http/store/admin/entities.ts
@@ -0,0 +1,24 @@
+import { AdminCurrency } from "../../currency"
+
+export interface AdminStoreCurrency {
+  id: string
+  currency_code: string
+  store_id: string
+  is_default: boolean
+  currency: AdminCurrency
+  created_at: string
+  updated_at: string
+  deleted_at: string | null
+}
+
+export interface AdminStore {
+  id: string
+  name: string
+  supported_currencies: AdminStoreCurrency[]
+  default_sales_channel_id: string | null
+  default_region_id: string | null
+  default_location_id: string | null
+  metadata: Record<string, any> | null
+  created_at: string
+  updated_at: string
+}
diff --git a/packages/core/types/src/http/store/admin/index.ts b/packages/core/types/src/http/store/admin/index.ts
new file mode 100644
index 0000000000..1f82a2ead5
--- /dev/null
+++ b/packages/core/types/src/http/store/admin/index.ts
@@ -0,0 +1,4 @@
+export * from "./entities"
+export * from "./payloads"
+export * from "./queries"
+export * from "./responses"
diff --git a/packages/core/types/src/http/store/admin/payloads.ts b/packages/core/types/src/http/store/admin/payloads.ts
new file mode 100644
index 0000000000..b5949b0e50
--- /dev/null
+++ b/packages/core/types/src/http/store/admin/payloads.ts
@@ -0,0 +1,13 @@
+interface AdminUpdateStoreSupportedCurrency {
+  is_default?: boolean
+  code: string
+}
+
+export interface AdminUpdateStore {
+  name?: string | null
+  supported_currencies?: AdminUpdateStoreSupportedCurrency[]
+  default_sales_channel_id?: string | null
+  default_region_id?: string | null
+  default_location_id?: string | null
+  metadata?: Record<string, any> | null
+}
diff --git a/packages/core/types/src/http/store/admin/queries.ts b/packages/core/types/src/http/store/admin/queries.ts
new file mode 100644
index 0000000000..632c48fb02
--- /dev/null
+++ b/packages/core/types/src/http/store/admin/queries.ts
@@ -0,0 +1,12 @@
+import { BaseFilterable } from "../../../dal"
+import { FindParams, SelectParams } from "../../common"
+
+export interface AdminStoreListParams
+  extends BaseFilterable<AdminStoreListParams>,
+    FindParams {
+  q?: string
+  id?: string | string[]
+  name?: string | string[]
+}
+
+export interface AdminStoreParams extends SelectParams {}
diff --git a/packages/core/types/src/http/store/admin/responses.ts b/packages/core/types/src/http/store/admin/responses.ts
new file mode 100644
index 0000000000..d15d7bbb54
--- /dev/null
+++ b/packages/core/types/src/http/store/admin/responses.ts
@@ -0,0 +1,11 @@
+import { PaginatedResponse } from "../../common"
+import { AdminStore } from "./entities"
+
+export interface AdminStoreResponse {
+  store: AdminStore
+}
+
+export interface AdminStoreListResponse
+  extends PaginatedResponse<{
+    stores: AdminStore[]
+  }> {}
diff --git a/packages/core/types/src/http/store/index.ts b/packages/core/types/src/http/store/index.ts
new file mode 100644
index 0000000000..26b8eb9dad
--- /dev/null
+++ b/packages/core/types/src/http/store/index.ts
@@ -0,0 +1 @@
+export * from "./admin"
diff --git a/packages/design-system/ui/src/components/button/button.tsx b/packages/design-system/ui/src/components/button/button.tsx
index 9422487430..a73b1f5e4f 100644
--- a/packages/design-system/ui/src/components/button/button.tsx
+++ b/packages/design-system/ui/src/components/button/button.tsx
@@ -41,7 +41,7 @@ const buttonVariants = cva({
       ),
     },
     size: {
-      small: "txt-compact-small-plus gap-x-1 px-2 py-1",
+      small: "txt-compact-small-plus gap-x-1.5 px-2 py-1",
       base: "txt-compact-small-plus gap-x-1.5 px-3 py-1.5",
       large: "txt-compact-medium-plus gap-x-1.5 px-4 py-2.5",
       xlarge: "txt-compact-large-plus gap-x-1.5 px-5 py-3.5",
diff --git a/packages/design-system/ui/src/components/date-picker/date-picker.tsx b/packages/design-system/ui/src/components/date-picker/date-picker.tsx
index c17923c942..a729037695 100644
--- a/packages/design-system/ui/src/components/date-picker/date-picker.tsx
+++ b/packages/design-system/ui/src/components/date-picker/date-picker.tsx
@@ -25,8 +25,8 @@ const displayVariants = cva({
   ),
   variants: {
     size: {
-      base: "txt-compact-small h-8 px-2 py-1.5",
-      small: "txt-compact-small h-7 px-2 py-1",
+      base: "txt-compact-small h-8 pr-2 py-1.5",
+      small: "txt-compact-small h-7 pr-2 py-1",
     },
   },
   defaultVariants: {
@@ -63,7 +63,11 @@ const Display = React.forwardRef<HTMLButtonElement, DisplayProps>(
           className={clx(displayVariants({ size }), className)}
           {...props}
         >
+          <span className={clx("flex items-center justify-center size-8 border-r", {
+            "size-7": size === "small",
+          })}>
           <CalendarIcon className="text-ui-fg-muted" />
+          </span>
           <span className="flex-1 overflow-hidden text-ellipsis whitespace-nowrap text-left">
             {children ? (
               children
diff --git a/packages/design-system/ui/src/components/drawer/drawer.tsx b/packages/design-system/ui/src/components/drawer/drawer.tsx
index 050b30e552..77dd38006b 100644
--- a/packages/design-system/ui/src/components/drawer/drawer.tsx
+++ b/packages/design-system/ui/src/components/drawer/drawer.tsx
@@ -4,7 +4,6 @@ import { XMark } from "@medusajs/icons"
 import * as DrawerPrimitives from "@radix-ui/react-dialog"
 import * as React from "react"
 
-import { Heading } from "@/components/heading"
 import { IconButton } from "@/components/icon-button"
 import { Kbd } from "@/components/kbd"
 import { Text } from "@/components/text"
@@ -65,11 +64,14 @@ DrawerOverlay.displayName = "Drawer.Overlay"
 
 const DrawerContent = React.forwardRef<
   React.ElementRef<typeof DrawerPrimitives.Content>,
-  React.ComponentPropsWithoutRef<typeof DrawerPrimitives.Content>
->(({ className, ...props }, ref) => {
+  React.ComponentPropsWithoutRef<typeof DrawerPrimitives.Content> & {
+    overlayProps?: React.ComponentPropsWithoutRef<typeof DrawerOverlay>
+    portalProps?: React.ComponentPropsWithoutRef<typeof DrawerPortal>
+  }
+>(({ className, overlayProps, portalProps, ...props }, ref) => {
   return (
-    <DrawerPortal>
-      <DrawerOverlay />
+    <DrawerPortal {...portalProps}>
+      <DrawerOverlay {...overlayProps} />
       <DrawerPrimitives.Content
         ref={ref}
         className={clx(
@@ -134,19 +136,7 @@ const DrawerFooter = ({
 }
 DrawerFooter.displayName = "Drawer.Footer"
 
-const DrawerTitle = React.forwardRef<
-  React.ElementRef<typeof DrawerPrimitives.Title>,
-  React.ComponentPropsWithoutRef<typeof DrawerPrimitives.Title>
->(({ className, children, ...props }, ref) => (
-  <DrawerPrimitives.Title
-    ref={ref}
-    className={clx(className)}
-    asChild
-    {...props}
-  >
-    <Heading level="h1">{children}</Heading>
-  </DrawerPrimitives.Title>
-))
+const DrawerTitle = DrawerPrimitives.Title
 DrawerTitle.displayName = "Drawer.Title"
 
 const DrawerDescription = React.forwardRef<
diff --git a/packages/design-system/ui/src/components/focus-modal/focus-modal.tsx b/packages/design-system/ui/src/components/focus-modal/focus-modal.tsx
index dc37af0728..036c9dc6dc 100644
--- a/packages/design-system/ui/src/components/focus-modal/focus-modal.tsx
+++ b/packages/design-system/ui/src/components/focus-modal/focus-modal.tsx
@@ -35,12 +35,9 @@ FocusModalTrigger.displayName = "FocusModal.Trigger"
 const FocusModalClose = FocusModalPrimitives.Close
 FocusModalClose.displayName = "FocusModal.Close"
 
-const FocusModalPortal = ({
-  className,
-  ...props
-}: FocusModalPrimitives.DialogPortalProps) => {
+const FocusModalPortal = (props: FocusModalPrimitives.DialogPortalProps) => {
   return (
-    <FocusModalPrimitives.DialogPortal className={clx(className)} {...props} />
+    <FocusModalPrimitives.DialogPortal {...props} />
   )
 }
 FocusModalPortal.displayName = "FocusModal.Portal"
@@ -65,11 +62,14 @@ FocusModalOverlay.displayName = "FocusModal.Overlay"
 
 const FocusModalContent = React.forwardRef<
   React.ElementRef<typeof FocusModalPrimitives.Content>,
-  React.ComponentPropsWithoutRef<typeof FocusModalPrimitives.Content>
->(({ className, ...props }, ref) => {
+  React.ComponentPropsWithoutRef<typeof FocusModalPrimitives.Content> & {
+    overlayProps?: React.ComponentPropsWithoutRef<typeof FocusModalOverlay>
+    portalProps?: React.ComponentPropsWithoutRef<typeof FocusModalPortal>
+  }
+>(({ className, overlayProps, portalProps, ...props }, ref) => {
   return (
-    <FocusModalPortal>
-      <FocusModalOverlay />
+    <FocusModalPortal {...portalProps}>
+      <FocusModalOverlay {...overlayProps} />
       <FocusModalPrimitives.Content
         ref={ref}
         className={clx(
@@ -114,6 +114,38 @@ const FocusModalHeader = React.forwardRef<
 })
 FocusModalHeader.displayName = "FocusModal.Header"
 
+const FocusModalFooter = React.forwardRef<
+  HTMLDivElement,
+  React.ComponentPropsWithoutRef<"div">
+>(({ children, className, ...props }, ref) => {
+  return (
+    <div
+      ref={ref}
+      className={clx(
+        "border-ui-border-base flex items-center justify-end gap-x-2 border-t p-4",
+        className
+      )}
+      {...props}
+    >
+      {children}
+    </div>
+  )
+})
+FocusModalFooter.displayName = "FocusModal.Footer"
+
+const FocusModalTitle = React.forwardRef<
+  HTMLHeadingElement,
+  React.ComponentPropsWithoutRef<typeof FocusModalPrimitives.Title>
+>(({ className, ...props }, ref) => {
+  return (
+    <FocusModalPrimitives.Title ref={ref} {...props} />
+  )
+})
+FocusModalTitle.displayName = "FocusModal.Title"
+
+const FocusModalDescription = FocusModalPrimitives.Description
+FocusModalDescription.displayName = "FocusModal.Description"
+
 /**
  * This component is based on the `div` element and supports all of its props
  */
@@ -127,10 +159,13 @@ FocusModalBody.displayName = "FocusModal.Body"
 
 const FocusModal = Object.assign(FocusModalRoot, {
   Trigger: FocusModalTrigger,
+  Title: FocusModalTitle,
+  Description: FocusModalDescription,
   Content: FocusModalContent,
   Header: FocusModalHeader,
   Body: FocusModalBody,
   Close: FocusModalClose,
+  Footer: FocusModalFooter,
 })
 
 export { FocusModal }
diff --git a/packages/design-system/ui/src/components/progress-tabs/progress-tabs.tsx b/packages/design-system/ui/src/components/progress-tabs/progress-tabs.tsx
index 4dd9915295..5fcbcc31f0 100644
--- a/packages/design-system/ui/src/components/progress-tabs/progress-tabs.tsx
+++ b/packages/design-system/ui/src/components/progress-tabs/progress-tabs.tsx
@@ -81,7 +81,7 @@ const ProgressTabsTrigger = React.forwardRef<
     <ProgressTabsPrimitives.Trigger
       ref={ref}
       className={clx(
-        "txt-compact-small-plus transition-fg text-ui-fg-muted bg-ui-bg-subtle border-r-ui-border-base inline-flex h-14 w-full max-w-[200px] flex-1 items-center gap-x-2 border-r px-4 text-left outline-none",
+        "txt-compact-small-plus transition-fg text-ui-fg-muted bg-ui-bg-subtle border-r-ui-border-base inline-flex h-[52px] w-full max-w-[200px] flex-1 items-center gap-x-2 border-r px-4 text-left outline-none",
         "group/trigger overflow-hidden text-ellipsis whitespace-nowrap",
         "disabled:bg-ui-bg-disabled disabled:text-ui-fg-muted",
         "hover:bg-ui-bg-subtle-hover",
diff --git a/packages/medusa/src/api/admin/price-lists/validators.ts b/packages/medusa/src/api/admin/price-lists/validators.ts
index a87d58ebcb..0a90048cd8 100644
--- a/packages/medusa/src/api/admin/price-lists/validators.ts
+++ b/packages/medusa/src/api/admin/price-lists/validators.ts
@@ -55,8 +55,8 @@ export type AdminUpdatePriceListPriceType = z.infer<
 export const AdminCreatePriceList = z.object({
   title: z.string(),
   description: z.string(),
-  starts_at: z.union([z.string(), z.null()]).nullish(),
-  ends_at: z.union([z.string(), z.null()]).nullish(),
+  starts_at: z.string().nullish(),
+  ends_at: z.string().nullish(),
   status: z.nativeEnum(PriceListStatus).optional(),
   type: z.nativeEnum(PriceListType).optional(),
   rules: z.record(z.string(), z.array(z.string())).optional(),
diff --git a/yarn.lock b/yarn.lock
index b90818d683..cd863b20ac 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5957,6 +5957,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@radix-ui/primitive@npm:1.1.0":
+  version: 1.1.0
+  resolution: "@radix-ui/primitive@npm:1.1.0"
+  checksum: 1dcc8b5401799416ff8bdb15c7189b4536c193220ad8fd348a48b88f804ee38cec7bd03e2b9641f7da24610e2f61f23a306911ce883af92c4e8c1abac634cb61
+  languageName: node
+  linkType: hard
+
 "@radix-ui/react-accordion@npm:^1.1.2":
   version: 1.1.2
   resolution: "@radix-ui/react-accordion@npm:1.1.2"
@@ -6030,6 +6037,25 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@radix-ui/react-arrow@npm:1.1.0":
+  version: 1.1.0
+  resolution: "@radix-ui/react-arrow@npm:1.1.0"
+  dependencies:
+    "@radix-ui/react-primitive": 2.0.0
+  peerDependencies:
+    "@types/react": "*"
+    "@types/react-dom": "*"
+    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+    "@types/react-dom":
+      optional: true
+  checksum: cbe059dfa5a9c1677478d363bb5fd75b0c7a08221d0ac7f8e7b9aec9dbae9754f6a3518218cf63e4ed53df6c36d193c8d2618d03433a37aa0cb7ee77a60a591f
+  languageName: node
+  linkType: hard
+
 "@radix-ui/react-avatar@npm:^1.0.3":
   version: 1.0.4
   resolution: "@radix-ui/react-avatar@npm:1.0.4"
@@ -6156,6 +6182,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@radix-ui/react-compose-refs@npm:1.1.0":
+  version: 1.1.0
+  resolution: "@radix-ui/react-compose-refs@npm:1.1.0"
+  peerDependencies:
+    "@types/react": "*"
+    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+  checksum: 7e18706084397d9458ca3473d8565b10691da06f6499a78edbcc4bd72cde08f62e91120658d17d58c19fc39d6b1dffe0133cc4535c8f5fce470abd478f6107e5
+  languageName: node
+  linkType: hard
+
 "@radix-ui/react-context@npm:1.0.0":
   version: 1.0.0
   resolution: "@radix-ui/react-context@npm:1.0.0"
@@ -6182,6 +6221,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@radix-ui/react-context@npm:1.1.0":
+  version: 1.1.0
+  resolution: "@radix-ui/react-context@npm:1.1.0"
+  peerDependencies:
+    "@types/react": "*"
+    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+  checksum: c843980f568cc61b512708863ec84c42a02e0f88359b22ad1c0e290cea3e6d7618eccbd2cd37bd974fadaa7636cbed5bda27553722e61197eb53852eaa34f1bb
+  languageName: node
+  linkType: hard
+
 "@radix-ui/react-dialog@npm:1.0.0":
   version: 1.0.0
   resolution: "@radix-ui/react-dialog@npm:1.0.0"
@@ -6321,6 +6373,29 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@radix-ui/react-dismissable-layer@npm:1.1.0":
+  version: 1.1.0
+  resolution: "@radix-ui/react-dismissable-layer@npm:1.1.0"
+  dependencies:
+    "@radix-ui/primitive": 1.1.0
+    "@radix-ui/react-compose-refs": 1.1.0
+    "@radix-ui/react-primitive": 2.0.0
+    "@radix-ui/react-use-callback-ref": 1.1.0
+    "@radix-ui/react-use-escape-keydown": 1.1.0
+  peerDependencies:
+    "@types/react": "*"
+    "@types/react-dom": "*"
+    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+    "@types/react-dom":
+      optional: true
+  checksum: 72967068ab02127b668ecfd0a1863149e2a42d9fd12d3247f51422a41f3d5faa82a147a5b0a8a6ec609eff8fe6baede6fb7d6111f76896656d13567e3ec29ba8
+  languageName: node
+  linkType: hard
+
 "@radix-ui/react-dropdown-menu@npm:^2.0.5":
   version: 2.0.6
   resolution: "@radix-ui/react-dropdown-menu@npm:2.0.6"
@@ -6373,6 +6448,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@radix-ui/react-focus-guards@npm:1.1.0":
+  version: 1.1.0
+  resolution: "@radix-ui/react-focus-guards@npm:1.1.0"
+  peerDependencies:
+    "@types/react": "*"
+    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+  checksum: 23af9ff17244568db9b2e99ae6e5718747a4b656bf12b1b15b0d3adca407988641a930612eca35a61b7e15d1ce312b3db13ea95999fa31ae641aaaac1e325df8
+  languageName: node
+  linkType: hard
+
 "@radix-ui/react-focus-scope@npm:1.0.0":
   version: 1.0.0
   resolution: "@radix-ui/react-focus-scope@npm:1.0.0"
@@ -6432,6 +6520,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@radix-ui/react-focus-scope@npm:1.1.0":
+  version: 1.1.0
+  resolution: "@radix-ui/react-focus-scope@npm:1.1.0"
+  dependencies:
+    "@radix-ui/react-compose-refs": 1.1.0
+    "@radix-ui/react-primitive": 2.0.0
+    "@radix-ui/react-use-callback-ref": 1.1.0
+  peerDependencies:
+    "@types/react": "*"
+    "@types/react-dom": "*"
+    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+    "@types/react-dom":
+      optional: true
+  checksum: 2593d4bbd4a3525624675ec1d5a591a44f015f43f449b99a5a33228159b83f445e8f1c6bc6f9f2011387abaeadd3df406623c08d4e795b7ae509795652a1d069
+  languageName: node
+  linkType: hard
+
 "@radix-ui/react-hover-card@npm:^1.0.7":
   version: 1.0.7
   resolution: "@radix-ui/react-hover-card@npm:1.0.7"
@@ -6488,6 +6597,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@radix-ui/react-id@npm:1.1.0":
+  version: 1.1.0
+  resolution: "@radix-ui/react-id@npm:1.1.0"
+  dependencies:
+    "@radix-ui/react-use-layout-effect": 1.1.0
+  peerDependencies:
+    "@types/react": "*"
+    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+  checksum: acf13e29e51ee96336837fc0cfecc306328b20b0e0070f6f0f7aa7a621ded4a1ee5537cfad58456f64bae76caa7f8769231e88dc7dc106197347ee433c275a79
+  languageName: node
+  linkType: hard
+
 "@radix-ui/react-label@npm:^2.0.2":
   version: 2.0.2
   resolution: "@radix-ui/react-label@npm:2.0.2"
@@ -6546,36 +6670,35 @@ __metadata:
   linkType: hard
 
 "@radix-ui/react-popover@npm:^1.0.6":
-  version: 1.0.7
-  resolution: "@radix-ui/react-popover@npm:1.0.7"
+  version: 1.1.1
+  resolution: "@radix-ui/react-popover@npm:1.1.1"
   dependencies:
-    "@babel/runtime": ^7.13.10
-    "@radix-ui/primitive": 1.0.1
-    "@radix-ui/react-compose-refs": 1.0.1
-    "@radix-ui/react-context": 1.0.1
-    "@radix-ui/react-dismissable-layer": 1.0.5
-    "@radix-ui/react-focus-guards": 1.0.1
-    "@radix-ui/react-focus-scope": 1.0.4
-    "@radix-ui/react-id": 1.0.1
-    "@radix-ui/react-popper": 1.1.3
-    "@radix-ui/react-portal": 1.0.4
-    "@radix-ui/react-presence": 1.0.1
-    "@radix-ui/react-primitive": 1.0.3
-    "@radix-ui/react-slot": 1.0.2
-    "@radix-ui/react-use-controllable-state": 1.0.1
+    "@radix-ui/primitive": 1.1.0
+    "@radix-ui/react-compose-refs": 1.1.0
+    "@radix-ui/react-context": 1.1.0
+    "@radix-ui/react-dismissable-layer": 1.1.0
+    "@radix-ui/react-focus-guards": 1.1.0
+    "@radix-ui/react-focus-scope": 1.1.0
+    "@radix-ui/react-id": 1.1.0
+    "@radix-ui/react-popper": 1.2.0
+    "@radix-ui/react-portal": 1.1.1
+    "@radix-ui/react-presence": 1.1.0
+    "@radix-ui/react-primitive": 2.0.0
+    "@radix-ui/react-slot": 1.1.0
+    "@radix-ui/react-use-controllable-state": 1.1.0
     aria-hidden: ^1.1.1
-    react-remove-scroll: 2.5.5
+    react-remove-scroll: 2.5.7
   peerDependencies:
     "@types/react": "*"
     "@types/react-dom": "*"
-    react: ^16.8 || ^17.0 || ^18.0
-    react-dom: ^16.8 || ^17.0 || ^18.0
+    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
   peerDependenciesMeta:
     "@types/react":
       optional: true
     "@types/react-dom":
       optional: true
-  checksum: ed7abbd61df1e15d62072e214fafbdc4e31942e0ce49665f2045d8279944a0a37762bcd70a36389ed9e43c95797d5acb57f6f5ca5a15b688b1928cfc2b9ce196
+  checksum: 4539082143c6c006727cf4a6300479f3dd912e85291d5ed7f084d8a7730acc3b5f6589925ab70eca025d3c78026f52f99c0155e11a35de37fe26b8078e6802b3
   languageName: node
   linkType: hard
 
@@ -6637,6 +6760,34 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@radix-ui/react-popper@npm:1.2.0":
+  version: 1.2.0
+  resolution: "@radix-ui/react-popper@npm:1.2.0"
+  dependencies:
+    "@floating-ui/react-dom": ^2.0.0
+    "@radix-ui/react-arrow": 1.1.0
+    "@radix-ui/react-compose-refs": 1.1.0
+    "@radix-ui/react-context": 1.1.0
+    "@radix-ui/react-primitive": 2.0.0
+    "@radix-ui/react-use-callback-ref": 1.1.0
+    "@radix-ui/react-use-layout-effect": 1.1.0
+    "@radix-ui/react-use-rect": 1.1.0
+    "@radix-ui/react-use-size": 1.1.0
+    "@radix-ui/rect": 1.1.0
+  peerDependencies:
+    "@types/react": "*"
+    "@types/react-dom": "*"
+    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+    "@types/react-dom":
+      optional: true
+  checksum: a78ea534b9822d07153fff0895b6cdf742e7213782b140b3ab94a76df0ca70e6001925aea946e99ca680fc63a7fcca49c1d62e8dc5a2f651692fba3541e180c0
+  languageName: node
+  linkType: hard
+
 "@radix-ui/react-portal@npm:1.0.0":
   version: 1.0.0
   resolution: "@radix-ui/react-portal@npm:1.0.0"
@@ -6690,6 +6841,26 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@radix-ui/react-portal@npm:1.1.1":
+  version: 1.1.1
+  resolution: "@radix-ui/react-portal@npm:1.1.1"
+  dependencies:
+    "@radix-ui/react-primitive": 2.0.0
+    "@radix-ui/react-use-layout-effect": 1.1.0
+  peerDependencies:
+    "@types/react": "*"
+    "@types/react-dom": "*"
+    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+    "@types/react-dom":
+      optional: true
+  checksum: 7e7130fcb0d99197322cd97987e1d7279b6c264fb6be3d883cbfcd49267740d83ca17b431e0d98848afd6067a13ee823ca396a8b63ae68f18a728cf70398c830
+  languageName: node
+  linkType: hard
+
 "@radix-ui/react-presence@npm:1.0.0":
   version: 1.0.0
   resolution: "@radix-ui/react-presence@npm:1.0.0"
@@ -6725,6 +6896,26 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@radix-ui/react-presence@npm:1.1.0":
+  version: 1.1.0
+  resolution: "@radix-ui/react-presence@npm:1.1.0"
+  dependencies:
+    "@radix-ui/react-compose-refs": 1.1.0
+    "@radix-ui/react-use-layout-effect": 1.1.0
+  peerDependencies:
+    "@types/react": "*"
+    "@types/react-dom": "*"
+    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+    "@types/react-dom":
+      optional: true
+  checksum: 58acb658b15b72991ad7a234ea90995902c470b3a182aa90ad03145cbbeaa40f211700c444bfa14cf47537cbb6b732e1359bc5396182de839bd680843c11bf31
+  languageName: node
+  linkType: hard
+
 "@radix-ui/react-primitive@npm:1.0.0":
   version: 1.0.0
   resolution: "@radix-ui/react-primitive@npm:1.0.0"
@@ -6758,6 +6949,25 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@radix-ui/react-primitive@npm:2.0.0":
+  version: 2.0.0
+  resolution: "@radix-ui/react-primitive@npm:2.0.0"
+  dependencies:
+    "@radix-ui/react-slot": 1.1.0
+  peerDependencies:
+    "@types/react": "*"
+    "@types/react-dom": "*"
+    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+    "@types/react-dom":
+      optional: true
+  checksum: 00cb6ca499252ca848c299212ba6976171cea7608b10b3f9a9639d6732dea2df1197ba0d97c001a4fdb29313c3e7fc2a490f6245dd3579617a0ffd85ae964fdd
+  languageName: node
+  linkType: hard
+
 "@radix-ui/react-radio-group@npm:^1.1.3":
   version: 1.1.3
   resolution: "@radix-ui/react-radio-group@npm:1.1.3"
@@ -6971,6 +7181,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@radix-ui/react-slot@npm:1.1.0":
+  version: 1.1.0
+  resolution: "@radix-ui/react-slot@npm:1.1.0"
+  dependencies:
+    "@radix-ui/react-compose-refs": 1.1.0
+  peerDependencies:
+    "@types/react": "*"
+    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+  checksum: a2e8bfb70c440506dd84a1a274f9a8bc433cca37ceae275e53552c9122612e3837744d7fc6f113d6ef1a11491aa914f4add71d76de41cb6d4db72547a8e261ae
+  languageName: node
+  linkType: hard
+
 "@radix-ui/react-switch@npm:^1.0.3":
   version: 1.0.3
   resolution: "@radix-ui/react-switch@npm:1.0.3"
@@ -7155,6 +7380,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@radix-ui/react-use-callback-ref@npm:1.1.0":
+  version: 1.1.0
+  resolution: "@radix-ui/react-use-callback-ref@npm:1.1.0"
+  peerDependencies:
+    "@types/react": "*"
+    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+  checksum: e954863f3baa151faf89ac052a5468b42650efca924417470efd1bd254b411a94c69c30de2fdbb90187b38cb984795978e12e30423dc41e4309d93d53b66d819
+  languageName: node
+  linkType: hard
+
 "@radix-ui/react-use-controllable-state@npm:1.0.0":
   version: 1.0.0
   resolution: "@radix-ui/react-use-controllable-state@npm:1.0.0"
@@ -7183,6 +7421,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@radix-ui/react-use-controllable-state@npm:1.1.0":
+  version: 1.1.0
+  resolution: "@radix-ui/react-use-controllable-state@npm:1.1.0"
+  dependencies:
+    "@radix-ui/react-use-callback-ref": 1.1.0
+  peerDependencies:
+    "@types/react": "*"
+    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+  checksum: 2af883b5b25822ac226e60a6bfde647c0123a76345052a90219026059b3f7225844b2c13a9a16fba859c1cda5fb3d057f2a04503f71780e607516492db4eb3a1
+  languageName: node
+  linkType: hard
+
 "@radix-ui/react-use-escape-keydown@npm:1.0.0":
   version: 1.0.0
   resolution: "@radix-ui/react-use-escape-keydown@npm:1.0.0"
@@ -7211,6 +7464,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@radix-ui/react-use-escape-keydown@npm:1.1.0":
+  version: 1.1.0
+  resolution: "@radix-ui/react-use-escape-keydown@npm:1.1.0"
+  dependencies:
+    "@radix-ui/react-use-callback-ref": 1.1.0
+  peerDependencies:
+    "@types/react": "*"
+    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+  checksum: 910fd696e5a0994b0e06b9cb68def8a865f47951a013ec240c77db2a9e1e726105602700ef5e5f01af49f2f18fe0e73164f9a9651021f28538ef8a30d91f3fbb
+  languageName: node
+  linkType: hard
+
 "@radix-ui/react-use-layout-effect@npm:1.0.0":
   version: 1.0.0
   resolution: "@radix-ui/react-use-layout-effect@npm:1.0.0"
@@ -7237,6 +7505,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@radix-ui/react-use-layout-effect@npm:1.1.0":
+  version: 1.1.0
+  resolution: "@radix-ui/react-use-layout-effect@npm:1.1.0"
+  peerDependencies:
+    "@types/react": "*"
+    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+  checksum: 9bf87ece1845c038ed95863cfccf9d75f557c2400d606343bab0ab3192b9806b9840e6aa0a0333fdf3e83cf9982632852192f3e68d7d8367bc8c788dfdf8e62b
+  languageName: node
+  linkType: hard
+
 "@radix-ui/react-use-previous@npm:1.0.1":
   version: 1.0.1
   resolution: "@radix-ui/react-use-previous@npm:1.0.1"
@@ -7268,6 +7549,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@radix-ui/react-use-rect@npm:1.1.0":
+  version: 1.1.0
+  resolution: "@radix-ui/react-use-rect@npm:1.1.0"
+  dependencies:
+    "@radix-ui/rect": 1.1.0
+  peerDependencies:
+    "@types/react": "*"
+    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+  checksum: c2e30150ab49e2cec238cda306fd748c3d47fb96dcff69a3b08e1d19108d80bac239d48f1747a25dadca614e3e967267d43b91e60ea59db2befbc7bea913ff84
+  languageName: node
+  linkType: hard
+
 "@radix-ui/react-use-size@npm:1.0.1":
   version: 1.0.1
   resolution: "@radix-ui/react-use-size@npm:1.0.1"
@@ -7284,6 +7580,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@radix-ui/react-use-size@npm:1.1.0":
+  version: 1.1.0
+  resolution: "@radix-ui/react-use-size@npm:1.1.0"
+  dependencies:
+    "@radix-ui/react-use-layout-effect": 1.1.0
+  peerDependencies:
+    "@types/react": "*"
+    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+  checksum: 4c8b89037597fdc1824d009e0c941b510c7c6c30f83024cc02c934edd748886786e7d9f36f57323b02ad29833e7fa7e8974d81969b4ab33d8f41661afa4f30a6
+  languageName: node
+  linkType: hard
+
 "@radix-ui/react-visually-hidden@npm:1.0.3":
   version: 1.0.3
   resolution: "@radix-ui/react-visually-hidden@npm:1.0.3"
@@ -7313,6 +7624,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@radix-ui/rect@npm:1.1.0":
+  version: 1.1.0
+  resolution: "@radix-ui/rect@npm:1.1.0"
+  checksum: a26ff7f8708fb5f2f7949baad70a6b2a597d761ee4dd4aadaf1c1a33ea82ea23dfef6ce6366a08310c5d008cdd60b2e626e4ee03fa342bd5f246ddd9d427f6be
+  languageName: node
+  linkType: hard
+
 "@react-aria/datepicker@npm:^3.5.0":
   version: 3.10.0
   resolution: "@react-aria/datepicker@npm:3.10.0"
@@ -24734,7 +25052,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-remove-scroll-bar@npm:^2.3.3":
+"react-remove-scroll-bar@npm:^2.3.3, react-remove-scroll-bar@npm:^2.3.4":
   version: 2.3.6
   resolution: "react-remove-scroll-bar@npm:2.3.6"
   dependencies:
@@ -24788,6 +25106,25 @@ __metadata:
   languageName: node
   linkType: hard
 
+"react-remove-scroll@npm:2.5.7":
+  version: 2.5.7
+  resolution: "react-remove-scroll@npm:2.5.7"
+  dependencies:
+    react-remove-scroll-bar: ^2.3.4
+    react-style-singleton: ^2.2.1
+    tslib: ^2.1.0
+    use-callback-ref: ^1.3.0
+    use-sidecar: ^1.1.2
+  peerDependencies:
+    "@types/react": ^16.8.0 || ^17.0.0 || ^18.0.0
+    react: ^16.8.0 || ^17.0.0 || ^18.0.0
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+  checksum: dcd523ada602bd0a839c2032cadf0b3e4af55ee85acefee3760976a9cceaa4606927801b093bbb8bf3c2989c71e048f5428c2c6eb9e6681762e86356833d039b
+  languageName: node
+  linkType: hard
+
 "react-resizable-panels@npm:^2.0.16":
   version: 2.0.19
   resolution: "react-resizable-panels@npm:2.0.19"