Refactoring

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> {

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 } });
           }