From a3696ea3c1b77e32ad41f2b60bfe25f3dfdf23e0 Mon Sep 17 00:00:00 2001
From: Vijay Oommen <voommen@livefront.com>
Date: Fri, 3 Oct 2025 12:03:00 -0500
Subject: [PATCH] PM-26495 Activity tab empty state changed (#16726)

---
 apps/web/src/locales/en/messages.json              |  2 +-
 .../all-activity.component.html                    | 14 +-------------
 .../access-intelligence/all-activity.component.ts  |  4 +---
 3 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index 1a8623a1973..5ed393c0295 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -93,7 +93,7 @@
   "sendReminders": {
     "message": "Send reminders"
   },
-  "criticalApplicationsActivityDescription": {
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
     "message": "Once you mark applications critical, they will display here."
   },
   "viewAtRiskMembers": {
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-activity.component.html b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-activity.component.html
index bb5416a9a13..a1b5611ff14 100644
--- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-activity.component.html
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-activity.component.html
@@ -4,19 +4,7 @@
   </div>
 }
 
-@if (!(isLoading$ | async) && (noData$ | async)) {
-  <div class="tw-mt-4">
-    <bit-no-items class="tw-text-main">
-      <ng-container slot="title">
-        <h2 class="tw-font-semibold tw-mt-4">
-          {{ "noAppsInOrgTitle" | i18n: organization?.name }}
-        </h2>
-      </ng-container>
-    </bit-no-items>
-  </div>
-}
-
-@if (!(isLoading$ | async) && !(noData$ | async)) {
+@if (!(isLoading$ | async)) {
   <ul
     class="tw-inline-grid tw-grid-cols-3 tw-gap-6 tw-m-0 tw-p-0 tw-w-full tw-auto-cols-auto tw-list-none"
   >
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-activity.component.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-activity.component.ts
index f1aa6f1041b..1691e35c819 100644
--- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-activity.component.ts
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-activity.component.ts
@@ -1,7 +1,7 @@
 import { Component, DestroyRef, inject, OnInit } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { ActivatedRoute } from "@angular/router";
-import { BehaviorSubject, firstValueFrom } from "rxjs";
+import { firstValueFrom } from "rxjs";
 
 import {
   AllActivitiesService,
@@ -31,7 +31,6 @@ import { RiskInsightsTabType } from "./risk-insights.component";
 })
 export class AllActivityComponent implements OnInit {
   protected isLoading$ = this.dataService.isLoading$;
-  protected noData$ = new BehaviorSubject(true);
   organization: Organization | null = null;
   totalCriticalAppsAtRiskMemberCount = 0;
   totalCriticalAppsCount = 0;
@@ -53,7 +52,6 @@ export class AllActivityComponent implements OnInit {
       this.allActivitiesService.reportSummary$
         .pipe(takeUntilDestroyed(this.destroyRef))
         .subscribe((summary) => {
-          this.noData$.next(summary.totalApplicationCount === 0);
           this.totalCriticalAppsAtRiskMemberCount = summary.totalCriticalAtRiskMemberCount;
           this.totalCriticalAppsCount = summary.totalCriticalApplicationCount;
           this.totalCriticalAppsAtRiskCount = summary.totalCriticalAtRiskApplicationCount;