diff --git a/apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts b/apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts
index 9e69922a3..31d56200c 100644
--- a/apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts
+++ b/apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts
@@ -68,42 +68,42 @@ import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
   templateUrl: './analysis-page.html'
 })
 export class GfAnalysisPageComponent implements OnInit {
-  public benchmark?: Partial<SymbolProfile>;
-  public benchmarkDataItems: HistoricalDataItem[] = [];
-  public benchmarks: Partial<SymbolProfile>[];
-  public bottom3: PortfolioPosition[];
-  public deviceType: string;
-  public dividendsByGroup: InvestmentItem[];
-  public dividendTimelineDataLabel = $localize`Dividend`;
-  public firstOrderDate: Date;
-  public hasImpersonationId: boolean;
-  public hasPermissionToReadAiPrompt: boolean;
-  public investments: InvestmentItem[];
-  public investmentTimelineDataLabel = $localize`Investment`;
-  public investmentsByGroup: InvestmentItem[];
-  public isLoadingAnalysisPrompt: boolean;
-  public isLoadingBenchmarkComparator: boolean;
-  public isLoadingDividendTimelineChart: boolean;
-  public isLoadingInvestmentChart: boolean;
-  public isLoadingInvestmentTimelineChart: boolean;
-  public isLoadingPortfolioPrompt: boolean;
-  public mode: GroupBy = 'month';
-  public modeOptions: ToggleOption[] = [
+  protected benchmark?: Partial<SymbolProfile>;
+  protected benchmarkDataItems: HistoricalDataItem[] = [];
+  protected benchmarks: Partial<SymbolProfile>[];
+  protected bottom3: PortfolioPosition[];
+  protected dividendsByGroup: InvestmentItem[];
+  protected dividendTimelineDataLabel = $localize`Dividend`;
+  protected hasImpersonationId: boolean;
+  protected hasPermissionToReadAiPrompt: boolean;
+  protected investments: InvestmentItem[];
+  protected investmentTimelineDataLabel = $localize`Investment`;
+  protected investmentsByGroup: InvestmentItem[];
+  protected isLoadingAnalysisPrompt: boolean;
+  protected isLoadingBenchmarkComparator: boolean;
+  protected isLoadingDividendTimelineChart: boolean;
+  protected isLoadingInvestmentChart: boolean;
+  protected isLoadingInvestmentTimelineChart: boolean;
+  protected isLoadingPortfolioPrompt: boolean;
+  protected mode: GroupBy = 'month';
+  protected modeOptions: ToggleOption[] = [
     { label: $localize`Monthly`, value: 'month' },
     { label: $localize`Yearly`, value: 'year' }
   ];
-  public performance: PortfolioPerformance;
-  public performanceDataItems: HistoricalDataItem[];
-  public performanceDataItemsInPercentage: HistoricalDataItem[];
-  public portfolioEvolutionDataLabel = $localize`Investment`;
-  public precision = 2;
-  public streaks: PortfolioInvestmentsResponse['streaks'];
-  public top3: PortfolioPosition[];
-  public unitCurrentStreak: string;
-  public unitLongestStreak: string;
-  public user: User;
+  protected performance: PortfolioPerformance;
+  protected performanceDataItems: HistoricalDataItem[];
+  protected performanceDataItemsInPercentage: HistoricalDataItem[];
+  protected portfolioEvolutionDataLabel = $localize`Investment`;
+  protected precision = 2;
+  protected streaks: PortfolioInvestmentsResponse['streaks'];
+  protected top3: PortfolioPosition[];
+  protected unitCurrentStreak: string;
+  protected unitLongestStreak: string;
+  protected user: User;
 
   private readonly actionsMenuButton = viewChild.required(MatMenuTrigger);
+  private deviceType: string;
+  private firstOrderDate: Date;
 
   private readonly changeDetectorRef = inject(ChangeDetectorRef);
   private readonly clipboard = inject(Clipboard);
@@ -168,7 +168,7 @@ export class GfAnalysisPageComponent implements OnInit {
       });
   }
 
-  public onChangeBenchmark(symbolProfileId: string) {
+  protected onChangeBenchmark(symbolProfileId: string) {
     this.dataService
       .putUserSetting({ benchmark: symbolProfileId })
       .pipe(takeUntilDestroyed(this.destroyRef))
@@ -184,12 +184,12 @@ export class GfAnalysisPageComponent implements OnInit {
       });
   }
 
-  public onChangeGroupBy(aMode: GroupBy) {
+  protected onChangeGroupBy(aMode: GroupBy) {
     this.mode = aMode;
     this.fetchDividendsAndInvestments();
   }
 
-  public onCopyPromptToClipboard(mode: AiPromptMode) {
+  protected onCopyPromptToClipboard(mode: AiPromptMode) {
     if (mode === 'analysis') {
       this.isLoadingAnalysisPrompt = true;
     } else if (mode === 'portfolio') {