From 374df577c1eafcd657bf4e3b1b0b959df8ff1075 Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Sat, 9 Dec 2023 14:29:49 +0100
Subject: [PATCH] Refactoring

---
 apps/api/src/app/order/order.controller.ts                    | 2 +-
 .../pages/portfolio/activities/activities-page.component.ts   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/api/src/app/order/order.controller.ts b/apps/api/src/app/order/order.controller.ts
index 07a13ba42..7e37f22b7 100644
--- a/apps/api/src/app/order/order.controller.ts
+++ b/apps/api/src/app/order/order.controller.ts
@@ -89,9 +89,9 @@ export class OrderController {
     @Headers(HEADER_KEY_IMPERSONATION.toLowerCase()) impersonationId,
     @Query('accounts') filterByAccounts?: string,
     @Query('assetClasses') filterByAssetClasses?: string,
+    @Query('skip') skip?: number,
     @Query('sortColumn') sortColumn?: string,
     @Query('sortDirection') sortDirection?: Prisma.SortOrder,
-    @Query('skip') skip?: number,
     @Query('tags') filterByTags?: string,
     @Query('take') take?: number
   ): Promise<Activities> {
diff --git a/apps/client/src/app/pages/portfolio/activities/activities-page.component.ts b/apps/client/src/app/pages/portfolio/activities/activities-page.component.ts
index f2c426dff..a1f596e37 100644
--- a/apps/client/src/app/pages/portfolio/activities/activities-page.component.ts
+++ b/apps/client/src/app/pages/portfolio/activities/activities-page.component.ts
@@ -115,9 +115,9 @@ export class ActivitiesPageComponent implements OnDestroy, OnInit {
     if (this.user?.settings?.isExperimentalFeatures === true) {
       this.dataService
         .fetchActivities({
+          skip: this.pageIndex * this.pageSize,
           sortColumn: this.sortColumn,
           sortDirection: this.sortDirection,
-          skip: this.pageIndex * this.pageSize,
           take: this.pageSize
         })
         .pipe(takeUntil(this.unsubscribeSubject))
@@ -125,7 +125,7 @@ export class ActivitiesPageComponent implements OnDestroy, OnInit {
           this.dataSource = new MatTableDataSource(activities);
           this.totalItems = count;
 
-          if (this.hasPermissionToCreateActivity && count <= 0) {
+          if (this.hasPermissionToCreateActivity && this.totalItems <= 0) {
             this.router.navigate([], { queryParams: { createDialog: true } });
           }