Round 4 nits: kill-switch test clarity, sequence cast mask, preferences toast notice

Author: tjementum

application/account/Core/Features/Tenants/Domain/TenantRepository.cs

@@ -188,9 +188,9 @@ public async Task<int> GetNextRolloutIndexUnfilteredAsync(CancellationToken canc
             .SingleAsync(cancellationToken);
 
         // Sequence is seeded at COUNT(*)+1, so the first nextval after migration equals the previous COUNT+1.
-        // Subtracting 1 preserves the original count-based contract used by Tenant.Create. Modulo int.MaxValue
-        // keeps the cast from overflowing to a negative value past 2.1B cumulative inserts (including
-        // failed/rolled-back inserts that leak sequence values).
-        return (int)((nextSequenceValue - 1) % int.MaxValue);
+        // Subtracting 1 preserves the original count-based contract used by Tenant.Create. The mask keeps
+        // the cast non-negative past 2.1B cumulative inserts (including rolled-back/leaked values) while
+        // preserving int.MaxValue itself (the `% int.MaxValue` form silently collapses that value to 0).
+        return (int)((nextSequenceValue - 1) & 0x7FFF_FFFF);
     }
 }

application/account/Core/Features/Users/Domain/UserRepository.cs

@@ -580,10 +580,10 @@ public async Task<int> GetNextRolloutIndexUnfilteredAsync(CancellationToken canc
             .SingleAsync(cancellationToken);
 
         // Sequence is seeded at COUNT(*)+1, so the first nextval after migration equals the previous COUNT+1.
-        // Subtracting 1 preserves the original count-based contract used by User.Create. Modulo int.MaxValue
-        // keeps the cast from overflowing to a negative value past 2.1B cumulative inserts (including
-        // failed/rolled-back inserts that leak sequence values).
-        return (int)((nextSequenceValue - 1) % int.MaxValue);
+        // Subtracting 1 preserves the original count-based contract used by User.Create. The mask keeps
+        // the cast non-negative past 2.1B cumulative inserts (including rolled-back/leaked values) while
+        // preserving int.MaxValue itself (the `% int.MaxValue` form silently collapses that value to 0).
+        return (int)((nextSequenceValue - 1) & 0x7FFF_FFFF);
     }
 
     /// <summary>

application/account/Tests/FeatureFlags/FeatureFlagEvaluatorTests.cs

@@ -63,18 +63,19 @@ public async Task Evaluate_WhenBaseRowInactive_ShouldReturnEmpty()
     [Fact]
     public async Task Evaluate_WhenManualOverrideEnabledAndBaseRowInactive_ShouldExcludeFlag()
     {
-        // Arrange — base row is inactive (admin Deactivate); tenant has an active manual override.
-        // Per the documented precedence chain, an inactive base row is the global kill switch and
-        // short-circuits before the manual-override step is reached.
+        // Arrange — beta-features is a kill-switch flag and the base row is left inactive (the panic
+        // button is pulled). The tenant has an active manual override. Per the documented precedence
+        // chain, an inactive base row short-circuits before the manual-override step is reached so
+        // pulling the kill switch is truly global, even for tenants admins had explicitly opted in.
         var now = TimeProvider.System.GetUtcNow();
-        InsertFeatureFlag("sso", null, null, null, null, null, null);
-        InsertFeatureFlag("sso", DatabaseSeeder.Tenant1.Id.Value, null, now, null, null, null);
+        InsertFeatureFlag("beta-features", null, null, null, null, null, null);
+        InsertFeatureFlag("beta-features", DatabaseSeeder.Tenant1.Id.Value, null, now, null, null, null);
 
         // Act
         var result = await _evaluationService.EvaluateAsync(DatabaseSeeder.Tenant1.Id, DatabaseSeeder.Tenant1Owner.Id, 50, 50, null, null, CancellationToken.None);
 
         // Assert
-        result.Should().NotContain("sso");
+        result.Should().NotContain("beta-features");
     }
 
     [Fact]

application/account/WebApp/routes/user/preferences/-components/PreferencesFeatureFlagsSection.tsx

@@ -44,7 +44,9 @@ function UserFlagToggle({ flagKey, enabled }: Readonly<UserFlag>) {
 
   const toggleMutation = api.useMutation("put", "/api/account/feature-flags/{flagKey}/user-override", {
     onSuccess: () => {
-      toast.success(t`Preference updated successfully`, { description: label.name });
+      toast.success(t`Preference updated successfully`, {
+        description: `${label.name}. ${t`It takes up to 5 minutes for changes to reach all users.`}`
+      });
     }
   });