From 576a4914ff1258b49c8b007e6129e7d1adefe276 Mon Sep 17 00:00:00 2001
From: Timo Bejan <timo@devplant.ro>
Date: Thu, 29 Oct 2020 15:11:08 +0200
Subject: [PATCH] minor changes

---
 .../file-preview-screen.component.html                 |  2 +-
 .../file-preview-screen.component.ts                   | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.html b/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.html
index 498320e93..3b488d3b3 100644
--- a/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.html
+++ b/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.html
@@ -232,7 +232,7 @@
                             attr.annotation-id="{{ annotation.id }}"
                             attr.annotation-page="{{ page }}"
                             [ngClass]="{ active: selectedAnnotation?.id === annotation.id }"
-                            (click)="selectAnnotation(annotation.annotation)"
+                            (click)="selectAnnotation(annotation)"
                         >
                             <redaction-annotation-icon
                                 [typeValue]="
diff --git a/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.ts b/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.ts
index 0a525c6f4..f8b280ca9 100644
--- a/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.ts
+++ b/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.ts
@@ -10,7 +10,7 @@ import {
 import { ActivatedRoute, Router } from '@angular/router';
 import { ManualRedactionEntry, ReanalysisControllerService } from '@redaction/red-ui-http';
 import { AppStateService } from '../../../state/app-state.service';
-import { Annotations, WebViewerInstance } from '@pdftron/webviewer';
+import { WebViewerInstance } from '@pdftron/webviewer';
 import { PdfViewerComponent } from '../pdf-viewer/pdf-viewer.component';
 import { AnnotationUtils } from '../../../utils/annotation-utils';
 import { UserService } from '../../../user/user.service';
@@ -235,7 +235,7 @@ export class FilePreviewScreenComponent implements OnInit {
         if (this.selectedAnnotation?.pageNumber === this.activeViewerPage) {
             return;
         }
-        this._scrollAnnotationsToPage(this.activeViewerPage);
+        this._scrollAnnotationsToPage(this.activeViewerPage, 'always');
     }
 
     private _scrollAnnotationsToPage(page: number, mode: 'always' | 'if-needed' = 'if-needed') {
@@ -483,9 +483,11 @@ export class FilePreviewScreenComponent implements OnInit {
     }
 
     private _getColor(manualRedactionEntry: ManualRedactionEntry) {
+        // if you're the owner, use the request color, otherwise use the actual dict color
         const color = this.appStateService.isActiveProjectOwner
-            ? this.appStateService.getDictionaryColor('request')
-            : this.appStateService.getDictionaryColor(manualRedactionEntry.type);
+            ? this.appStateService.getDictionaryColor(manualRedactionEntry.type)
+            : this.appStateService.getDictionaryColor('request');
+
         const rgbColor = hexToRgb(color);
         return new this.activeViewer.Annotations.Color(rgbColor.r, rgbColor.g, rgbColor.b);
     }