diff --git a/src/storybook/__snapshots__/Stories.test.ts.snap b/src/storybook/__snapshots__/Stories.test.ts.snap
index 86cd9bc57..ed195b535 100644
--- a/src/storybook/__snapshots__/Stories.test.ts.snap
+++ b/src/storybook/__snapshots__/Stories.test.ts.snap
@@ -38951,10 +38951,85 @@ exports[`Storyshots Views / Attributes / Attribute details loading 1`] = `
                     class="MuiTableRow-root-id"
                   >
                     <td
-                      class="MuiTableCell-root-id MuiTableCell-body-id"
-                      colspan="2"
+                      class="MuiTableCell-root-id MuiTableCell-body-id SortableHandle-columnDrag-id"
                     >
-                      No values found
+                      <svg
+                        aria-hidden="true"
+                        class="MuiSvgIcon-root-id"
+                        focusable="false"
+                        viewBox="0 0 24 24"
+                      >
+                        <path
+                          clip-rule="evenodd"
+                          d="M3.5 2C3.5 2.82843 2.82843 3.5 2 3.5C1.17157 3.5 0.5 2.82843 0.5 2C0.5 1.17157 1.17157 0.5 2 0.5C2.82843 0.5 3.5 1.17157 3.5 2ZM4 2C4 3.10457 3.10457 4 2 4C0.895431 4 0 3.10457 0 2C0 0.895431 0.895431 0 2 0C3.10457 0 4 0.895431 4 2ZM9.5 2C9.5 2.82843 8.82843 3.5 8 3.5C7.17157 3.5 6.5 2.82843 6.5 2C6.5 1.17157 7.17157 0.5 8 0.5C8.82843 0.5 9.5 1.17157 9.5 2ZM10 2C10 3.10457 9.10457 4 8 4C6.89543 4 6 3.10457 6 2C6 0.895431 6.89543 0 8 0C9.10457 0 10 0.895431 10 2ZM8 9.5C8.82843 9.5 9.5 8.82843 9.5 8C9.5 7.17157 8.82843 6.5 8 6.5C7.17157 6.5 6.5 7.17157 6.5 8C6.5 8.82843 7.17157 9.5 8 9.5ZM8 10C9.10457 10 10 9.10457 10 8C10 6.89543 9.10457 6 8 6C6.89543 6 6 6.89543 6 8C6 9.10457 6.89543 10 8 10ZM3.5 8C3.5 8.82843 2.82843 9.5 2 9.5C1.17157 9.5 0.5 8.82843 0.5 8C0.5 7.17157 1.17157 6.5 2 6.5C2.82843 6.5 3.5 7.17157 3.5 8ZM4 8C4 9.10457 3.10457 10 2 10C0.895431 10 0 9.10457 0 8C0 6.89543 0.895431 6 2 6C3.10457 6 4 6.89543 4 8ZM2 15.5C2.82843 15.5 3.5 14.8284 3.5 14C3.5 13.1716 2.82843 12.5 2 12.5C1.17157 12.5 0.5 13.1716 0.5 14C0.5 14.8284 1.17157 15.5 2 15.5ZM2 16C3.10457 16 4 15.1046 4 14C4 12.8954 3.10457 12 2 12C0.895431 12 0 12.8954 0 14C0 15.1046 0.895431 16 2 16ZM9.5 14C9.5 14.8284 8.82843 15.5 8 15.5C7.17157 15.5 6.5 14.8284 6.5 14C6.5 13.1716 7.17157 12.5 8 12.5C8.82843 12.5 9.5 13.1716 9.5 14ZM10 14C10 15.1046 9.10457 16 8 16C6.89543 16 6 15.1046 6 14C6 12.8954 6.89543 12 8 12C9.10457 12 10 12.8954 10 14Z"
+                          fill="url(#paint0_linear)"
+                          fill-rule="evenodd"
+                          style="transform:translate(7px, 4px)"
+                        />
+                        <defs>
+                          <linearGradient
+                            gradientUnits="userSpaceOnUse"
+                            id="paint0_linear"
+                            x1="0"
+                            x2="16.0896"
+                            y1="0"
+                            y2="10.4478"
+                          >
+                            <stop
+                              stop-color="#06847B"
+                            />
+                            <stop
+                              offset="1"
+                              stop-color="#3EE7CD"
+                            />
+                          </linearGradient>
+                        </defs>
+                      </svg>
+                    </td>
+                    <td
+                      class="MuiTableCell-root-id MuiTableCell-body-id AttributeValues-columnAdmin-id"
+                    >
+                      <span
+                        class="Skeleton-skeleton-id"
+                        data-test-id="skeleton"
+                      >
+                        ‌
+                      </span>
+                    </td>
+                    <td
+                      class="MuiTableCell-root-id MuiTableCell-body-id AttributeValues-columnStore-id"
+                    >
+                      <span
+                        class="Skeleton-skeleton-id"
+                        data-test-id="skeleton"
+                      >
+                        ‌
+                      </span>
+                    </td>
+                    <td
+                      class="MuiTableCell-root-id MuiTableCell-body-id AttributeValues-iconCell-id"
+                    >
+                      <button
+                        class="MuiButtonBase-root-id MuiIconButton-root-id MuiIconButton-disabled-id MuiButtonBase-disabled-id"
+                        disabled=""
+                        tabindex="-1"
+                        type="button"
+                      >
+                        <span
+                          class="MuiIconButton-label-id"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="MuiSvgIcon-root-id MuiSvgIcon-colorPrimary-id"
+                            focusable="false"
+                            viewBox="0 0 24 24"
+                          >
+                            <path
+                              d="M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6v12zM19 4h-3.5l-1-1h-5l-1 1H5v2h14V4z"
+                            />
+                          </svg>
+                        </span>
+                      </button>
                     </td>
                   </tr>
                 </tbody>
@@ -40886,10 +40961,84 @@ exports[`Storyshots Views / Attributes / Attribute details no values 1`] = `
                     class="MuiTableRow-root-id"
                   >
                     <td
