Merge branch 'release/6.x.x' into feature/isctr-13-test-attribution

# Conflicts: # CHANGELOG.md # package.json # projects/fusion-ui/package.json
ironSource · Oct 8, 2023 · e81f6de · e81f6de
2 parents 516462b + 5ebe9c1
commit e81f6de
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,21 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
 
-## [6.1.0-rc.2](https://github.com/ironSource/fusion-ui/compare/v6.1.0-rc.1...v6.1.0-rc.2) (2023-10-05)
+### [6.1.1](https://github.com/ironSource/fusion-ui/compare/v6.1.0...v6.1.1) (2023-10-08)
 
-## [6.1.0-rc.1](https://github.com/ironSource/fusion-ui/compare/v6.1.0-rc.0...v6.1.0-rc.1) (2023-10-05)
-
-
-### CI
-
-* **isct-13:** add attributes to the include-exclude component ([d9ff283](https://github.com/ironSource/fusion-ui/commit/d9ff28364312f0f864a16ad64a125c626f6a1aab))
-
-## [6.1.0-rc.0](https://github.com/ironSource/fusion-ui/compare/v6.0.1...v6.1.0-rc.0) (2023-10-04)
+## [6.1.0](https://github.com/ironSource/fusion-ui/compare/v6.0.1...v6.1.0) (2023-10-08)
 
 
 ### Features
 
-* **storybook:** up storybook version ([960ab61](https://github.com/ironSource/fusion-ui/commit/960ab61a736bac42a51e671369a59b1a0f48b9e8))
 * **storybook:** up storybook version ([936f9ae](https://github.com/ironSource/fusion-ui/commit/936f9ae864c4a9d0f0471c9687764525baa508b1))
 * **storybook:** up storybook version ([8caa520](https://github.com/ironSource/fusion-ui/commit/8caa520a4021fdb11b411771d4b5c2d90897c85d))
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "fusion-ui",
-    "version": "6.1.0-rc.2",
+    "version": "6.1.1",
     "description": "UI library created by ironSource",
     "license": "MIT",
     "repository": {

diff --git a/projects/fusion-ui/components/navigation-menu/v4/navigation-menu.component.ts b/projects/fusion-ui/components/navigation-menu/v4/navigation-menu.component.ts
@@ -10,7 +10,7 @@ import {NavigationPrimaryMenuComponent} from './navigation-primary-menu/navigati
 import {NavigationSecondaryMenuComponent} from './navigation-secondary-menu/navigation-secondary-menu.component';
 import {StorageService, StorageType} from '@ironsource/fusion-ui/services/stogare';
 
-const MENU_CACHE_KEY = 'fusionMenuCollapsed';
+const MENU_CACHE_KEY = 'persistent_fusionMenuCollapsed';
 
 @Component({
     selector: 'fusion-navigation-menu',

diff --git a/projects/fusion-ui/package.json b/projects/fusion-ui/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@ironsource/fusion-ui",
-    "version": "6.1.0-rc.2",
+    "version": "6.1.1",
     "dependencies": {
         "chart.js": "^3.5.1",
         "@floating-ui/dom": "^1.0.9",