diff --git a/src/storybook/__snapshots__/Stories.test.ts.snap b/src/storybook/__snapshots__/Stories.test.ts.snap
index 904d7b571..3d0634383 100644
--- a/src/storybook/__snapshots__/Stories.test.ts.snap
+++ b/src/storybook/__snapshots__/Stories.test.ts.snap
@@ -90931,7 +90931,7 @@ exports[`Storyshots Views / Products / Create product variant with errors 1`] =
                     class="MuiFormControl-root-id MuiFormControl-fullWidth-id"
                   >
                     <label
-                      class="MuiFormLabel-root-id MuiFormLabel-error-id MuiInputLabel-error-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-outlined-id"
+                      class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-outlined-id"
                       data-shrink="false"
                     >
                       Color
@@ -90939,7 +90939,7 @@ exports[`Storyshots Views / Products / Create product variant with errors 1`] =
                     <div
                       aria-autocomplete="list"
                       aria-expanded="false"
-                      class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-error-id MuiOutlinedInput-error-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
+                      class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
                       role="combobox"
                     >
                       <fieldset
@@ -90957,7 +90957,7 @@ exports[`Storyshots Views / Products / Create product variant with errors 1`] =
                         </legend>
                       </fieldset>
                       <input
-                        aria-invalid="true"
+                        aria-invalid="false"
                         autocomplete="off"
                         class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
                         type="text"
@@ -90981,14 +90981,22 @@ exports[`Storyshots Views / Products / Create product variant with errors 1`] =
                         </svg>
                       </div>
                     </div>
-                    <p
-                      class="MuiFormHelperText-root-id MuiFormHelperText-contained-id MuiFormHelperText-error-id"
-                    >
-                      Generic form error
-                    </p>
                   </div>
                 </div>
               </div>
+              <div
+                class="FormSpacer-spacer-id"
+              />
+              <p
+                class="MuiTypography-root-id MuiTypography-body2-id MuiTypography-colorError-id"
+              >
+                All attributes should have value
+              </p>
+              <p
+                class="MuiTypography-root-id MuiTypography-body2-id MuiTypography-colorError-id"
+              >
+                This variant already exists
+              </p>
             </div>
           </div>
           <div
@@ -91198,13 +91206,13 @@ exports[`Storyshots Views / Products / Create product variant with errors 1`] =
                     class="MuiFormControl-root-id MuiFormControl-fullWidth-id"
                   >
                     <label
-                      class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-outlined-id"
+                      class="MuiFormLabel-root-id MuiFormLabel-error-id MuiInputLabel-error-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-outlined-id"
                       data-shrink="false"
                     >
                       SKU (Stock Keeping Unit)
                     </label>
                     <div
-                      class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
+                      class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-error-id MuiOutlinedInput-error-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
                     >
                       <fieldset
                         aria-hidden="true"
@@ -91221,13 +91229,18 @@ exports[`Storyshots Views / Products / Create product variant with errors 1`] =
                         </legend>
                       </fieldset>
                       <input
-                        aria-invalid="false"
+                        aria-invalid="true"
                         class="MuiInputBase-input-id MuiOutlinedInput-input-id"
                         name="sku"
                         type="text"
                         value=""
                       />
                     </div>
+                    <p
+                      class="MuiFormHelperText-root-id MuiFormHelperText-contained-id MuiFormHelperText-error-id"
+                    >
+                      Generic form error
+                    </p>
                   </div>
                 </div>
               </div>
