fix(dashboard,promotion): percentage promotions + set currency code on percentage promotions (#13161)

packages/admin/dashboard/src/routes/campaigns/common/components/create-campaign-form-fields/create-campaign-form-fields.tsx

@@ -47,12 +47,10 @@ export const CreateCampaignFormFields = ({ form, fieldScope = "" }) => {
 
     if (isTypeSpend) {
       form.setValue(`campaign.budget.currency_code`, promotionCurrencyValue)
-    }
+    } else {
-
-    if (watchValueType === "usage") {
       form.setValue(`campaign.budget.currency_code`, null)
     }
-  }, [watchValueType])
+  }, [promotionCurrencyValue, isTypeSpend])
 
   if (promotionCurrencyValue) {
     const formCampaignBudget = form.getValues().campaign?.budget

packages/admin/dashboard/src/routes/promotions/common/edit-rules/components/rules-form-field/rules-form-field.tsx

@@ -128,7 +128,7 @@ export const RulesFormField = ({
         {t(`promotions.fields.conditions.${ruleType}.description`)}
       </Text>
 
-      {fields.map((fieldRule: any, index) => {
+      {fields.map((fieldRule, index) => {
         const identifier = fieldRule.id
 
         return (
@@ -157,11 +157,23 @@ export const RulesFormField = ({
                         (ao) => ao.id === e
                       )
 
-                      update(index, {
+                      const fieldRuleOverrides: typeof fieldRule = {
                         ...fieldRule,
-                        values: [],
                         disguised: currentAttributeOption?.disguised || false,
-                      })
+                      }
+
+                      if (currentAttributeOption?.operators?.length === 1) {
+                        fieldRuleOverrides.operator =
+                          currentAttributeOption.operators[0].value
+                      }
+
+                      if (fieldRuleOverrides.operator === "eq") {
+                        fieldRuleOverrides.values = ""
+                      } else {
+                        fieldRuleOverrides.values = []
+                      }
+
+                      update(index, fieldRuleOverrides)
                       onChange(e)
                     }
 

packages/admin/dashboard/src/routes/promotions/promotion-create/components/create-promotion-form/create-promotion-form.tsx

@@ -299,7 +299,7 @@ export const CreatePromotionForm = () => {
   const formData = form.getValues()
   let campaignQuery: object = {}
 
-  if (isFixedValueType && formData.application_method.currency_code) {
+  if (formData.application_method.currency_code) {
     campaignQuery = {
       budget: { currency_code: formData.application_method.currency_code },
     }

packages/modules/promotion/src/services/promotion-module.ts

@@ -521,7 +521,7 @@ export default class PromotionModuleService
       }
 
       const isCurrencyCodeValid =
-        !isDefined(applicationMethod.currency_code) ||
+        !isPresent(applicationMethod.currency_code) ||
         applicationContext.currency_code === applicationMethod.currency_code
 
       const isPromotionApplicable = areRulesValidForContext(