Merge branch 'main' into feature/add-support-to-exclude-activity-from-analysis-via-tag

CHANGELOG.md

@@ -7,10 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Added
+
 - Added support to exclude an activity from analysis based on tags
+- Added a _Storybook_ story for the membership card component
 
 ### Changed
 
+- Moved the support for changing the asset profile identifier (`dataSource` and `symbol`) in the asset profile details dialog of the admin control panel from experimental to general availability
 - Improved the balance of headings on the landing page
 - Improved the language localization for Spanish (`es`)
 - Upgraded `angular` from version `20.0.7` to `20.1.3`

apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.component.ts

@@ -233,8 +233,7 @@ export class GfAssetProfileDialogComponent implements OnDestroy, OnInit {
   public get canEditAssetProfileIdentifier() {
     return (
       this.assetProfile?.assetClass &&
-      !['MANUAL'].includes(this.assetProfile?.dataSource) &&
+      !['MANUAL'].includes(this.assetProfile?.dataSource)
-      this.user?.settings?.isExperimentalFeatures
     );
   }
 

libs/ui/src/lib/membership-card/membership-card.component.stories.ts

@@ -0,0 +1,50 @@
+import { CommonModule } from '@angular/common';
+import '@angular/localize/init';
+import { MatButtonModule } from '@angular/material/button';
+import { ActivatedRoute, RouterModule } from '@angular/router';
+import { IonIcon } from '@ionic/angular/standalone';
+import { moduleMetadata } from '@storybook/angular';
+import type { Meta, StoryObj } from '@storybook/angular';
+import { addYears } from 'date-fns';
+
+import { GfLogoComponent } from '../logo';
+import { GfMembershipCardComponent } from './membership-card.component';
+
+export default {
+  title: 'Membership Card',
+  component: GfMembershipCardComponent,
+  decorators: [
+    moduleMetadata({
+      imports: [
+        CommonModule,
+        GfLogoComponent,
+        IonIcon,
+        MatButtonModule,
+        RouterModule.forChild([])
+      ],
+      providers: [{ provide: ActivatedRoute, useValue: {} }]
+    })
+  ],
+  argTypes: {
+    name: {
+      control: { type: 'select' },
+      options: ['Basic', 'Premium']
+    }
+  }
+} as Meta<GfMembershipCardComponent>;
+
+type Story = StoryObj<GfMembershipCardComponent>;
+
+export const Basic: Story = {
+  args: {
+    name: 'Basic'
+  }
+};
+
+export const Premium: Story = {
+  args: {
+    expiresAt: addYears(new Date(), 1).toLocaleDateString(),
+    hasPermissionToCreateApiKey: true,
+    name: 'Premium'
+  }
+};