diff --git a/projects/v3/src/app/components/file-popup/file-popup.component.html b/projects/v3/src/app/components/file-popup/file-popup.component.html
index d6c6c7dc3..a5bd2545c 100644
--- a/projects/v3/src/app/components/file-popup/file-popup.component.html
+++ b/projects/v3/src/app/components/file-popup/file-popup.component.html
@@ -33,14 +33,32 @@
       <img [src]="file.url" alt="uploaded attachment preview" i18n-alt>
     </ng-container>
 
-    <ng-container *ngIf="file?.type.includes('video')">
-      <video controls>
-        <ng-container *ngIf="file?.url">
-          <source [src]="file.url"
-            [type]="file.type">
-          {{ file.url }}
-        </ng-container>
+    <ng-container *ngIf="isBrowserSupportedVideo()">
+      <video
+        width="100%"
+        controls
+        controlsList="nodownload"
+        preload="metadata"
+        playsinline
+        [src]="file.url"
+        (error)="handleVideoError($event)"
+      >
+        <p i18n="video not supported message">
+          Your browser doesn't support HTML5 video.
+          Here is a <a [href]="file.url">link to the video</a> instead.
+        </p>
       </video>
     </ng-container>
+
+    <ng-container *ngIf="file?.type?.includes('video') && !isBrowserSupportedVideo()">
+      <div class="ion-padding ion-text-center">
+        <ion-icon name="videocam-off-outline" size="large" color="medium"></ion-icon>
+        <p class="body-2" i18n="unsupported video format message">
+          This video format is not supported for preview.
+          <br>
+          <a [href]="file.url" target="_blank" rel="noopener">Download to view</a>
+        </p>
+      </div>
+    </ng-container>
   </div>
 </ion-content>
diff --git a/projects/v3/src/app/components/file-popup/file-popup.component.ts b/projects/v3/src/app/components/file-popup/file-popup.component.ts
index a4f127dbc..8ff1faa54 100644
--- a/projects/v3/src/app/components/file-popup/file-popup.component.ts
+++ b/projects/v3/src/app/components/file-popup/file-popup.component.ts
@@ -15,6 +15,18 @@ export class FilePopupComponent {
     public sanitizer: DomSanitizer
   ) {}
 
