Hide "topped up" message for fresh users who haven't used credits yet

When a new user signs up, they receive an initial daily credit grant.
Previously, the profile popover would immediately show "We topped up
your account to 2,000 credits since you were getting low", which is
confusing for users who haven't spent any credits yet.

Added a `dailyCreditGrantCount` field to the user endpoint that counts
how many daily_credit ledger entries exist. The "topped up" message is
now only shown when the count is greater than 1, meaning the daily cron
has actually topped up the user after they spent credits. Fresh users
with only the initial signup grant (count=1) will only see the
"Last daily credits grant" line.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: jurgenwerk

packages/billing/billing-queries.ts

@@ -336,25 +336,35 @@ export async function sumUpCreditsLedger(
   return results[0].sum === null ? 0 : parseInt(results[0].sum as string);
 }
 
-export async function getLastDailyCreditGrantAt(
+export async function getDailyCreditGrantInfo(
   dbAdapter: DBAdapter,
   userId: string,
-): Promise<number | null> {
+): Promise<{
+  lastDailyCreditGrantAt: number | null;
+  dailyCreditGrantCount: number;
+}> {
   let results = await query(dbAdapter, [
-    `SELECT MAX(created_at) AS last_grant_at FROM credits_ledger WHERE user_id = `,
+    `SELECT MAX(created_at) AS last_grant_at, COUNT(*) AS grant_count FROM credits_ledger WHERE user_id = `,
     param(userId),
     ` AND credit_type = 'daily_credit'`,
   ]);
 
   let lastGrantAt = results[0]?.last_grant_at;
-  if (lastGrantAt == null) {
-    return null;
+  let parsed: number | null = null;
+  if (lastGrantAt != null) {
+    parsed =
+      typeof lastGrantAt === 'number'
+        ? lastGrantAt
+        : parseInt(lastGrantAt as string);
+    if (Number.isNaN(parsed)) {
+      parsed = null;
+    }
   }
-  let parsed =
-    typeof lastGrantAt === 'number'
-      ? lastGrantAt
-      : parseInt(lastGrantAt as string);
-  return Number.isNaN(parsed) ? null : parsed;
+
+  return {
+    lastDailyCreditGrantAt: parsed,
+    dailyCreditGrantCount: parseInt(results[0]?.grant_count as string) || 0,
+  };
 }
 
 export async function getCurrentActiveSubscription(

packages/host/app/components/with-subscription-data.gts

@@ -124,6 +124,10 @@ export default class WithSubscriptionData extends Component<WithSubscriptionData
     return this.billingService.subscriptionData?.nextDailyCreditGrantAt;
   }
 
+  private get dailyCreditGrantCount() {
+    return this.billingService.subscriptionData?.dailyCreditGrantCount ?? 0;
+  }
+
   private get monthlyCreditText() {
     return this.creditsAvailableInPlanAllowance != null &&
       this.creditsIncludedInPlanAllowance != null
@@ -191,8 +195,14 @@ export default class WithSubscriptionData extends Component<WithSubscriptionData
     let thresholdAmount = formatNumber(this.lowCreditThreshold, {
       size: 'short',
     });
+    // Only append "since you were getting low" when the daily cron has
+    // topped the user up after they actually spent credits (count > 1).
+    let toppedUpMessage =
+      this.dailyCreditGrantCount > 1
+        ? `We topped up your account to ${thresholdAmount} credits since you were getting low.`
+        : `We topped up your account to ${thresholdAmount} credits.`;
     return [
-      `We topped up your account to ${thresholdAmount} credits since you were getting low.`,
+      toppedUpMessage,
       `Last daily credits grant: ${distance} (${timestampLastDailyCreditGrant})`,
     ];
   }

packages/host/app/services/billing-service.ts

@@ -25,6 +25,7 @@ interface SubscriptionData {
   lowCreditThreshold: number | null;
   lastDailyCreditGrantAt: number | null;
   nextDailyCreditGrantAt: number | null;
+  dailyCreditGrantCount: number;
 }
 
 export default class BillingService extends Service {
@@ -155,6 +156,8 @@ export default class BillingService extends Service {
         json.data?.attributes?.lastDailyCreditGrantAt ?? null;
       let nextDailyCreditGrantAt =
         json.data?.attributes?.nextDailyCreditGrantAt ?? null;
+      let dailyCreditGrantCount =
+        json.data?.attributes?.dailyCreditGrantCount ?? 0;
 
       this._subscriptionData = {
         plan,
@@ -166,6 +169,7 @@ export default class BillingService extends Service {
         lowCreditThreshold,
         lastDailyCreditGrantAt,
         nextDailyCreditGrantAt,
+        dailyCreditGrantCount,
       };
     } finally {
       this._loadingSubscriptionData = false;

packages/host/tests/acceptance/operator-mode-acceptance-test.gts

@@ -962,6 +962,7 @@ module('Acceptance | operator mode tests', function (hooks) {
       nextDailyCreditGrantAt?: number | null;
       lastDailyCreditGrantAt?: number | null;
       stripeCustomerEmail?: string | null;
+      dailyCreditGrantCount?: number;
     };
 
     type UserResponseBody = {
@@ -1414,6 +1415,7 @@ module('Acceptance | operator mode tests', function (hooks) {
         lowCreditThreshold: 2000,
         nextDailyCreditGrantAt: null,
         lastDailyCreditGrantAt: nowSeconds - 3600,
+        dailyCreditGrantCount: 2,
       };
       try {
         await visitOperatorMode({
@@ -1438,6 +1440,43 @@ module('Acceptance | operator mode tests', function (hooks) {
       }
     });
 
+    test('does not show "getting low" for fresh users with only initial grant', async function (assert) {
+      let originalAttributes = { ...userResponseBody.data.attributes };
+      let nowSeconds = Math.floor(Date.now() / 1000);
+      userResponseBody.data.attributes = {
+        ...originalAttributes,
+        creditsAvailableInPlanAllowance: 2000,
+        creditsIncludedInPlanAllowance: 2000,
+        extraCreditsAvailableInBalance: 2000,
+        lowCreditThreshold: 2000,
+        nextDailyCreditGrantAt: null,
+        lastDailyCreditGrantAt: nowSeconds - 60,
+        dailyCreditGrantCount: 1,
+      };
+      try {
+        await visitOperatorMode({
+          submode: 'interact',
+          codePath: `${testRealmURL}employee.gts`,
+        });
+
+        await waitFor('[data-test-profile-icon-button]');
+        await click('[data-test-profile-icon-button]');
+
+        assert.dom('[data-test-daily-grant-note]').exists();
+        assert
+          .dom('[data-test-daily-grant-note]')
+          .includesText('We topped up your account to 2,000 credits.');
+        assert
+          .dom('[data-test-daily-grant-note]')
+          .doesNotIncludeText('getting low');
+        assert
+          .dom('[data-test-daily-grant-note]')
+          .includesText('Last daily credits grant:');
+      } finally {
+        userResponseBody.data.attributes = originalAttributes;
+      }
+    });
+
     test(`ai panel continues being open when switching to code submode`, async function (assert) {
       await visitOperatorMode({
         stacks: [

packages/realm-server/handlers/handle-fetch-user.ts

@@ -9,7 +9,7 @@ import {
 import type { RealmServerTokenClaim } from '../utils/jwt';
 import {
   getCurrentActiveSubscription,
-  getLastDailyCreditGrantAt,
+  getDailyCreditGrantInfo,
   getMostRecentSubscriptionCycle,
   getPlanById,
   getUserByMatrixUserId,
@@ -35,6 +35,7 @@ type FetchUserResponse = {
       lowCreditThreshold: number | null;
       lastDailyCreditGrantAt: number | null;
       nextDailyCreditGrantAt: number | null;
+      dailyCreditGrantCount: number;
     };
     relationships: {
       subscription: {
@@ -110,10 +111,12 @@ export default function handleFetchUserRequest({
     let creditsAvailableInPlanAllowance: number | null = null;
     let creditsIncludedInPlanAllowance: number | null = null;
     let extraCreditsAvailableInBalance: number | null = null;
-    let [lastDailyCreditGrantAt, lowCreditThreshold] = await Promise.all([
-      getLastDailyCreditGrantAt(dbAdapter, user.id),
+    let [dailyCreditGrantInfo, lowCreditThreshold] = await Promise.all([
+      getDailyCreditGrantInfo(dbAdapter, user.id),
       Promise.resolve(getLowCreditThreshold()),
     ]);
+    let { lastDailyCreditGrantAt, dailyCreditGrantCount } =
+      dailyCreditGrantInfo;
 
     if (currentSubscriptionCycle) {
       [
@@ -168,6 +171,7 @@ export default function handleFetchUserRequest({
           lowCreditThreshold,
           lastDailyCreditGrantAt,
           nextDailyCreditGrantAt,
+          dailyCreditGrantCount,
         },
         relationships: {
           subscription: currentActiveSubscription

packages/realm-server/tests/realm-endpoints/user-test.ts

@@ -119,6 +119,7 @@ module(`realm-endpoints/${basename(__filename)}`, function () {
               lastDailyCreditGrantAt: null,
               nextDailyCreditGrantAt:
                 json.data.attributes.nextDailyCreditGrantAt,
+              dailyCreditGrantCount: 0,
             },
             relationships: {
               subscription: null,
@@ -245,6 +246,7 @@ module(`realm-endpoints/${basename(__filename)}`, function () {
               lastDailyCreditGrantAt: null,
               nextDailyCreditGrantAt:
                 json.data.attributes.nextDailyCreditGrantAt,
+              dailyCreditGrantCount: 0,
             },
             relationships: {
               subscription: {
@@ -353,6 +355,11 @@ module(`realm-endpoints/${basename(__filename)}`, function () {
         json.data.attributes.lastDailyCreditGrantAt,
         'lastDailyCreditGrantAt is set',
       );
+      assert.strictEqual(
+        json.data.attributes.dailyCreditGrantCount,
+        1,
+        'dailyCreditGrantCount reflects one daily grant entry',
+      );
     });
 
     test('responds without daily grant timestamps when low credit threshold is unset', async function (assert) {
@@ -431,6 +438,11 @@ module(`realm-endpoints/${basename(__filename)}`, function () {
         2000,
         'lastDailyCreditGrantAt reflects the most recent daily grant',
       );
+      assert.strictEqual(
+        json.data.attributes.dailyCreditGrantCount,
+        2,
+        'dailyCreditGrantCount reflects two daily grant entries',
+      );
     });
   });