-                      class="MuiTableCell-root-id MuiTableCell-body-id"
-                      colspan="2"
+                      class="MuiTableCell-root-id MuiTableCell-body-id SortableHandle-columnDrag-id"
                     >
-                      No values found
+                      <svg
+                        aria-hidden="true"
+                        class="MuiSvgIcon-root-id"
+                        focusable="false"
+                        viewBox="0 0 24 24"
+                      >
+                        <path
+                          clip-rule="evenodd"
+                          d="M3.5 2C3.5 2.82843 2.82843 3.5 2 3.5C1.17157 3.5 0.5 2.82843 0.5 2C0.5 1.17157 1.17157 0.5 2 0.5C2.82843 0.5 3.5 1.17157 3.5 2ZM4 2C4 3.10457 3.10457 4 2 4C0.895431 4 0 3.10457 0 2C0 0.895431 0.895431 0 2 0C3.10457 0 4 0.895431 4 2ZM9.5 2C9.5 2.82843 8.82843 3.5 8 3.5C7.17157 3.5 6.5 2.82843 6.5 2C6.5 1.17157 7.17157 0.5 8 0.5C8.82843 0.5 9.5 1.17157 9.5 2ZM10 2C10 3.10457 9.10457 4 8 4C6.89543 4 6 3.10457 6 2C6 0.895431 6.89543 0 8 0C9.10457 0 10 0.895431 10 2ZM8 9.5C8.82843 9.5 9.5 8.82843 9.5 8C9.5 7.17157 8.82843 6.5 8 6.5C7.17157 6.5 6.5 7.17157 6.5 8C6.5 8.82843 7.17157 9.5 8 9.5ZM8 10C9.10457 10 10 9.10457 10 8C10 6.89543 9.10457 6 8 6C6.89543 6 6 6.89543 6 8C6 9.10457 6.89543 10 8 10ZM3.5 8C3.5 8.82843 2.82843 9.5 2 9.5C1.17157 9.5 0.5 8.82843 0.5 8C0.5 7.17157 1.17157 6.5 2 6.5C2.82843 6.5 3.5 7.17157 3.5 8ZM4 8C4 9.10457 3.10457 10 2 10C0.895431 10 0 9.10457 0 8C0 6.89543 0.895431 6 2 6C3.10457 6 4 6.89543 4 8ZM2 15.5C2.82843 15.5 3.5 14.8284 3.5 14C3.5 13.1716 2.82843 12.5 2 12.5C1.17157 12.5 0.5 13.1716 0.5 14C0.5 14.8284 1.17157 15.5 2 15.5ZM2 16C3.10457 16 4 15.1046 4 14C4 12.8954 3.10457 12 2 12C0.895431 12 0 12.8954 0 14C0 15.1046 0.895431 16 2 16ZM9.5 14C9.5 14.8284 8.82843 15.5 8 15.5C7.17157 15.5 6.5 14.8284 6.5 14C6.5 13.1716 7.17157 12.5 8 12.5C8.82843 12.5 9.5 13.1716 9.5 14ZM10 14C10 15.1046 9.10457 16 8 16C6.89543 16 6 15.1046 6 14C6 12.8954 6.89543 12 8 12C9.10457 12 10 12.8954 10 14Z"
+                          fill="url(#paint0_linear)"
+                          fill-rule="evenodd"
+                          style="transform:translate(7px, 4px)"
+                        />
+                        <defs>
+                          <linearGradient
+                            gradientUnits="userSpaceOnUse"
+                            id="paint0_linear"
+                            x1="0"
+                            x2="16.0896"
+                            y1="0"
+                            y2="10.4478"
+                          >
+                            <stop
+                              stop-color="#06847B"
+                            />
+                            <stop
+                              offset="1"
+                              stop-color="#3EE7CD"
+                            />
+                          </linearGradient>
+                        </defs>
+                      </svg>
+                    </td>
+                    <td
+                      class="MuiTableCell-root-id MuiTableCell-body-id AttributeValues-columnAdmin-id"
+                    >
+                      <span
+                        class="Skeleton-skeleton-id"
+                        data-test-id="skeleton"
+                      >
+                        ‌
+                      </span>
+                    </td>
+                    <td
+                      class="MuiTableCell-root-id MuiTableCell-body-id AttributeValues-columnStore-id"
+                    >
+                      <span
+                        class="Skeleton-skeleton-id"
+                        data-test-id="skeleton"
+                      >
+                        ‌
+                      </span>
+                    </td>
+                    <td
+                      class="MuiTableCell-root-id MuiTableCell-body-id AttributeValues-iconCell-id"
+                    >
+                      <button
+                        class="MuiButtonBase-root-id MuiIconButton-root-id"
+                        tabindex="0"
+                        type="button"
+                      >
+                        <span
+                          class="MuiIconButton-label-id"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="MuiSvgIcon-root-id MuiSvgIcon-colorPrimary-id"
+                            focusable="false"
+                            viewBox="0 0 24 24"
+                          >
+                            <path
+                              d="M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6v12zM19 4h-3.5l-1-1h-5l-1 1H5v2h14V4z"
+                            />
+                          </svg>
+                        </span>
+                      </button>
                     </td>
                   </tr>
                 </tbody>
