refactor(FE): Fix loading state for flag and sub-flag dropdowns

2026-05-20 21:41:57 +00:00 · 2026-03-02 14:12:42 +07:00
parent eafcfd2f28
commit c6b906a28e
1 changed files with 2 additions and 2 deletions
@@ -491,7 +491,7 @@ const ProductForm = ({ type = 'add', initialValues }: ProductFormProps) => {
                  formik.setFieldValue('sub_flags', []);
                }}
                options={productFlagMapping?.flags ?? []}
-                isLoading={isLoadingConstants}
+                isLoading={isLoadingConstants && !productFlagMapping}
                isError={formik.touched.flag && Boolean(formik.errors.flag)}
                errorMessage={formik.errors.flag as string}
                isDisabled={type === 'detail'}
@@ -512,7 +512,7 @@ const ProductForm = ({ type = 'add', initialValues }: ProductFormProps) => {
                  );
                }}
                options={subFlagOptions}
-                isLoading={isLoadingConstants}
+                isLoading={isLoadingConstants && !productFlagMapping}
                isError={
                  formik.touched.sub_flags && Boolean(formik.errors.sub_flags)
                }