Compare commits

..

No commits in common. "f4645fc14a9e959584dd4667e4a8c745d7a2c9b0" and "30e05b353da9ad18b0cec01880012c0967733576" 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;
}