@@ -60837,6 +60986,42 @@ exports[`Storyshots Views / Collections / Collection detailsCollection details l
                   <tr
                     class="MuiTableRow-root-id MuiTableRow-head-id"
                   >
+                    <th
+                      class="MuiTableCell-root-id MuiTableCell-head-id MuiTableCell-paddingCheckbox-id"
+                      scope="col"
+                    >
+                      <span
+                        aria-disabled="true"
+                        class="MuiButtonBase-root-id MuiIconButton-root-id PrivateSwitchBase-root-id MuiCheckbox-root-id MuiCheckbox-colorPrimary-id PrivateSwitchBase-disabled-id MuiCheckbox-disabled-id MuiIconButton-colorPrimary-id MuiIconButton-disabled-id MuiButtonBase-disabled-id"
+                        tabindex="-1"
+                      >
+                        <span
+                          class="MuiIconButton-label-id"
+                        >
+                          <input
+                            class="PrivateSwitchBase-input-id"
+                            data-indeterminate="false"
+                            disabled=""
+                            type="checkbox"
+                          />
+                          <svg
+                            aria-hidden="true"
+                            class="MuiSvgIcon-root-id"
+                            focusable="false"
+                            viewBox="0 0 24 24"
+                          >
+                            <rect
+                              fill="none"
+                              height="14"
+                              stroke="currentColor"
+                              width="14"
+                              x="5"
+                              y="5"
+                            />
+                          </svg>
+                        </span>
+                      </span>
+                    </th>
                     <th
                       class="MuiTableCell-root-id MuiTableCell-head-id CollectionProducts-colName-id"
                       scope="col"
@@ -60936,16 +61121,119 @@ exports[`Storyshots Views / Collections / Collection detailsCollection details l
                   class="MuiTableBody-root-id"
                 >
                   <tr
-                    class="MuiTableRow-root-id"
+                    class="MuiTableRow-root-id CollectionProducts-tableRow-id"
                   >
                     <td
-                      class="MuiTableCell-root-id MuiTableCell-body-id"
-                    />
-                    <td
-                      class="MuiTableCell-root-id MuiTableCell-body-id"
-                      colspan="5"
+                      class="MuiTableCell-root-id MuiTableCell-body-id MuiTableCell-paddingCheckbox-id"
                     >
-                      No products found
+                      <span
+                        aria-disabled="true"
+                        class="MuiButtonBase-root-id MuiIconButton-root-id PrivateSwitchBase-root-id MuiCheckbox-root-id MuiCheckbox-colorPrimary-id PrivateSwitchBase-disabled-id MuiCheckbox-disabled-id MuiIconButton-colorPrimary-id MuiIconButton-disabled-id MuiButtonBase-disabled-id"
+                        tabindex="-1"
+                      >
+                        <span
+                          class="MuiIconButton-label-id"
+                        >
+                          <input
+                            class="PrivateSwitchBase-input-id"
+                            data-indeterminate="false"
+                            disabled=""
+                            type="checkbox"
+                          />
+                          <svg
+                            aria-hidden="true"
+                            class="MuiSvgIcon-root-id"
+                            focusable="false"
+                            viewBox="0 0 24 24"
+                          >
+                            <rect
+                              fill="none"
+                              height="14"
+                              stroke="currentColor"
+                              width="14"
+                              x="5"
+                              y="5"
+                            />
+                          </svg>
+                        </span>
+                      </span>
+                    </td>
+                    <td
+                      class="MuiTableCell-root-id MuiTableCell-body-id TableCellAvatar-root-id CollectionProducts-colName-id"
+                    >
+                      <div
+                        class="Avatar-content-id"
+                      >
+                        <div
+                          class="MuiAvatar-root-id MuiAvatar-circle-id Avatar-avatar-id MuiAvatar-colorDefault-id"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="MuiSvgIcon-root-id MuiSvgIcon-colorPrimary-id"
+                            focusable="false"
+                            viewBox="0 0 24 24"
+                          >
+                            <path
+                              d="M19 8l-4 4h3c0 3.31-2.69 6-6 6-1.01 0-1.97-.25-2.8-.7l-1.46 1.46C8.97 19.54 10.43 20 12 20c4.42 0 8-3.58 8-8h3l-4-4zM6 12c0-3.31 2.69-6 6-6 1.01 0 1.97.25 2.8.7l1.46-1.46C15.03 4.46 13.57 4 12 4c-4.42 0-8 3.58-8 8H1l4 4 4-4H6z"
+                            />
+                          </svg>
+                        </div>
+                        <div
+                          class="Avatar-children-id"
+                        >
+                          <span
+                            class="Skeleton-skeleton-id"
+                            data-test-id="skeleton"
+                          >
+                            ‌
+                          </span>
+                        </div>
+                      </div>
+                    </td>
+                    <td
+                      class="MuiTableCell-root-id MuiTableCell-body-id CollectionProducts-colType-id"
+                    >
+                      <span
+                        class="Skeleton-skeleton-id"
+                        data-test-id="skeleton"
+                      >
+                        ‌
+                      </span>
+                    </td>
+                    <td
+                      class="MuiTableCell-root-id MuiTableCell-body-id CollectionProducts-colType-id"
+                    >
+                      <span
+                        class="Skeleton-skeleton-id"
+                        data-test-id="skeleton"
+                      >
+                        ‌
+                      </span>
+                    </td>
+                    <td
+                      class="MuiTableCell-root-id MuiTableCell-body-id CollectionProducts-colActions-id"
+                    >
+                      <button
+                        class="MuiButtonBase-root-id MuiIconButton-root-id MuiIconButton-disabled-id MuiButtonBase-disabled-id"
+                        disabled=""
+                        tabindex="-1"
+                        type="button"
+                      >
+                        <span
+                          class="MuiIconButton-label-id"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="MuiSvgIcon-root-id MuiSvgIcon-colorPrimary-id"
+                            focusable="false"
+                            viewBox="0 0 24 24"
+                          >
+                            <path
+                              d="M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6v12zM19 4h-3.5l-1-1h-5l-1 1H5v2h14V4z"
+                            />
+                          </svg>
+                        </span>
+                      </button>
                     </td>
                   </tr>
                 </tbody>
@@ -75491,9 +75779,43 @@ exports[`Storyshots Views / Customers / Customer details loading 1`] = `
                   >
                     <td
                       class="MuiTableCell-root-id MuiTableCell-body-id"
-                      colspan="6"
                     >
-                      No orders found
+                      <span
+                        class="Skeleton-skeleton-id"
+                        data-test-id="skeleton"
+                      >
+                        ‌
+                      </span>
+                    </td>
+                    <td
+                      class="MuiTableCell-root-id MuiTableCell-body-id"
+                    >
+                      <span
+                        class="Skeleton-skeleton-id"
+                        data-test-id="skeleton"
+                      >
+                        ‌
+                      </span>
+                    </td>
+                    <td
+                      class="MuiTableCell-root-id MuiTableCell-body-id"
+                    >
+                      <span
+                        class="Skeleton-skeleton-id"
+                        data-test-id="skeleton"
+                      >
+                        ‌
+                      </span>
+                    </td>
+                    <td
+                      class="MuiTableCell-root-id MuiTableCell-body-id CustomerOrders-textRight-id"
+                    >
+                      <span
+                        class="Skeleton-skeleton-id"
+                        data-test-id="skeleton"
+                      >
+                        ‌
+                      </span>
                     </td>
                   </tr>
                 </tbody>
@@ -89037,6 +89359,42 @@ exports[`Storyshots Views / Discounts / Sale details loading 1`] = `
                   <tr
                     class="MuiTableRow-root-id MuiTableRow-head-id"
                   >
+                    <th
+                      class="MuiTableCell-root-id MuiTableCell-head-id MuiTableCell-paddingCheckbox-id"
+                      scope="col"
+                    >
+                      <span
+                        aria-disabled="true"
+                        class="MuiButtonBase-root-id MuiIconButton-root-id PrivateSwitchBase-root-id MuiCheckbox-root-id MuiCheckbox-colorPrimary-id PrivateSwitchBase-disabled-id MuiCheckbox-disabled-id MuiIconButton-colorPrimary-id MuiIconButton-disabled-id MuiButtonBase-disabled-id"
+                        tabindex="-1"
+                      >
+                        <span
+                          class="MuiIconButton-label-id"
+                        >
+                          <input
+                            class="PrivateSwitchBase-input-id"
+                            data-indeterminate="false"
+                            disabled=""
+                            type="checkbox"
+                          />
+                          <svg
+                            aria-hidden="true"
+                            class="MuiSvgIcon-root-id"
+                            focusable="false"
+                            viewBox="0 0 24 24"
+                          >
+                            <rect
+                              fill="none"
+                              height="14"
+                              stroke="currentColor"
+                              width="14"
+                              x="5"
+                              y="5"
+                            />
+                          </svg>
+                        </span>
+                      </span>
+                    </th>
                     <th
                       class="MuiTableCell-root-id MuiTableCell-head-id DiscountCategories-colName-id"
                       scope="col"
@@ -89127,13 +89485,87 @@ exports[`Storyshots Views / Discounts / Sale details loading 1`] = `
                   class="MuiTableBody-root-id"
                 >
                   <tr
-                    class="MuiTableRow-root-id"
+                    class="MuiTableRow-root-id DiscountCategories-tableRow-id"
                   >
                     <td
-                      class="MuiTableCell-root-id MuiTableCell-body-id"
-                      colspan="4"
+                      class="MuiTableCell-root-id MuiTableCell-body-id MuiTableCell-paddingCheckbox-id"
                     >
-                      No categories found
+                      <span
+                        aria-disabled="true"
+                        class="MuiButtonBase-root-id MuiIconButton-root-id PrivateSwitchBase-root-id MuiCheckbox-root-id MuiCheckbox-colorPrimary-id PrivateSwitchBase-disabled-id MuiCheckbox-disabled-id MuiIconButton-colorPrimary-id MuiIconButton-disabled-id MuiButtonBase-disabled-id"
+                        tabindex="-1"
+                      >
+                        <span
+                          class="MuiIconButton-label-id"
+                        >
+                          <input
+                            class="PrivateSwitchBase-input-id"
+                            data-indeterminate="false"
+                            disabled=""
+                            type="checkbox"
+                          />
+                          <svg
+                            aria-hidden="true"
+                            class="MuiSvgIcon-root-id"
+                            focusable="false"
+                            viewBox="0 0 24 24"
+                          >
+                            <rect
+                              fill="none"
+                              height="14"
+                              stroke="currentColor"
+                              width="14"
+                              x="5"
+                              y="5"
+                            />
+                          </svg>
+                        </span>
+                      </span>
+                    </td>
+                    <td
+                      class="MuiTableCell-root-id MuiTableCell-body-id"
+                    >
+                      <span
+                        class="Skeleton-skeleton-id"
+                        data-test-id="skeleton"
+                      >
+                        ‌
+                      </span>
+                    </td>
+                    <td
+                      class="MuiTableCell-root-id MuiTableCell-body-id DiscountCategories-colProducts-id"
+                    >
+                      <span
+                        class="Skeleton-skeleton-id"
+                        data-test-id="skeleton"
+                      >
+                        ‌
+                      </span>
+                    </td>
+                    <td
+                      class="MuiTableCell-root-id MuiTableCell-body-id DiscountCategories-colActions-id"
+                    >
+                      <button
+                        class="MuiButtonBase-root-id MuiIconButton-root-id MuiIconButton-disabled-id MuiButtonBase-disabled-id"
+                        disabled=""
+                        tabindex="-1"
+                        type="button"
+                      >
+                        <span
+                          class="MuiIconButton-label-id"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="MuiSvgIcon-root-id MuiSvgIcon-colorPrimary-id"
+                            focusable="false"
+                            viewBox="0 0 24 24"
+                          >
+                            <path
+                              d="M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6v12zM19 4h-3.5l-1-1h-5l-1 1H5v2h14V4z"
+                            />
+                          </svg>
+                        </span>
+                      </button>
                     </td>
                   </tr>
                 </tbody>
@@ -230098,10 +230530,95 @@ exports[`Storyshots Views / Shipping / Shipping rate loading 1`] = `
                     class="MuiTableRow-root-id"
                   >
                     <td
-                      class="MuiTableCell-root-id MuiTableCell-body-id"
-                      colspan="5"
+                      class="MuiTableCell-root-id MuiTableCell-body-id MuiTableCell-paddingCheckbox-id"
                     >
-                      No Products
+                      <span
+                        aria-disabled="true"
+                        class="MuiButtonBase-root-id MuiIconButton-root-id PrivateSwitchBase-root-id MuiCheckbox-root-id MuiCheckbox-colorPrimary-id PrivateSwitchBase-disabled-id MuiCheckbox-disabled-id MuiIconButton-colorPrimary-id MuiIconButton-disabled-id MuiButtonBase-disabled-id"
+                        tabindex="-1"
+                      >
+                        <span
+                          class="MuiIconButton-label-id"
+                        >
+                          <input
+                            class="PrivateSwitchBase-input-id"
+                            data-indeterminate="false"
+                            disabled=""
+                            type="checkbox"
+                          />
+                          <svg
+                            aria-hidden="true"
+                            class="MuiSvgIcon-root-id"
+                            focusable="false"
+                            viewBox="0 0 24 24"
+                          >
+                            <rect
+                              fill="none"
+                              height="14"
+                              stroke="currentColor"
+                              width="14"
+                              x="5"
+                              y="5"
+                            />
+                          </svg>
+                        </span>
+                      </span>
+                    </td>
+                    <td
+                      class="MuiTableCell-root-id MuiTableCell-body-id TableCellAvatar-root-id ShippingMethodProducts-colName-id"
+                    >
+                      <div
+                        class="Avatar-content-id"
+                      >
+                        <div
+                          class="MuiAvatar-root-id MuiAvatar-circle-id Avatar-avatar-id MuiAvatar-colorDefault-id"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="MuiSvgIcon-root-id MuiSvgIcon-colorPrimary-id"
+                            focusable="false"
+                            viewBox="0 0 24 24"
+                          >
+                            <path
+                              d="M19 8l-4 4h3c0 3.31-2.69 6-6 6-1.01 0-1.97-.25-2.8-.7l-1.46 1.46C8.97 19.54 10.43 20 12 20c4.42 0 8-3.58 8-8h3l-4-4zM6 12c0-3.31 2.69-6 6-6 1.01 0 1.97.25 2.8.7l1.46-1.46C15.03 4.46 13.57 4 12 4c-4.42 0-8 3.58-8 8H1l4 4 4-4H6z"
+                            />
+                          </svg>
+                        </div>
+                        <div
+                          class="Avatar-children-id"
+                        >
+                          <span
+                            class="Skeleton-skeleton-id"
+                            data-test-id="skeleton"
+                          >
+                            ‌
+                          </span>
+                        </div>
+                      </div>
+                    </td>
+                    <td
+                      class="MuiTableCell-root-id MuiTableCell-body-id ShippingMethodProducts-colAction-id"
+                    >
+                      <button
+                        class="MuiButtonBase-root-id MuiIconButton-root-id"
+                        tabindex="0"
+                        type="button"
+                      >
+                        <span
+                          class="MuiIconButton-label-id"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="MuiSvgIcon-root-id MuiSvgIcon-colorPrimary-id"
+                            focusable="false"
+                            viewBox="0 0 24 24"
+                          >
+                            <path
+                              d="M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6v12zM19 4h-3.5l-1-1h-5l-1 1H5v2h14V4z"
+                            />
+                          </svg>
+                        </span>
+                      </button>
                     </td>
                   </tr>
                 </tbody>
@@ -248267,11 +248784,12 @@ exports[`Storyshots Views / Warehouses / Warehouse details loading 1`] = `
             <div
               class="MuiCardContent-root-id"
             >
-              <div
-                class="MuiTypography-root-id MuiTypography-body1-id MuiTypography-colorTextSecondary-id"
+              <span
+                class="Skeleton-skeleton-id"
+                data-test-id="skeleton"
               >
-                This warehouse has no shipping zones assigned.
-              </div>
+                ‌
+              </span>
             </div>
           </div>
         </div>
diff --git a/src/warehouses/components/WarehouseList/WarehouseList.tsx b/src/warehouses/components/WarehouseList/WarehouseList.tsx
index 2b2eeb8f1..d96da07d6 100644
--- a/src/warehouses/components/WarehouseList/WarehouseList.tsx
+++ b/src/warehouses/components/WarehouseList/WarehouseList.tsx
@@ -132,7 +132,7 @@ const WarehouseList: React.FC<WarehouseListProps> = props => {
               className={classes.tableRow}
               hover={!!warehouse}
               onClick={warehouse ? onRowClick(warehouse.id) : undefined}
-              key={warehouse ? warehouse.id : "n/a"}
+              key={warehouse ? warehouse.id : "skeleton"}
               data-test="warehouseEntry"
               data-testid={warehouse?.name.toLowerCase().replace(" ", "")}
             >
@@ -140,9 +140,13 @@ const WarehouseList: React.FC<WarehouseListProps> = props => {
                 {maybe<React.ReactNode>(() => warehouse.name, <Skeleton />)}
               </TableCell>
               <TableCell className={classes.colZones} data-test="zones">
-                {mapEdgesToItems(warehouse?.shippingZones)
-                  .map(({ name }) => name)
-                  .join(", ") || "-"}
+                {disabled ? (
+                  <Skeleton />
+                ) : (
+                  mapEdgesToItems(warehouse?.shippingZones)
+                    ?.map(({ name }) => name)
+                    .join(", ") || "-"
+                )}
               </TableCell>
               <TableCell className={classes.colActions}>
                 <div className={classes.actions}>