Merge branch 'main' into bugfix/fix-loading-state-of-lazy-loaded-activities-table-component

CHANGELOG.md

@@ -7,9 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Changed
+
+- Improved the language localization for Türkçe (`tr`)
+
 ### Fixed
 
 - Fixed the loading state in the lazy-loaded activities table on the portfolio activities page (experimental)
+- Fixed the edit of activity in the lazy-loaded activities table on the portfolio activities page (experimental)
 
 ## 2.30.0 - 2023-12-12
 

apps/client/src/app/pages/portfolio/activities/activities-page.component.ts

@@ -72,6 +72,12 @@ export class ActivitiesPageComponent implements OnDestroy, OnInit {
               return id === params['activityId'];
             });
 
+            this.openUpdateActivityDialog(activity);
+          } else if (this.dataSource) {
+            const activity = this.dataSource.data.find(({ id }) => {
+              return id === params['activityId'];
+            });
+
             this.openUpdateActivityDialog(activity);
           } else {
             this.router.navigate(['.'], { relativeTo: this.route });