Libra CodeHub

CedarCopilot/cedar-mail

Branch: staging

fix(settings): merge nested user-settings patches instead of replacing them

merged#2583CedarCopilot

CedarCopilot wants to merge 3 commits into staging from fix/user-settings-deep-merge

8 files changed

Libra does not show diffs here. View the full diff on GitHub.

  • modifiedapps/server/src/db/migrations/scripts/account-setup/__tests__/phase9-notifications.test.ts+6-4
  • modifiedapps/server/src/db/migrations/scripts/account-setup/phase9-notifications.ts+7-5
  • addedapps/server/src/services/users/__tests__/user-settings-merge.test.ts+450-0
  • modifiedapps/server/src/services/users/__tests__/user-settings.test.ts+10-23
  • modifiedapps/server/src/services/users/user-settings.ts+147-58
  • modifiedapps/server/src/trpc/routes/__tests__/settings-router.test.ts+37-45
  • modifiedapps/server/src/trpc/routes/cedar-admin.ts+11-46
  • modifiedapps/server/src/trpc/routes/settings.ts+30-62