@@ -106235,7 +106248,7 @@ exports[`Storyshots Views / Products / Product variant details attribute errors
                     class="MuiFormControl-root-id MuiFormControl-fullWidth-id"
                   >
                     <label
-                      class="MuiFormLabel-root-id MuiFormLabel-error-id MuiInputLabel-error-id MuiFormLabel-filled-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-shrink-id MuiInputLabel-outlined-id"
+                      class="MuiFormLabel-root-id MuiFormLabel-filled-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-shrink-id MuiInputLabel-outlined-id"
                       data-shrink="true"
                     >
                       Borders
@@ -106243,7 +106256,7 @@ exports[`Storyshots Views / Products / Product variant details attribute errors
                     <div
                       aria-autocomplete="list"
                       aria-expanded="false"
-                      class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-error-id MuiOutlinedInput-error-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
+                      class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
                       role="combobox"
                     >
                       <fieldset
@@ -106261,7 +106274,7 @@ exports[`Storyshots Views / Products / Product variant details attribute errors
                         </legend>
                       </fieldset>
                       <input
-                        aria-invalid="true"
+                        aria-invalid="false"
                         autocomplete="off"
                         class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
                         type="text"
@@ -106285,11 +106298,6 @@ exports[`Storyshots Views / Products / Product variant details attribute errors
                         </svg>
                       </div>
                     </div>
-                    <p
-                      class="MuiFormHelperText-root-id MuiFormHelperText-contained-id MuiFormHelperText-error-id MuiFormHelperText-filled-id"
-                    >
-                      Generic form error
-                    </p>
                   </div>
                 </div>
                 <div
@@ -106300,7 +106308,7 @@ exports[`Storyshots Views / Products / Product variant details attribute errors
                     class="MuiFormControl-root-id MuiFormControl-fullWidth-id"
                   >
                     <label
-                      class="MuiFormLabel-root-id MuiFormLabel-error-id MuiInputLabel-error-id MuiFormLabel-filled-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-shrink-id MuiInputLabel-outlined-id"
+                      class="MuiFormLabel-root-id MuiFormLabel-filled-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-shrink-id MuiInputLabel-outlined-id"
                       data-shrink="true"
                     >
                       Legacy
@@ -106308,7 +106316,7 @@ exports[`Storyshots Views / Products / Product variant details attribute errors
                     <div
                       aria-autocomplete="list"
                       aria-expanded="false"
-                      class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-error-id MuiOutlinedInput-error-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
+                      class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
                       role="combobox"
                     >
                       <fieldset
@@ -106326,7 +106334,7 @@ exports[`Storyshots Views / Products / Product variant details attribute errors
                         </legend>
                       </fieldset>
                       <input
-                        aria-invalid="true"
+                        aria-invalid="false"
                         autocomplete="off"
                         class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
                         type="text"
@@ -106350,14 +106358,22 @@ exports[`Storyshots Views / Products / Product variant details attribute errors
                         </svg>
                       </div>
                     </div>
-                    <p
-                      class="MuiFormHelperText-root-id MuiFormHelperText-contained-id MuiFormHelperText-error-id MuiFormHelperText-filled-id"
-                    >
-                      Generic form error
-                    </p>
                   </div>
                 </div>
               </div>
+              <div
+                class="FormSpacer-spacer-id"
+              />
+              <p
+                class="MuiTypography-root-id MuiTypography-body2-id MuiTypography-colorError-id"
+              >
+                All attributes should have value
+              </p>
+              <p
+                class="MuiTypography-root-id MuiTypography-body2-id MuiTypography-colorError-id"
+              >
+                This variant already exists
+              </p>
             </div>
           </div>
           <div
@@ -106649,13 +106665,13 @@ exports[`Storyshots Views / Products / Product variant details attribute errors
                     class="MuiFormControl-root-id MuiFormControl-fullWidth-id"
                   >
                     <label
-                      class="MuiFormLabel-root-id MuiFormLabel-filled-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-shrink-id MuiInputLabel-outlined-id"
+                      class="MuiFormLabel-root-id MuiFormLabel-error-id MuiInputLabel-error-id MuiFormLabel-filled-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-shrink-id MuiInputLabel-outlined-id"
                       data-shrink="true"
                     >
                       SKU (Stock Keeping Unit)
                     </label>
                     <div
-                      class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
+                      class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-error-id MuiOutlinedInput-error-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
                     >
                       <fieldset
                         aria-hidden="true"
@@ -106672,13 +106688,18 @@ exports[`Storyshots Views / Products / Product variant details attribute errors
                         </legend>
                       </fieldset>
                       <input
-                        aria-invalid="false"
+                        aria-invalid="true"
                         class="MuiInputBase-input-id MuiOutlinedInput-input-id"
                         name="sku"
                         type="text"
                         value="1230959124123"
                       />
                     </div>
+                    <p
+                      class="MuiFormHelperText-root-id MuiFormHelperText-contained-id MuiFormHelperText-error-id MuiFormHelperText-filled-id"
+                    >
+                      Generic form error
+                    </p>
                   </div>
                 </div>
               </div>