Compare commits

..

No commits in common. "000ed8b4b6e971d6411c1f17333084c0e470fd21" and "473d055777a2e559a8f514f45a9c24197d0e65c8" have entirely different histories.

View File

@ -112,9 +112,7 @@ export default class UserController extends ApiController {
});
if (!manageSubscriptionRules[0]) return;
// Merge subscription rules with existing rules instead of replacing them
const subscriptionRules = manageSubscriptionRules[0].rules!.map((rule) => rule.name) || [];
payload.rules = [...new Set([...payload.rules, ...subscriptionRules])];
payload.rules = manageSubscriptionRules[0].rules!.map((rule) => rule.name) || [];
isSubscribed = true;
}
@ -175,9 +173,7 @@ export default class UserController extends ApiController {
});
if (!manageSubscriptionRules[0]) return;
// Merge subscription rules with existing rules instead of replacing them
const subscriptionRules = manageSubscriptionRules[0].rules!.map((rule) => rule.name) || [];
newUserPayload.rules = [...new Set([...newUserPayload.rules, ...subscriptionRules])];
newUserPayload.rules = manageSubscriptionRules[0].rules!.map((rule) => rule.name) || [];
isSubscribed = true;
}