Merge branch 'next' into pause-sla-timer

freshworks · Apr 3, 2024 · be4a175 · be4a175
2 parents c34ac6f + 3d5df95
commit be4a175
Showing 1 changed file with 17 additions and 15 deletions.
diff --git a/...yons-extended/custom-objects/src/components/form-builder/components/fb-field-dropdown.tsx b/...yons-extended/custom-objects/src/components/form-builder/components/fb-field-dropdown.tsx
@@ -456,21 +456,23 @@ export class FbFieldDropdown {
                 {i18nText('addChoice')}
               </fw-button>
             )}
-            {this.enableBulkChoices && (this.parentId || this.level === 1) && (
-              <fw-button
-                id='addNewChoiceBtn'
-                color='link'
-                disabled={this.boolExceededChoiceLimit}
-                onFwClick={this.openBulkChoiceModal}
-              >
-                <fw-icon
-                  name='circle-plus'
-                  size='16'
-                  slot='before-label'
-                ></fw-icon>
-                {i18nText('addBulkChoice')}
-              </fw-button>
-            )}
+            {!this.disabled &&
+              this.enableBulkChoices &&
+              (this.parentId || this.level === 1) && (
+                <fw-button
+                  id='addNewChoiceBtn'
+                  color='link'
+                  disabled={this.boolExceededChoiceLimit}
+                  onFwClick={this.openBulkChoiceModal}
+                >
+                  <fw-icon
+                    name='circle-plus'
+                    size='16'
+                    slot='before-label'
+                  ></fw-icon>
+                  {i18nText('addBulkChoice')}
+                </fw-button>
+              )}
             {this.boolExceededChoiceLimit && (
               <label class={`${strBaseClassName}-warning-text`}>
                 {strExceedLimitChoicesWarning}