+  /**
+   * @description checks if video format is natively supported by browsers.
+   * only mp4, webm, and ogg are widely supported.
+   */
+  isBrowserSupportedVideo(): boolean {
+    if (!this.file?.type || !this.file.type.includes('video')) {
+      return false;
+    }
+    const supportedFormats = ['video/mp4', 'video/webm', 'video/ogg'];
+    return supportedFormats.some(format => this.file.type.includes(format));
+  }
+
   download(keyboardEvent?: KeyboardEvent) {
     if (keyboardEvent && (keyboardEvent?.code === 'Space' || keyboardEvent?.code === 'Enter')) {
       keyboardEvent.preventDefault();
@@ -34,4 +46,20 @@ export class FilePopupComponent {
 
     this.modalController.dismiss();
   }
+
+  handleVideoError(videoError: Event): void {
+    console.error('Video playback error:', videoError);
+    const target = videoError.target as HTMLVideoElement;
+    if (target?.error) {
+      const errorCode = target.error.code;
+      const errorMessage = target.error.message;
+      console.error('Video error details:', {
+        code: errorCode,
+        message: errorMessage,
+        src: target.src,
+        networkState: target.networkState,
+        readyState: target.readyState
+      });
+    }
+  }
 }
diff --git a/projects/v3/src/app/components/list-item/list-item.component.scss b/projects/v3/src/app/components/list-item/list-item.component.scss
index 4ab5a130a..4d1f0447c 100644
--- a/projects/v3/src/app/components/list-item/list-item.component.scss
+++ b/projects/v3/src/app/components/list-item/list-item.component.scss
@@ -1,3 +1,7 @@
+.body-2 {
+  overflow-wrap: anywhere;
+}
+
 .icon-container {
   margin-right: 20px;
   font-size: 24px  !important;
diff --git a/projects/v3/src/app/components/topic/topic.component.html b/projects/v3/src/app/components/topic/topic.component.html
index c5c4497c0..a8c1e643c 100644
--- a/projects/v3/src/app/components/topic/topic.component.html
+++ b/projects/v3/src/app/components/topic/topic.component.html
@@ -52,7 +52,7 @@
       [title]="file.name"
       leadingIcon="document"
       lines="full"
-      [endingActionBtnIcons]="['download', 'search']"
+      [endingActionBtnIcons]="getFileActionIcons(file)"
       (actionBtnClick)="actionBtnClick(file, $event)"
     ></app-list-item>
 
diff --git a/projects/v3/src/app/components/topic/topic.component.spec.ts b/projects/v3/src/app/components/topic/topic.component.spec.ts
index 14a66447f..64fd29e2c 100644
--- a/projects/v3/src/app/components/topic/topic.component.spec.ts
+++ b/projects/v3/src/app/components/topic/topic.component.spec.ts
@@ -151,14 +151,179 @@ describe('TopicComponent', () => {
 
   describe('actionBtnClick', () => {
     it('should call downloadFile when index 0', () => {
-      component.actionBtnClick({} as any, 0);
+      component.actionBtnClick({ url: 'https://example.com/file.pdf' } as any, 0);
       expect(utilsSpy.downloadFile).toHaveBeenCalled();
     });
 
-    it('should call previewFile when index 1', () => {
+    it('should call previewFile when index 1 and url is filestack with supported type', () => {
       spyOn(component, 'previewFile');
-      component.actionBtnClick({} as any, 1);
-      expect(component.previewFile).toHaveBeenCalled();
+      const file = { url: 'https://cdn.filestackcontent.com/abc123', name: 'doc.pdf' };
+      component.actionBtnClick(file, 1);
+      expect(component.previewFile).toHaveBeenCalledWith(file);
+    });
+
+    it('should open video modal when index 1 and file is mp4 video', () => {
+      spyOn(component, 'previewVideoFile');
+      const file = { url: 'https://cdn.filestackcontent.com/abc123.mp4', name: 'video.mp4' };
+      component.actionBtnClick(file, 1);
+      expect(component.previewVideoFile).toHaveBeenCalledWith(file);
+    });
+
+    it('should open video modal when index 1 and file is webm video', () => {
+      spyOn(component, 'previewVideoFile');
+      const file = { url: 'https://cdn.filestackcontent.com/abc123.webm', name: 'video.webm' };
+      component.actionBtnClick(file, 1);
+      expect(component.previewVideoFile).toHaveBeenCalledWith(file);
+    });
+
+    it('should open video modal when index 1 and file is ogg video', () => {
+      spyOn(component, 'previewVideoFile');
+      const file = { url: 'https://cdn.filestackcontent.com/abc123.ogg', name: 'video.ogg' };
+      component.actionBtnClick(file, 1);
+      expect(component.previewVideoFile).toHaveBeenCalledWith(file);
+    });
+
+    it('should open new tab when index 1 and url is filestack but file is audio', () => {
+      spyOn(window, 'open');
+      spyOn(component, 'previewFile');
+      const file = { url: 'https://cdn.filestackcontent.com/abc123', name: 'recording.mp3' };
+      component.actionBtnClick(file, 1);
+      expect(component.previewFile).not.toHaveBeenCalled();
+      expect(window.open).toHaveBeenCalledWith(file.url, '_blank');
+    });
+
+    it('should open new tab when index 1 and url is not filestack', () => {
+      spyOn(window, 'open');
+      const file = { url: 'https://example.com/document.pdf', name: 'document.pdf' };
+      component.actionBtnClick(file, 1);
+      expect(window.open).toHaveBeenCalledWith(file.url, '_blank');
+      expect(notificationSpy.presentToast).toHaveBeenCalled();
+    });
+
+    it('should open new tab for non-filestack url even without extension', () => {
+      spyOn(window, 'open');
+      const file = { url: 'https://storage.example.com/files/12345', name: 'report' };
+      component.actionBtnClick(file, 1);
+      expect(window.open).toHaveBeenCalledWith(file.url, '_blank');
+    });
+  });
+
+  describe('getFileActionIcons', () => {
+    it('should return both download and search icons for filestack url with supported type', () => {
+      const file = { url: 'https://cdn.filestackcontent.com/abc123', name: 'document.pdf' };
+      const icons = component.getFileActionIcons(file);
+      expect(icons).toEqual(['download', 'search']);
+    });
+
+    it('should return both download and search icons for video files', () => {
+      const file = { url: 'https://cdn.filestackcontent.com/abc123.mp4', name: 'video.mp4' };
+      const icons = component.getFileActionIcons(file);
+      expect(icons).toEqual(['download', 'search']);
+    });
+
+    it('should return both download and search icons for non-filestack video', () => {
+      const file = { url: 'https://example.com/video.mp4', name: 'video.mp4' };
+      const icons = component.getFileActionIcons(file);
+      expect(icons).toEqual(['download', 'search']);
+    });
+
+    it('should return only download icon for filestack url with audio', () => {
+      const file = { url: 'https://cdn.filestackcontent.com/abc123', name: 'audio.mp3' };
+      const icons = component.getFileActionIcons(file);
+      expect(icons).toEqual(['download']);
+    });
+
+    it('should return only download icon for non-filestack non-video file', () => {
+      const file = { url: 'https://example.com/file.pdf', name: 'document.pdf' };
+      const icons = component.getFileActionIcons(file);
+      expect(icons).toEqual(['download']);
+    });
+
+    it('should return both download and search icons for webm video', () => {
+      const file = { url: 'https://example.com/video.webm', name: 'video.webm' };
+      const icons = component.getFileActionIcons(file);
+      expect(icons).toEqual(['download', 'search']);
+    });
+
+    it('should return both download and search icons for ogg video', () => {
+      const file = { url: 'https://example.com/video.ogg', name: 'video.ogg' };
+      const icons = component.getFileActionIcons(file);
+      expect(icons).toEqual(['download', 'search']);
+    });
+
+    it('should return only download icon for unsupported video formats', () => {
+      const formats = [
+        { url: 'https://example.com/video.mov', name: 'video.mov' },
+        { url: 'https://cdn.filestackcontent.com/abc123', name: 'file_example_AVI_640_800kB.avi' },
+        { url: 'https://cdn.filestackcontent.com/abc123.wmv', name: 'video.wmv' },
+        { url: 'https://example.com/video.mkv', name: 'video.mkv' },
+      ];
+      for (const file of formats) {
+        const icons = component.getFileActionIcons(file);
+        expect(icons).withContext(file.name).toEqual(['download']);
+      }
+    });
+  });
+
+  describe('previewVideoFile', () => {
+    it('should open video modal with mp4 mime type', async () => {
+      const modalSpy = jasmine.createSpyObj('Modal', ['present']);
+      spyOn(component['modalController'], 'create').and.returnValue(Promise.resolve(modalSpy));
+
+      const file = { url: 'https://example.com/video.mp4', name: 'test.mp4' };
+      await component.previewVideoFile(file);
+
+      expect(component['modalController'].create).toHaveBeenCalledWith({
+        component: jasmine.anything(),
+        componentProps: {
+          file: {
+            url: file.url,
+            name: file.name,
+            type: 'video/mp4',
+          },
+        },
+      });
+      expect(modalSpy.present).toHaveBeenCalled();
+    });
+
+    it('should open video modal with webm mime type', async () => {
+      const modalSpy = jasmine.createSpyObj('Modal', ['present']);
+      spyOn(component['modalController'], 'create').and.returnValue(Promise.resolve(modalSpy));
+
+      const file = { url: 'https://example.com/video.webm', name: 'test.webm' };
+      await component.previewVideoFile(file);
+
+      expect(component['modalController'].create).toHaveBeenCalledWith({
+        component: jasmine.anything(),
+        componentProps: {
+          file: {
+            url: file.url,
+            name: file.name,
+            type: 'video/webm',
+          },
+        },
+      });
+      expect(modalSpy.present).toHaveBeenCalled();
+    });
+
+    it('should open video modal with ogg mime type', async () => {
+      const modalSpy = jasmine.createSpyObj('Modal', ['present']);
+      spyOn(component['modalController'], 'create').and.returnValue(Promise.resolve(modalSpy));
+
+      const file = { url: 'https://example.com/video.ogg', name: 'test.ogg' };
+      await component.previewVideoFile(file);
+
+      expect(component['modalController'].create).toHaveBeenCalledWith({
+        component: jasmine.anything(),
+        componentProps: {
+          file: {
+            url: file.url,
+            name: file.name,
+            type: 'video/ogg',
+          },
+        },
+      });
+      expect(modalSpy.present).toHaveBeenCalled();
     });
   });
 });
diff --git a/projects/v3/src/app/components/topic/topic.component.ts b/projects/v3/src/app/components/topic/topic.component.ts
index c254ad6b1..b126e61ae 100644
--- a/projects/v3/src/app/components/topic/topic.component.ts
+++ b/projects/v3/src/app/components/topic/topic.component.ts
@@ -11,6 +11,8 @@ import { NotificationsService } from '@v3/app/services/notifications.service';
 import { BehaviorSubject, exhaustMap, filter, finalize, Subject, Subscription, takeUntil } from 'rxjs';
 import { Task } from '@v3/app/services/activity.service';
 import { ComponentCleanupService } from '@v3/app/services/component-cleanup.service';
+import { ModalController } from '@ionic/angular';
+import { FilePopupComponent } from '../file-popup/file-popup.component';
 
 @Component({
   selector: 'app-topic',
@@ -52,6 +54,7 @@ export class TopicComponent implements OnInit, OnChanges, AfterViewChecked, OnDe
     private sanitizer: DomSanitizer,
     private cleanupService: ComponentCleanupService,
     private cdr: ChangeDetectorRef,
+    private modalController: ModalController,
     @Inject(DOCUMENT) private readonly document: Document
   ) {
     this.isMobile = this.utils.isMobile();
@@ -299,11 +302,93 @@ export class TopicComponent implements OnInit, OnChanges, AfterViewChecked, OnDe
         this.utils.downloadFile(file.url);
         break;
       case 1:
-        this.previewFile(file);
+        if (this._isVideoFile(file)) {
+          // show browser-supported video in modal with html5 player
+          this.previewVideoFile(file);
+        } else if (this._isFilestackUrl(file.url) && this._isFilestackPreviewSupported(file)) {
+          // show filestack document viewer
+          this.previewFile(file);
+        } else {
+          // non-filestack files: open in new tab as download fallback
+          window.open(file.url, '_blank');
+        }
         break;
     }
   }
 
+  /**
+   * @description checks if a url is a filestack cdn url
+   */
+  private _isFilestackUrl(url: string): boolean {
+    return url?.includes('filestackcontent') || false;
+  }
+
+  /**
+   * @description checks if file is a browser-supported video format (mp4, webm, ogg)
+   */
+  private _isVideoFile(file: { url: string; name: string }): boolean {
+    const supportedExtensions = ['.mp4', '.webm', '.ogg'];
+    const urlLower = (file.url || '').toLowerCase();
+    const nameLower = (file.name || '').toLowerCase();
+    return supportedExtensions.some(ext => urlLower.endsWith(ext) || nameLower.endsWith(ext));
+  }
+
+  /**
+   * @description derives video mime type from file extension
+   */
+  private _getVideoMimeType(file: { url: string; name: string }): string {
+    const name = (file.name || file.url || '').toLowerCase();
+    if (name.endsWith('.webm')) return 'video/webm';
+    if (name.endsWith('.ogg')) return 'video/ogg';
+    return 'video/mp4';
+  }
+
+  /**
+   * @description checks if a file type is supported by filestack document viewer.
+   * supported: pdf, ppt/pptx, xls/xlsx, doc/docx, odt, odp, images, html, txt, ai, psd.
+   * unsupported: audio and video files (filestack doesn't support media preview).
+   */
+  private _isFilestackPreviewSupported(file: { url: string; name: string }): boolean {
+    const unsupportedExtensions = [
+      // audio formats
+      '.mp3', '.wav', '.ogg', '.aac', '.flac', '.wma', '.m4a',
+      // video formats (filestack doesn't support any video preview)
+      '.mp4', '.webm', '.avi', '.mov', '.wmv', '.mkv', '.flv', '.m4v',
+    ];
+    const urlLower = (file.url || '').toLowerCase();
+    const nameLower = (file.name || '').toLowerCase();
+    return !unsupportedExtensions.some(ext => urlLower.endsWith(ext) || nameLower.endsWith(ext));
+  }
+
+  /**
+   * @description preview browser-supported video file in modal with html5 video player
+   */
+  async previewVideoFile(file: { url: string; name: string }): Promise<void> {
+    const modal = await this.modalController.create({
+      component: FilePopupComponent,
+      componentProps: {
+        file: {
+          url: file.url,
+          name: file.name,
+          type: this._getVideoMimeType(file),
+        },
+      },
+    });
+    return await modal.present();
+  }
+
+  /**
+   * @description returns action button icons for file attachment based on preview support.
+   * preview icon shown for:
+   * - browser-supported video files: mp4, webm, ogg (shown in html5 video modal)
+   * - filestack urls with document viewer supported file types
+   */
+  getFileActionIcons(file: { url: string; name: string }): string[] {
+    const canPreview = this._isVideoFile(file) ||
+                      (this._isFilestackUrl(file.url) && this._isFilestackPreviewSupported(file));
+    return canPreview ? ['download', 'search'] : ['download'];
+  }
+
   async actionBarContinue(topic): Promise<void> {
     if (this.continueAction$) {
       this.continueAction$.next(topic);
diff --git a/projects/v3/src/app/components/video-conversion/video-conversion.component.html b/projects/v3/src/app/components/video-conversion/video-conversion.component.html
index 9d65c32b4..e9cd10abe 100644
--- a/projects/v3/src/app/components/video-conversion/video-conversion.component.html
+++ b/projects/v3/src/app/components/video-conversion/video-conversion.component.html
@@ -23,6 +23,6 @@
 <ng-template #longWait>
   <div>
     <p i18n>Waited too long?</p>
-    <p i18n>Download <a target="_blank" href="{{video?.fileObject?.url}}">here</a></p>
+    <p i18n>Download <a target="_blank" href="{{video?.fileObject?.url}}" class="contrast">here</a></p>
   </div>
 </ng-template>
diff --git a/projects/v3/src/app/components/video-conversion/video-conversion.component.scss b/projects/v3/src/app/components/video-conversion/video-conversion.component.scss
index 827125b91..d8859e9eb 100644
--- a/projects/v3/src/app/components/video-conversion/video-conversion.component.scss
+++ b/projects/v3/src/app/components/video-conversion/video-conversion.component.scss
@@ -1,3 +1,6 @@
+a.contrast {
+  color: var(--ion-color-primary-contrast);
+}
 .waiting-mgs {
   display: flex;
   padding: 16px;
diff --git a/projects/v3/src/app/pages/activity-desktop/activity-desktop.page.ts b/projects/v3/src/app/pages/activity-desktop/activity-desktop.page.ts
index 9befc398e..9c5eccf66 100644
--- a/projects/v3/src/app/pages/activity-desktop/activity-desktop.page.ts
+++ b/projects/v3/src/app/pages/activity-desktop/activity-desktop.page.ts
@@ -524,7 +524,8 @@ export class ActivityDesktopPage {
     // display review rating modal
     return await this.notificationsService.popUpReviewRating(
       this.review.id,
-      false
+      false,
+      this.assessmentService.assessment?.hasReviewRating
     );
   }
 
diff --git a/projects/v3/src/app/pages/assessment-mobile/assessment-mobile.page.ts b/projects/v3/src/app/pages/assessment-mobile/assessment-mobile.page.ts
index a7b596641..0e0760925 100644
--- a/projects/v3/src/app/pages/assessment-mobile/assessment-mobile.page.ts
+++ b/projects/v3/src/app/pages/assessment-mobile/assessment-mobile.page.ts
@@ -262,7 +262,11 @@ export class AssessmentMobilePage implements OnInit, OnDestroy {
 
     try {
       // display review rating modal
-      return await this.notificationsService.popUpReviewRating(this.review.id, false);
+      return await this.notificationsService.popUpReviewRating(
+        this.review.id,
+        false,
+        this.assessment?.hasReviewRating
+      );
     } catch (err) {
       const header = $localize`Can not get review rating information`;
       await this.notificationsService.alert({
diff --git a/projects/v3/src/app/pages/chat/chat-preview/chat-preview.component.html b/projects/v3/src/app/pages/chat/chat-preview/chat-preview.component.html
index d6c6c7dc3..054c5697a 100644
--- a/projects/v3/src/app/pages/chat/chat-preview/chat-preview.component.html
+++ b/projects/v3/src/app/pages/chat/chat-preview/chat-preview.component.html
@@ -33,14 +33,32 @@
       <img [src]="file.url" alt="uploaded attachment preview" i18n-alt>
     </ng-container>
 
-    <ng-container *ngIf="file?.type.includes('video')">
-      <video controls>
-        <ng-container *ngIf="file?.url">
-          <source [src]="file.url"
-            [type]="file.type">
-          {{ file.url }}
-        </ng-container>
+    <ng-container *ngIf="isBrowserSupportedVideo()">
+      <video
+        width="100%"
+        controls
+        controlsList="nodownload"
+        preload="metadata"
+        playsinline
+        [src]="file.url"
+        (error)="handleVideoError($event)"
+      >
+        <p i18n="video not supported message">
+          Your browser doesn't support HTML5 video.
+          <a [href]="file.url" class="contrast">Download the video</a> instead.
+        </p>
       </video>
     </ng-container>
+
+    <ng-container *ngIf="file?.type?.includes('video') && !isBrowserSupportedVideo()">
+      <div class="ion-padding ion-text-center">
+        <ion-icon name="videocam-off-outline" size="large" color="medium"></ion-icon>
+        <p class="body-2" i18n="unsupported video format message">
+          This video format is not supported for preview.
+          <br>
+          <a [href]="file.url" target="_blank" rel="noopener">Download to view</a>
+        </p>
+      </div>
+    </ng-container>
   </div>
 </ion-content>
diff --git a/projects/v3/src/app/pages/chat/chat-preview/chat-preview.component.scss b/projects/v3/src/app/pages/chat/chat-preview/chat-preview.component.scss
index 937c0609c..17cec7fda 100644
--- a/projects/v3/src/app/pages/chat/chat-preview/chat-preview.component.scss
+++ b/projects/v3/src/app/pages/chat/chat-preview/chat-preview.component.scss
@@ -17,3 +17,7 @@ ion-header {
     }
   }
 }
+
+a.contrast {
+  color: var(--ion-color-primary-contrast);
+}
diff --git a/projects/v3/src/app/pages/chat/chat-preview/chat-preview.component.spec.ts b/projects/v3/src/app/pages/chat/chat-preview/chat-preview.component.spec.ts
index 7bf5f5b21..403a1a60b 100644
--- a/projects/v3/src/app/pages/chat/chat-preview/chat-preview.component.spec.ts
+++ b/projects/v3/src/app/pages/chat/chat-preview/chat-preview.component.spec.ts
@@ -72,4 +72,40 @@ describe('ChatPreviewComponent', () => {
       expect(modalSpy.dismiss).toHaveBeenCalled();
     });
   });
+
+  describe('isBrowserSupportedVideo', () => {
+    it('should return true for mp4', () => {
+      component.file = { url: 'video.mp4', type: 'video/mp4' };
+      expect(component.isBrowserSupportedVideo()).toBeTrue();
+    });
+
+    it('should return true for webm', () => {
+      component.file = { url: 'video.webm', type: 'video/webm' };
+      expect(component.isBrowserSupportedVideo()).toBeTrue();
+    });
+
+    it('should return true for ogg', () => {
+      component.file = { url: 'video.ogg', type: 'video/ogg' };
+      expect(component.isBrowserSupportedVideo()).toBeTrue();
+    });
+
+    it('should return false for unsupported video types', () => {
+      component.file = { url: 'video.avi', type: 'video/avi' };
+      expect(component.isBrowserSupportedVideo()).toBeFalse();
+    });
+
+    it('should return false when file type is not set', () => {
+      component.file = { url: 'video.mp4' };
+      expect(component.isBrowserSupportedVideo()).toBeFalse();
+    });
+  });
+
+  describe('handleVideoError', () => {
+    it('should log error details', () => {
+      spyOn(console, 'error');
+      const mockEvent = { target: { error: { code: 4, message: 'not supported' }, src: 'test.mp4', networkState: 3, readyState: 0 } } as any;
+      component.handleVideoError(mockEvent);
+      expect(console.error).toHaveBeenCalledWith('Video Error::', mockEvent);
+    });
+  });
 });
diff --git a/projects/v3/src/app/pages/chat/chat-preview/chat-preview.component.ts b/projects/v3/src/app/pages/chat/chat-preview/chat-preview.component.ts
index 6d0adf10f..b87790a1c 100644
--- a/projects/v3/src/app/pages/chat/chat-preview/chat-preview.component.ts
+++ b/projects/v3/src/app/pages/chat/chat-preview/chat-preview.component.ts
@@ -34,4 +34,29 @@ export class ChatPreviewComponent {
 
     this.modalController.dismiss();
   }
+
+  /**
+   * @description checks if the video format is natively supported by the browser
+   */
+  isBrowserSupportedVideo(): boolean {
+    const supportedTypes = ['video/mp4', 'video/webm', 'video/ogg'];
+    return this.file?.type && supportedTypes.includes(this.file.type);
+  }
+
+  /**
+   * @description handles video playback errors
+   */
+  handleVideoError(videoError: Event): void {
+    console.error('Video Error::', videoError);
+    const target = videoError.target as HTMLVideoElement;
+    if (target) {
+      console.error('Video error details:', {
+        code: target.error?.code,
+        message: target.error?.message,
+        src: target.src,
+        networkState: target.networkState,
+        readyState: target.readyState,
+      });
+    }
+  }
 }
diff --git a/projects/v3/src/app/pages/home/home.page.html b/projects/v3/src/app/pages/home/home.page.html
index ed392e63e..73d71d88a 100644
--- a/projects/v3/src/app/pages/home/home.page.html
+++ b/projects/v3/src/app/pages/home/home.page.html
@@ -93,7 +93,7 @@
             <ion-segment-button value="pulse-checks"
               mode="ios"
               role="tab"
-              *ngIf="pulseCheckIndicatorEnabled === true"
+              *ngIf="pulseCheckIndicatorEnabled === true && !isExpertWithoutTeam"
               [attr.aria-selected]="display === 'pulse-checks'"
               [attr.aria-controls]="'pulse-checks-panel'">
               <ion-label i18n>Skill & Progress Surveys</ion-label>
diff --git a/projects/v3/src/app/pages/home/home.page.ts b/projects/v3/src/app/pages/home/home.page.ts
index da1a3db30..ef28d08b7 100644
--- a/projects/v3/src/app/pages/home/home.page.ts
+++ b/projects/v3/src/app/pages/home/home.page.ts
@@ -35,6 +35,7 @@ export class HomePage implements OnInit, OnDestroy, AfterViewChecked {
 
   isMobile: boolean;
   isParticipant: boolean;
+  isExpertWithoutTeam: boolean;
   pulseCheckIndicatorEnabled: boolean;
   activityProgresses = {};
 
@@ -89,9 +90,25 @@ export class HomePage implements OnInit, OnDestroy, AfterViewChecked {
 
   ngOnInit() {
     const role = this.storageService.getUser().role;
+    const teamId = this.storageService.getUser().teamId;
     this.isParticipant = role === 'participant';
+    this.isExpertWithoutTeam = role === 'mentor' && !teamId;
     this.pulseCheckIndicatorEnabled = this.storageService.getFeature('pulseCheckIndicator');
     this.isMobile = this.utils.isMobile();
+
+    // subscribe to team changes broadcast from shared service
+    this.sharedService.team$
+      .pipe(
+        filter(team => team !== null),
+        takeUntil(this.unsubscribe$)
+      )
+      .subscribe(() => {
+        // re-evaluate expert without team status when team changes
+        const currentRole = this.storageService.getUser().role;
+        const currentTeamId = this.storageService.getUser().teamId;
+        this.isExpertWithoutTeam = currentRole === 'mentor' && !currentTeamId;
+      });
+
     this.homeService.milestones$
       .pipe(
         distinctUntilChanged(),
@@ -182,6 +199,8 @@ export class HomePage implements OnInit, OnDestroy, AfterViewChecked {
         },
       });
 
+    // call updateDashboard on initial load to ensure fresh data
+    this.updateDashboard();
   }
 
   ngOnDestroy(): void {
@@ -203,6 +222,13 @@ export class HomePage implements OnInit, OnDestroy, AfterViewChecked {
 
   async updateDashboard() {
     await this.sharedService.refreshJWT(); // refresh JWT token [CORE-6083]
+
+    // re-evaluate user role and team status after JWT refresh updates teamId
+    const role = this.storageService.getUser().role;
+    const teamId = this.storageService.getUser().teamId;
+    this.isParticipant = role === 'participant';
+    this.isExpertWithoutTeam = role === 'mentor' && !teamId;
+
     this.experience = this.storageService.get("experience");
     this.homeService.getMilestones({ forceRefresh: true });
     this.achievementService.getAchievements();
diff --git a/projects/v3/src/app/services/assessment.service.ts b/projects/v3/src/app/services/assessment.service.ts
index b1bbf6c2c..7e6bf1c96 100644
--- a/projects/v3/src/app/services/assessment.service.ts
+++ b/projects/v3/src/app/services/assessment.service.ts
@@ -52,6 +52,7 @@ export interface Assessment {
   isOverdue?: boolean;
   groups: Array<Group>;
   pulseCheck: boolean;
+  hasReviewRating: boolean; // assessment level setting to enable review rating
   allowResubmit?: boolean; // indicator to show resubmit button
 }
 
@@ -138,7 +139,11 @@ export class AssessmentService {
       .graphQLFetch(
         `query getAssessment($assessmentId: Int!, $reviewer: Boolean!, $activityId: Int, $contextId: Int!, $submissionId: Int) {
         assessment(id:$assessmentId, reviewer:$reviewer, activityId:$activityId, submissionId:$submissionId) {
-          id name type description dueDate isTeam pulseCheck allowResubmit
+          id name type
+          description dueDate isTeam
+          pulseCheck
+          hasReviewRating
+          allowResubmit
           groups {
             name description
             questions{
@@ -265,6 +270,7 @@ export class AssessmentService {
         ? this.utils.timeComparer(data.assessment.dueDate) < 0
         : false,
       pulseCheck: data.assessment.pulseCheck,
+      hasReviewRating: data.assessment.hasReviewRating,
       allowResubmit: data.assessment.allowResubmit,
       groups: [],
     };
diff --git a/projects/v3/src/app/services/auth.service.ts b/projects/v3/src/app/services/auth.service.ts
index ded993515..14fc8becc 100644
--- a/projects/v3/src/app/services/auth.service.ts
+++ b/projects/v3/src/app/services/auth.service.ts
@@ -126,6 +126,7 @@ interface AuthQuery {
   apikey?: string;
   service?: string;
   experienceUuid?: string;
+  forceRefresh?: boolean;
 }
 
 @Injectable({
@@ -154,9 +155,14 @@ export class AuthService {
     const lastFetchTime: number = +this.storage.get('lastAuthFetchTime');
     const authCache = this.authCache$.getValue() || this.storage.get('authCache');
 
-    // 2 conditions to pull from server:
-    // when experienceUuid is not null (required for switch experience)
-    // when authToken available (directLogin)
+    // conditions to pull from server:
+    // - when forceRefresh is true (bypass cache)
+    // - when experienceUuid is not null (required for switch experience)
+    // - when authToken available (directLogin)
+    if (data?.forceRefresh) {
+      return this.fetchData(data);
+    }
+
     if (!(data?.experienceUuid || data?.authToken) && lastFetchTime && (currentTime - lastFetchTime) < this.authCacheDuration && authCache) {
       return of(authCache);
     } else {
diff --git a/projects/v3/src/app/services/notifications.service.ts b/projects/v3/src/app/services/notifications.service.ts
index 6b8a5a6b2..c72676964 100644
--- a/projects/v3/src/app/services/notifications.service.ts
+++ b/projects/v3/src/app/services/notifications.service.ts
@@ -422,13 +422,21 @@ export class NotificationsService {
    * @param   {number}          reviewId  submission review record id
    * @param   {string[]<void>}  redirect  array: routeUrl, boolean: disable
    *                                      routing (stay at same component)
+   * @param   {boolean}         hasReviewRating  optional flag from assessment to
+   *                                      skip popup when disabled
    *
    * @return  {Promise<void>}             deferred ionic modal
    */
   async popUpReviewRating(
     reviewId,
-    redirect: string[] | boolean
+    redirect: string[] | boolean,
+    hasReviewRating?: boolean
   ): Promise<void> {
+    // skip popup if assessment-level review rating is disabled
+    if (hasReviewRating === false) {
+      return;
+    }
+
     return this.modalOnly(
       ReviewRatingComponent,
       {
diff --git a/projects/v3/src/app/services/shared.service.ts b/projects/v3/src/app/services/shared.service.ts
index 083538d9b..3007b3d4c 100644
--- a/projects/v3/src/app/services/shared.service.ts
+++ b/projects/v3/src/app/services/shared.service.ts
@@ -191,7 +191,7 @@ export class SharedService {
    * @return  {Promise<any>} non-strict return value, we won't use
    */
   async refreshJWT(): Promise<any> {
-    const res: AuthEndpoint = await firstValueFrom(this.authService.authenticate());
+    const res: AuthEndpoint = await firstValueFrom(this.authService.authenticate({ forceRefresh: true }));
 
     const auth = res?.data?.auth;
     const latestTeamId = auth?.experience?.team?.id;
diff --git a/projects/v3/src/app/services/storage.service.ts b/projects/v3/src/app/services/storage.service.ts
index c56d30673..6141143eb 100644
--- a/projects/v3/src/app/services/storage.service.ts
+++ b/projects/v3/src/app/services/storage.service.ts
@@ -34,7 +34,7 @@ export interface User {
   userHash?: string;
   colors?: Colors;
   activityCardImage?: string; // default activity card image
-  hasReviewRating?: boolean;
+  hasReviewRating?: boolean; // from experience settings (enable/disable entirely from global setting)
   truncateDescription?: boolean;
   enrolment?: any;
   activityCompleteMessage?: string;