Merge c0cbf0f10d into f31fac76f9

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

@@ -153,9 +153,10 @@ export class GfImportActivitiesDialogComponent {
         })
         .pipe(takeUntilDestroyed(this.destroyRef))
         .subscribe(({ holdings }) => {
-          this.holdings = sortBy(holdings, ({ name }) => {
-            return name.toLowerCase();
+          this.holdings = sortBy(holdings, ({ assetProfile }) => {
+            return assetProfile.name.toLowerCase();
           });
+
           this.assetProfileForm.get('assetProfileIdentifier').enable();
 
           this.isLoading = false;

apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.html

@@ -38,18 +38,18 @@
                   <mat-option
                     class="line-height-1"
                     [value]="{
-                      dataSource: holding.dataSource,
-                      name: holding.name,
-                      symbol: holding.symbol
+                      dataSource: holding.assetProfile.dataSource,
+                      name: holding.assetProfile.name,
+                      symbol: holding.assetProfile.symbol
                     }"
                   >
                     <span
-                      ><b>{{ holding.name }}</b></span
+                      ><b>{{ holding.assetProfile.name }}</b></span
                     >
                     <br />
                     <small class="text-muted"
-                      >{{ holding.symbol | gfSymbol }} ·
-                      {{ holding.currency }}</small
+                      >{{ holding.assetProfile.symbol | gfSymbol }} ·
+                      {{ holding.assetProfile.currency }}</small
                     >
                   </mat-option>
                 }