Move pro conditions out of advanced section

assets/javascripts/discourse/templates/components/wizard-custom-field.hbs

@@ -207,13 +207,7 @@
   </div>
 {{/if}}
 
-{{#if showAdvanced}}
+{{#if proSubscribed}}
-  {{wizard-advanced-toggle showAdvanced=field.showAdvanced}}
-
-  {{#if field.showAdvanced}}
-    <div class="advanced-settings">
-
-      {{#if proSubscribed}}
   <div class="setting full field-mapper-setting pro">
     <div class="setting-label">
       <label>{{i18n "admin.wizard.condition"}}</label>
@@ -226,7 +220,13 @@
         options=fieldConditionOptions}}
     </div>
   </div>
-      {{/if}}
+{{/if}}
+
+{{#if showAdvanced}}
+  {{wizard-advanced-toggle showAdvanced=field.showAdvanced}}
+
+  {{#if field.showAdvanced}}
+    <div class="advanced-settings">
 
       <div class="setting full field-mapper-setting">
         <div class="setting-label">

assets/javascripts/discourse/templates/components/wizard-custom-step.hbs

@@ -33,12 +33,7 @@
   </div>
 </div>
 
-{{wizard-advanced-toggle showAdvanced=step.showAdvanced}}
+{{#if proSubscribed}}
-
-{{#if step.showAdvanced}}
-  <div class="advanced-settings">
-
-    {{#if proSubscribed}}
   <div class="setting full field-mapper-setting pro">
     <div class="setting-label">
       <label>{{i18n "admin.wizard.condition"}}</label>
@@ -60,7 +55,12 @@
       <span>{{i18n "admin.wizard.step.force_final.description"}}</span>
     </div>
   </div>
-    {{/if}}
+{{/if}}
+
+{{wizard-advanced-toggle showAdvanced=step.showAdvanced}}
+
+{{#if step.showAdvanced}}
+  <div class="advanced-settings">
 
     <div class="setting full field-mapper-setting">
       <div class="setting-label">