From 64d9d75399042adc2992df866dc9924c61644586 Mon Sep 17 00:00:00 2001
From: alicegoarnisson <alice.goarnisson@pix.fr>
Date: Fri, 29 Nov 2024 16:15:53 +0100
Subject: [PATCH] feat(orga): add pix-navigation

---
 .../support/step_definitions/login-logout.js  |  1 -
 .../organization-places-or-credit-info.gjs    |  6 --
 orga/app/components/layout/sidebar.hbs        | 95 +++++++------------
 .../components/layout/user-logged-menu.hbs    | 43 +++------
 .../app/components/layout/user-logged-menu.js | 25 ++---
 orga/app/styles/app.scss                      |  1 -
 .../organization-places-or-credit-info.scss   |  1 -
 .../app/styles/components/layout/sidebar.scss |  6 ++
 orga/app/styles/globals/pages.scss            | 15 ---
 orga/app/styles/pages/authenticated.scss      | 28 ------
 orga/app/templates/authenticated.hbs          | 23 ++---
 orga/public/pix-orga.svg                      | 67 ++++---------
 orga/tests/acceptance/authentication-test.js  | 20 ++--
 .../acceptance/campaign-creation-test.js      |  1 -
 .../acceptance/switch-organization-test.js    | 73 +++++++-------
 ...rganization-places-or-credit-info_test.gjs |  1 -
 .../components/layout/sidebar-test.js         |  3 +-
 .../layout/user-logged-menu-test.js           | 14 +--
 .../unit/components/user-logged-menu-test.js  | 22 -----
 orga/translations/en.json                     |  3 +-
 orga/translations/fr.json                     |  3 +-
 orga/translations/nl.json                     |  3 +-
 22 files changed, 151 insertions(+), 303 deletions(-)
 delete mode 100644 orga/app/styles/globals/pages.scss

diff --git a/high-level-tests/e2e/cypress/support/step_definitions/login-logout.js b/high-level-tests/e2e/cypress/support/step_definitions/login-logout.js
index 3c2d80d987c..0fd01e3e7fe 100644
--- a/high-level-tests/e2e/cypress/support/step_definitions/login-logout.js
+++ b/high-level-tests/e2e/cypress/support/step_definitions/login-logout.js
@@ -85,7 +85,6 @@ When(`je me déconnecte`, () => {
 });
 
 When(`je me déconnecte de Pix Orga`, () => {
-  cy.get('[aria-label="Ouvrir le menu utilisateur"]').click();
   cy.contains("Se déconnecter").click();
 });
 
diff --git a/orga/app/components/layout/organization-places-or-credit-info.gjs b/orga/app/components/layout/organization-places-or-credit-info.gjs
index 7907c7c9362..236d6c26980 100644
--- a/orga/app/components/layout/organization-places-or-credit-info.gjs
+++ b/orga/app/components/layout/organization-places-or-credit-info.gjs
@@ -1,6 +1,5 @@
 import PixIcon from '@1024pix/pix-ui/components/pix-icon';
 import PixTooltip from '@1024pix/pix-ui/components/pix-tooltip';
-import { LinkTo } from '@ember/routing';
 import { service } from '@ember/service';
 import Component from '@glimmer/component';
 import { t } from 'ember-intl';
@@ -23,11 +22,6 @@ export default class OrganizationPlacesOrCreditInfo extends Component {
         {{else}}
           <span>{{t "navigation.places.number" count=@placesCount}}</span>
         {{/if}}
-        {{#if this.currentUser.isAdminInOrganization}}
-          <LinkTo @route="authenticated.places" class="organization-places-or-credit-info__link">
-            {{t "navigation.places.link"}}
-          </LinkTo>
-        {{/if}}
       </div>
     {{else if this.canShowCredit}}
       <div class="organization-places-or-credit-info organization-places-or-credit-info--inline hide-on-mobile">
diff --git a/orga/app/components/layout/sidebar.hbs b/orga/app/components/layout/sidebar.hbs
index 459c41eff58..3b8cc9f3b15 100644
--- a/orga/app/components/layout/sidebar.hbs
+++ b/orga/app/components/layout/sidebar.hbs
@@ -1,85 +1,62 @@
-<aside class="sidebar">
-  <header class="sidebar__logo hide-on-mobile">
+<PixNavigation @variant="orga" @navigationAriaLabel={{t "navigation.main.aria-label"}} @menuLabel="Menu">
+  <:brand>
     <LinkTo @route={{this.redirectionRoute}}>
-      <img src="{{this.rootUrl}}/pix-orga.svg" alt="{{t 'common.home-page'}}" />
+      <img src="{{this.rootUrl}}/pix-orga.svg" class="pix-orga-logo" alt="{{t 'common.home-page'}}" />
     </LinkTo>
-  </header>
-
-  <nav class="sidebar-nav" aria-label={{t "navigation.main.aria-label"}}>
+  </:brand>
+  <:navElements>
     {{#if this.shouldDisplayCampaignsEntry}}
-      <LinkTo @route="authenticated.campaigns" class="sidebar-nav__item">
-        <span class="sidebar-nav__item-icon">
-          <PixIcon @name="conversionPath" role="none" />
-        </span>
-        {{t "navigation.main.campaigns"}}
-      </LinkTo>
+      <PixNavigationButton @route={{this.redirectionRoute}} @icon="conversionPath">
+        {{t "navigation.main.campaigns"}}</PixNavigationButton>
     {{/if}}
-
     {{#if this.shouldDisplayCertificationsEntry}}
-      <LinkTo @route="authenticated.certifications" class="sidebar-nav__item">
-        <span class="sidebar-nav__item-icon">
-          <PixIcon @name="awards" role="none" />
-        </span>
-        {{t "navigation.main.certifications"}}
-      </LinkTo>
+      <PixNavigationButton @route="authenticated.certifications" @icon="awards">
+        {{t "navigation.main.certifications"}}</PixNavigationButton>
     {{/if}}
     {{#if this.shouldDisplayAttestationsEntry}}
-      <LinkTo @route="authenticated.attestations" class="sidebar-nav__item">
-        <span class="sidebar-nav__item-icon">
-          <PixIcon @name="assignment" role="none" />
-        </span>
-        {{t "navigation.main.attestations"}}
-      </LinkTo>
+      <PixNavigationButton @route="authenticated.attestations" @icon="awards">
+        {{t "navigation.main.attestations"}}</PixNavigationButton>
     {{/if}}
     {{#if this.shouldDisplayMissionsEntry}}
-      <LinkTo @route="authenticated.missions" class="sidebar-nav__item">
-        <span class="sidebar-nav__item-icon">
-          <PixIcon @name="conversionPath" role="none" />
-        </span>
+      <PixNavigationButton @route="authenticated.missions" @icon="conversionPath">
         {{t "navigation.main.missions"}}
-      </LinkTo>
+      </PixNavigationButton>
     {{/if}}
-    <LinkTo @route={{this.organizationLearnersList.route}} class="sidebar-nav__item">
-      <span class="sidebar-nav__item-icon">
-        <PixIcon @name="infoUser" role="none" />
-      </span>
+
+    <PixNavigationButton @route={{this.organizationLearnersList.route}} @icon="infoUser">
       {{t this.organizationLearnersList.label}}
-    </LinkTo>
-    <LinkTo @route="authenticated.team" class="sidebar-nav__item">
-      <span class="sidebar-nav__item-icon">
-        <PixIcon @name="users" role="none" />
-      </span>
+    </PixNavigationButton>
+
+    <PixNavigationButton @route="authenticated.team" @icon="users">
       {{t "navigation.main.team"}}
-    </LinkTo>
+    </PixNavigationButton>
+
     {{#if this.shouldDisplayPlacesEntry}}
-      <LinkTo @route="authenticated.places" class="sidebar-nav__item">
-        <span class="sidebar-nav__item-icon">
-          <PixIcon @name="seat" role="none" />
-        </span>
+      <PixNavigationButton @route="authenticated.places" @icon="seat">
         {{t "navigation.main.places"}}
-      </LinkTo>
+      </PixNavigationButton>
     {{/if}}
+
     {{#if this.documentationUrl}}
-      <a class="sidebar-nav__item" href={{this.documentationUrl}} target="_blank" rel="noopener noreferrer">
-        <span class="sidebar-nav__item-icon">
-          <PixIcon @name="book" role="none" />
-        </span>
+      <PixNavigationButton href={{this.documentationUrl}} target="_blank" rel="noopener noreferrer" @icon="book">
         {{t "navigation.main.documentation"}}
-      </a>
+      </PixNavigationButton>
     {{/if}}
     {{#if this.shouldDisplayMissionsEntry}}
-      <a
+      <PixNavigationButton
         href="https://pix.fr/support/enseignement-scolaire/1er-degre"
         target="_blank"
-        class="sidebar-nav__item"
         rel="noopener noreferrer"
+        @icon="help"
       >
-        <span class="sidebar-nav__item-icon">
-          <PixIcon @name="help" role="none" />
-        </span>
         {{t "navigation.main.support"}}
-      </a>
+      </PixNavigationButton>
     {{/if}}
-
-  </nav>
-</aside>
\ No newline at end of file
+  </:navElements>
+  <:footer>
+    <Layout::OrganizationPlacesOrCreditInfo @placesCount={{@placesCount}} />
+    <Layout::SchoolSessionManagement />
+    <PixNavigationSeparator />
+    <Layout::UserLoggedMenu @onChangeOrganization={{@onChangeOrganization}} />
+  </:footer>
+</PixNavigation>
\ No newline at end of file
diff --git a/orga/app/components/layout/user-logged-menu.hbs b/orga/app/components/layout/user-logged-menu.hbs
index 5f16a18d016..766c73faaf5 100644
--- a/orga/app/components/layout/user-logged-menu.hbs
+++ b/orga/app/components/layout/user-logged-menu.hbs
@@ -1,28 +1,15 @@
-<button
-  type="button"
-  {{on "click" this.toggleUserMenu}}
-  aria-haspopup="listbox"
-  aria-expanded="{{this.isMenuOpen}}"
-  aria-label={{t "navigation.user-logged-menu.button"}}
-  class="user-logged-button"
-  ...attributes
->
-  <span class="user-logged-button__text">
-    <span>{{this.currentUser.prescriber.firstName}} {{this.currentUser.prescriber.lastName}}</span>
-    <span>{{this.organizationNameAndExternalId}}</span>
-  </span>
-  <PixIcon @name={{if this.isMenuOpen "chevronTop" "chevronBottom"}} />
-</button>
-
-<Dropdown::Content @display={{this.isMenuOpen}} @close={{this.closeMenu}} class="user-logged-menu">
-  {{#each this.eligibleOrganizations as |organization|}}
-    <Dropdown::Item @onClick={{fn this.onOrganizationChange organization}}>
-      {{organization.name}}
-      {{#if organization.externalId}}({{organization.externalId}}){{/if}}
-    </Dropdown::Item>
-  {{/each}}
-  <Dropdown::ItemLink @linkTo="logout">
-    <PixIcon @name="logout" class="user-logged-menu__icon" />
-    {{t "navigation.user-logged-menu.logout"}}
-  </Dropdown::ItemLink>
-</Dropdown::Content>
\ No newline at end of file
+<p>
+  <strong>
+    {{this.currentUser.prescriber.firstName}}
+    {{this.currentUser.prescriber.lastName}}
+  </strong>
+  <br />
+  {{this.organizationNameAndExternalId}}
+</p>
+<PixStructureSwitcher
+  @value={{this.currentUser.organization.id}}
+  @structures={{this.eligibleOrganizations}}
+  @label={{t "navigation.user-logged-menu.button"}}
+  @onChange={{this.onOrganizationChange}}
+/>
+<PixButtonLink @variant="tertiary" class="" @route="logout">{{t "navigation.user-logged-menu.logout"}}</PixButtonLink>
\ No newline at end of file
diff --git a/orga/app/components/layout/user-logged-menu.js b/orga/app/components/layout/user-logged-menu.js
index e05ea1da037..7148410d8ce 100644
--- a/orga/app/components/layout/user-logged-menu.js
+++ b/orga/app/components/layout/user-logged-menu.js
@@ -1,15 +1,12 @@
 import { action } from '@ember/object';
 import { service } from '@ember/service';
 import Component from '@glimmer/component';
-import { tracked } from '@glimmer/tracking';
 
 export default class UserLoggedMenu extends Component {
   @service currentUser;
   @service router;
   @service store;
 
-  @tracked isMenuOpen = false;
-
   get organizationNameAndExternalId() {
     const organization = this.currentUser.organization;
     if (organization.externalId) {
@@ -25,19 +22,11 @@ export default class UserLoggedMenu extends Component {
     }
     return memberships
       .slice()
-      .map((membership) => membership.organization)
-      .filter((organization) => organization.get('id') !== this.currentUser.organization.id)
-      .sort((a, b) => a.get('name').localeCompare(b.get('name')));
-  }
-
-  @action
-  toggleUserMenu() {
-    this.isMenuOpen = !this.isMenuOpen;
-  }
-
-  @action
-  closeMenu() {
-    this.isMenuOpen = false;
+      .map((membership) => ({
+        label: membership.organization.get('name'),
+        value: membership.organization.get('id'),
+      }))
+      .sort((a, b) => a.label.localeCompare(b.label));
   }
 
   @action
@@ -46,7 +35,7 @@ export default class UserLoggedMenu extends Component {
     const userOrgaSettingsId = prescriber.userOrgaSettings.get('id');
 
     const userOrgaSettings = await this.store.peekRecord('user-orga-setting', userOrgaSettingsId);
-    const selectedOrganization = await this.store.peekRecord('organization', organization.get('id'));
+    const selectedOrganization = await this.store.peekRecord('organization', organization.value);
 
     userOrgaSettings.organization = selectedOrganization;
     await userOrgaSettings.save({ adapterOptions: { userId: prescriber.id } });
@@ -57,7 +46,5 @@ export default class UserLoggedMenu extends Component {
 
     await this.currentUser.load();
     this.args.onChangeOrganization();
-
-    this.closeMenu();
   }
 }
diff --git a/orga/app/styles/app.scss b/orga/app/styles/app.scss
index dbc39f979e6..2b830f2e070 100644
--- a/orga/app/styles/app.scss
+++ b/orga/app/styles/app.scss
@@ -10,7 +10,6 @@
 @import 'globals/errors';
 @import 'globals/forms';
 @import 'globals/icons';
-@import 'globals/pages';
 @import 'globals/panels';
 @import 'globals/pix-loader';
 @import 'globals/tables';
diff --git a/orga/app/styles/components/layout/organization-places-or-credit-info.scss b/orga/app/styles/components/layout/organization-places-or-credit-info.scss
index 2a9bd6971ca..ccf2b1de522 100644
--- a/orga/app/styles/components/layout/organization-places-or-credit-info.scss
+++ b/orga/app/styles/components/layout/organization-places-or-credit-info.scss
@@ -4,7 +4,6 @@
   display: flex;
   flex-direction: column;
   padding: 0 30px;
-  color: var(--pix-neutral-900);
   font-weight: var(--pix-font-bold);
 
   &--inline {
diff --git a/orga/app/styles/components/layout/sidebar.scss b/orga/app/styles/components/layout/sidebar.scss
index 25c529e1f9f..4f42a954cc2 100644
--- a/orga/app/styles/components/layout/sidebar.scss
+++ b/orga/app/styles/components/layout/sidebar.scss
@@ -65,3 +65,9 @@
     height: auto;
   }
 }
+
+.pix-tooltip__trigger-element {
+  .pix-icon {
+    fill: white;
+  }
+}
diff --git a/orga/app/styles/globals/pages.scss b/orga/app/styles/globals/pages.scss
deleted file mode 100644
index a606ef61670..00000000000
--- a/orga/app/styles/globals/pages.scss
+++ /dev/null
@@ -1,15 +0,0 @@
-.page {
-  padding: 0 var(--pix-spacing-6x);
-
-  @include device-is('tablet') {
-    padding: 0 var(--pix-spacing-10x);
-  }
-
-  &__title {
-    margin-bottom: var(--pix-spacing-6x);
-  }
-}
-
-.navigation {
-  margin: var(--pix-spacing-8x) 0;
-}
diff --git a/orga/app/styles/pages/authenticated.scss b/orga/app/styles/pages/authenticated.scss
index 3e6668af3cc..4bad9bca1ad 100644
--- a/orga/app/styles/pages/authenticated.scss
+++ b/orga/app/styles/pages/authenticated.scss
@@ -1,34 +1,6 @@
-.app {
-  display: flex;
-  align-items: stretch;
-  min-height: 100vh;
-}
-
-.main-content {
-  display: flex;
-  flex-direction: column;
-
-  // Minus 280px because it corresponds to the sidebar's width
-  width: calc(100% - 280px);
-  background-color: var(--pix-neutral-20);
-
-  &__body {
-    flex: 1 0 auto;
-  }
-}
-
 .sticker-banner {
   position: sticky;
   top: 0;
   z-index: 200;
 }
 
-@include device-is('mobile') {
-  .app {
-    flex-direction: column;
-  }
-
-  .main-content {
-    width: 100%;
-  }
-}
diff --git a/orga/app/templates/authenticated.hbs b/orga/app/templates/authenticated.hbs
index 77394c6e697..6403d357fe7 100644
--- a/orga/app/templates/authenticated.hbs
+++ b/orga/app/templates/authenticated.hbs
@@ -1,18 +1,11 @@
-<div class="app">
-  <Layout::Sidebar />
-
-  <div class="main-content">
-    <header>
-      <Layout::Topbar @placesCount={{@model.available}} @onChangeOrganization={{this.onChangeOrganization}} />
-    </header>
-
-    <main class="main-content__body page">
-      <Banner::TopBanners />
-      {{outlet}}
-    </main>
+<PixAppLayout @variant="orga" class="app">
+  <Layout::Sidebar @placesCount={{@model.available}} @onChangeOrganization={{this.onChangeOrganization}} />
 
+  <main class="main-content__body page">
+    <Banner::TopBanners />
+    {{outlet}}
     <Layout::Footer />
-  </div>
+  </main>
 
-  <NotificationContainer @position="bottom-right" />
-</div>
\ No newline at end of file
+</PixAppLayout>
+<NotificationContainer @position="bottom-right" />
\ No newline at end of file
diff --git a/orga/public/pix-orga.svg b/orga/public/pix-orga.svg
index 7692b14d6e4..0b86fad4c51 100644
--- a/orga/public/pix-orga.svg
+++ b/orga/public/pix-orga.svg
@@ -1,52 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="215px" height="78px" viewBox="0 0 215 78" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 58 (84663) - https://sketch.com -->
-    <title>6. logos/pix-orga</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <linearGradient x1="0%" y1="42.3595041%" x2="100%" y2="57.6404959%" id="linearGradient-1">
-            <stop stop-color="#69F1FF" offset="0%"></stop>
-            <stop stop-color="#05A8D6" offset="100%"></stop>
-        </linearGradient>
-        <linearGradient x1="-1.11022302e-14%" y1="42.3158755%" x2="100%" y2="57.6841245%" id="linearGradient-2">
-            <stop stop-color="#00DDFF" offset="0%"></stop>
-            <stop stop-color="#0095C0" offset="100%"></stop>
-        </linearGradient>
-        <path d="M90.0290002,0 C93.6473432,0 94.989838,0.730834137 97.1595652,3.33799421 L106.665707,15.0287488 C110.694469,19.7260427 110.694469,23.2752531 106.665707,27.9673638 L97.1595652,39.6594142 C94.989838,42.2678701 93.6473432,43 90.0290002,43 L87.0085288,43 L86.5124741,43 L21,43 L19.6582785,43 C16.1495823,43 14.7808939,42.3115693 12.7227689,39.8914094 L12.5277135,39.6594142 L3.02157212,27.9673638 C-0.933940474,23.3605642 -1.00585888,19.8554827 2.80581689,15.28384 L3.02157212,15.0287488 L12.5277135,3.33799421 C14.6316915,0.809838988 15.9578126,0.0460159587 19.3355215,0.00204519218 L19.6582785,0 L23.1748047,0 L87.0085288,7.10542736e-15 L90.0290002,0 Z" id="path-3"></path>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-5">
-            <stop stop-color="#12A3FF" offset="0%"></stop>
-            <stop stop-color="#3D68FF" offset="100%"></stop>
-        </linearGradient>
-        <linearGradient x1="34.1515434%" y1="1.72254642e-14%" x2="65.8484566%" y2="100%" id="linearGradient-6">
-            <stop stop-color="#00DDFF" offset="0%"></stop>
-            <stop stop-color="#0095C0" offset="100%"></stop>
-        </linearGradient>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="73.0493975%" id="linearGradient-7">
-            <stop stop-color="#12A3FF" offset="0%"></stop>
-            <stop stop-color="#3D68FF" offset="100%"></stop>
-        </linearGradient>
-        <linearGradient x1="50%" y1="28.3619163%" x2="50%" y2="100%" id="linearGradient-8">
-            <stop stop-color="#12A3FF" offset="0%"></stop>
-            <stop stop-color="#3D68FF" offset="100%"></stop>
-        </linearGradient>
-    </defs>
-    <g id="6.-logos/pix-orga" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Group-2">
-            <g id="cartouche" transform="translate(104.303356, 18.750000)">
-                <mask id="mask-4" fill="white">
-                    <use xlink:href="#path-3"></use>
-                </mask>
-                <use id="mask" fill="url(#linearGradient-2)" xlink:href="#path-3"></use>
-                <path d="M35.636,22.952 C35.636,24.344 35.372,25.352 34.868,25.976 C34.364,26.6 33.332,26.912 31.82,26.912 C30.308,26.912 29.276,26.6 28.772,25.976 C28.268,25.352 28.004,24.344 28.004,22.952 L28.004,19.52 C28.004,18.104 28.268,17.096 28.772,16.496 C29.276,15.872 30.308,15.56 31.82,15.56 C33.332,15.56 34.364,15.872 34.868,16.496 C35.372,17.096 35.636,18.104 35.636,19.52 L35.636,22.952 Z M31.82,29.288 C34.196,29.288 35.828,28.76 36.764,27.68 C37.7,26.6 38.18,25.016 38.18,22.952 L38.18,19.52 C38.18,17.456 37.724,15.896 36.788,14.816 C35.852,13.736 34.196,13.184 31.82,13.184 C29.444,13.184 27.788,13.736 26.852,14.816 C25.916,15.896 25.46,17.456 25.46,19.52 L25.46,22.952 C25.46,25.016 25.916,26.6 26.852,27.68 C27.788,28.76 29.444,29.288 31.82,29.288 Z M53.216,18.224 C53.216,15.08 51.752,13.4 48.032,13.4 L44.24,13.4 C42.32,13.4 41.504,14.216 41.504,16.136 L41.504,27.896 C41.504,28.784 41.72,29 42.608,29 L42.92,29 C43.808,29 44.024,28.784 44.024,27.896 L44.024,23.024 L47.12,23.024 L50.264,27.944 C50.816,28.784 51.2,29 52.184,29 L52.592,29 L52.8396454,28.9943381 C53.5964298,28.9555702 53.6698182,28.7076364 53.168,27.944 L49.856,22.832 C52.256,22.328 53.216,20.792 53.216,18.224 Z M48.032,15.776 C50.048,15.776 50.696,16.52 50.696,18.224 C50.696,19.856 50.048,20.648 48.032,20.648 L44.024,20.648 L44.024,16.688 C44.024,16.088 44.336,15.776 44.96,15.776 L48.032,15.776 Z M65.42,25.712 C65.42,26.36 65.132,26.744 64.58,26.816 C64.316,26.864 63.884,26.888 63.26,26.888 C59.876,26.888 58.748,25.664 58.748,23.336 L58.748,19.496 C58.748,16.64 59.948,15.536 63.188,15.536 C64.364,15.536 65.492,15.728 66.572,16.136 C67.34,16.4 67.532,16.184 67.532,15.344 L67.532,14.984 L67.5269587,14.7309668 C67.4991142,14.1611073 67.3371765,14.0352941 66.596,13.76 C65.564,13.376 64.412,13.184 63.164,13.184 C58.364,13.184 56.156,15.464 56.156,19.328 L56.156,23.168 C56.156,27.512 58.268,29.264 63.284,29.264 C63.98,29.264 64.652,29.216 65.324,29.096 C67.22,28.784 67.796,27.848 67.796,25.736 L67.796,21.344 C67.796,20.528 67.6033333,20.29 66.8540741,20.2660741 L66.5,20.264 C65.636,20.264 65.42,20.48 65.42,21.344 L65.42,25.712 Z M80.912,17.216 C80.48,15.656 80.024,14.6 79.544,14.048 C79.064,13.472 78.248,13.184 77.072,13.184 C75.896,13.184 75.08,13.472 74.576,14.048 C74.096,14.6 73.64,15.656 73.208,17.216 L70.256,27.944 C70.04,28.784 70.184,29 71.072,29 L71.408,29 C72.296,29 72.536,28.784 72.8,27.944 L73.688,24.68 L80.432,24.68 L81.32,27.944 C81.584,28.784 81.824,29 82.712,29 L83.048,29 C83.936,29 84.08,28.784 83.864,27.944 L80.912,17.216 Z M74.288,22.4 L75.704,17.168 L75.8097648,16.7927852 C76.1341497,15.6954014 76.3771429,15.44 77.072,15.44 C77.84,15.44 78.032,15.752 78.416,17.168 L79.832,22.4 L74.288,22.4 Z" id="ORGA" fill="#FFFFFF" fill-rule="nonzero" mask="url(#mask-4)"></path>
-            </g>
-            <g id="logos--pix/couleur-copy-13">
-                <g id="Group" transform="translate(64.222222, 18.545455)">
-                    <path d="M26.0242586,24.4433576 L37.9316377,38.9821606 C40.0928699,41.7515039 39.9898234,42.2644127 36.3879222,42.2644127 L36.3879222,42.2644127 L35.1528888,42.2644127 C31.5509876,42.2644127 30.2130602,41.5464011 28.051828,38.9821606 L28.051828,38.9821606 L21.4924051,31.0228845 L23.0567435,29.1252882 C24.4487552,27.5201334 25.4379269,25.9701302 26.0242586,24.4433576 Z M36.5998475,0.00551394994 C39.9930396,0.0263034397 40.0496453,0.573180249 37.9316377,3.28713666 L37.9316377,3.28713666 L26.0243949,17.8262948 C25.438079,16.2994042 24.448859,14.7492819 23.0567348,13.143999 L21.4924051,11.2458845 L28.051828,3.28713666 C30.1475683,0.800600418 31.4691451,0.0500957119 34.8315942,0.00689389892 L35.1528888,0.00488451109 Z" id="Combined-Shape" fill="url(#linearGradient-5)"></path>
-                    <path d="M21.1442399,42.2644127 C24.7461411,42.2644127 24.8491876,41.7515039 22.6879554,38.9821606 L10.3382314,23.9040679 C9.41203253,22.7758507 8.89740989,21.8525843 8.89740989,21.1345727 C8.89740989,20.3140096 9.41203253,19.3908952 10.3382314,18.3652294 L22.6879554,3.28713666 C24.8491876,0.517793383 24.7461411,0.00488451109 21.1442399,0.00488451109 L19.9092065,0.00488451109 C16.3073053,0.00488451109 14.9693779,0.722896161 12.8081457,3.28713666 L3.34006454,14.7751711 C-0.673717732,19.3908952 -0.673717732,22.8784021 3.34006454,27.4941261 L12.8081457,38.9821606 C14.9693779,41.5464011 16.3073053,42.2644127 19.9092065,42.2644127 L21.1442399,42.2644127 Z" id="Page-1" fill="url(#linearGradient-6)" transform="translate(12.225788, 21.134649) scale(-1, 1) translate(-12.225788, -21.134649) "></path>
-                </g>
-                <path d="M0.585858586,73.9593943 C0.585858586,77.0218127 1.3540213,77.7874173 4.42667215,77.7874173 L5.45079069,77.7874173 C8.52344154,77.7874173 9.29160425,77.0218127 9.29160425,73.9593943 L9.29160425,56.1805665 C11.5960924,59.8383734 15.778328,61.7098677 21.8381635,61.7098677 C33.7018786,61.7098677 39.5910768,55.4999964 39.5910768,43.1654353 L39.5910768,35.7646398 C39.5910768,23.4299316 33.2751379,17.645527 20.0457346,17.645527 C7.75527882,17.645527 0.585858586,23.6001477 0.585858586,35.7646398 L0.585858586,73.9593943 Z M30.8000126,43.3355043 C30.8000126,50.4810492 28.4102058,53.4584331 20.1312008,53.4584331 C11.681411,53.4584331 9.29160425,50.3960147 9.29160425,43.3355043 L9.29160425,36.0197433 C9.29160425,28.8741984 11.8521958,25.8117799 20.1312008,25.8117799 C28.580843,25.8117799 30.8000126,28.8741984 30.8000126,36.0197433 L30.8000126,43.3355043 Z" id="Fill-1" fill="url(#linearGradient-7)"></path>
-                <path d="M47.8008794,56.8796182 C47.8008794,59.9420366 48.5690421,60.7076412 51.641693,60.7076412 L52.7511301,60.7076412 C55.823781,60.7076412 56.5919437,59.9420366 56.5919437,56.8796182 L56.5919437,22.3426706 C56.5919437,19.2802522 55.823781,18.5146476 52.7511301,18.5146476 L51.641693,18.5146476 C48.5690421,18.5146476 47.8008794,19.2802522 47.8008794,22.3426706 L47.8008794,56.8796182 Z M48.3982573,9.32753945 C50.5321082,11.3691027 53.9460335,11.3691027 55.9945658,9.32753945 C58.1282691,7.2007946 58.1282691,3.79823823 55.9945658,1.75667499 C53.9460335,-0.370069858 50.5321082,-0.370069858 48.3982573,1.75667499 C46.264554,3.79823823 46.264554,7.2007946 48.3982573,9.32753945 L48.3982573,9.32753945 Z" id="Fill-2" fill="url(#linearGradient-8)"></path>
-            </g>
-        </g>
-    </g>
+<svg viewbox="0 0 132 48" width="132" height="48" fill="none"
+  xmlns="http://www.w3.org/2000/svg">
+  <mask id="a" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="64" y="11" width="68"
+    height="28">
+    <path
+      d="M76.313 38.083c-2.16 0-3.01-.422-4.273-1.903l-.137-.162-5.88-7.23c-2.44-2.841-2.491-5.005-.153-7.82l.153-.18 5.88-7.23c1.295-1.556 2.114-2.031 4.184-2.062l.226-.002h43.527c2.239 0 3.069.452 4.411 2.064l5.88 7.23c2.492 2.904 2.492 5.098 0 8l-5.88 7.23c-1.342 1.612-2.172 2.065-4.411 2.065H76.313Z"
+      fill="#fff" />
+  </mask>
+  <g mask="url(#a)">
+    <path fill-rule="evenodd" clip-rule="evenodd"
+      d="M72.198 35.572c1.264 1.447 2.113 1.86 4.273 1.86h43.522c2.238 0 3.068-.443 4.41-2.02l5.879-7.064c2.492-2.835 2.492-4.98 0-7.818l-5.879-7.063c-1.342-1.576-2.172-2.017-4.41-2.017H76.471l-.226.001c-2.07.03-2.888.495-4.184 2.016l-5.879 7.063-.152.177c-2.338 2.751-2.288 4.865.152 7.641l5.88 7.065.136.159Zm14.233-8.286c.312-.386.475-1.009.475-1.87v-2.122c0-.875-.163-1.499-.475-1.87-.311-.386-.95-.578-1.885-.578s-1.574.192-1.885.578c-.312.371-.475.995-.475 1.87v2.122c0 .861.163 1.484.475 1.87.311.386.95.579 1.885.579s1.574-.193 1.885-.579Zm1.173 1.054c-.579.668-1.588.994-3.058.994-1.47 0-2.494-.326-3.073-.994-.579-.668-.86-1.647-.86-2.924v-2.122c0-1.276.281-2.24.86-2.909.58-.667 1.603-1.009 3.073-1.009s2.494.342 3.073 1.01c.579.667.861 1.632.861 2.908v2.122c0 1.277-.297 2.256-.876 2.924Zm6.784-8.83c2.301 0 3.207 1.039 3.207 2.983 0 1.588-.594 2.538-2.079 2.85l2.05 3.16c.31.472.264.626-.204.65l-.153.003h-.252c-.61 0-.847-.133-1.188-.653l-1.945-3.042H91.91v3.013c0 .549-.133.682-.683.682h-.193c-.549 0-.683-.133-.683-.682v-7.272c0-1.188.505-1.692 1.693-1.692h2.345Zm1.648 2.983c0-1.054-.4-1.514-1.648-1.514h-1.9c-.386 0-.579.193-.579.564v2.449h2.48c1.246 0 1.647-.49 1.647-1.5Zm8.402 5.313c.342-.045.52-.282.52-.683v-2.7c0-.535.134-.669.668-.669l.219.002c.463.014.583.162.583.666v2.716c0 1.306-.357 1.885-1.529 2.077a7.131 7.131 0 0 1-1.262.104c-3.103 0-4.41-1.083-4.41-3.77v-2.373c0-2.39 1.367-3.8 4.336-3.8.771 0 1.484.119 2.122.357.52.192.579.267.579.756l-.001.306c-.013.45-.144.56-.592.407a5.875 5.875 0 0 0-2.094-.371c-2.004 0-2.746.682-2.746 2.448v2.375c0 1.44.698 2.196 2.791 2.196.386 0 .653-.015.816-.044Zm9.071-7.895c.297.34.579.994.846 1.958l1.826 6.634c.133.52.044.653-.505.653h-.208c-.549 0-.697-.133-.861-.653l-.549-2.018h-4.171l-.55 2.018c-.163.52-.312.653-.861.653h-.208c-.549 0-.638-.133-.504-.653l1.826-6.634c.267-.964.549-1.617.846-1.958.312-.357.816-.535 1.544-.535.727 0 1.232.178 1.529.535Zm-2.376 1.929-.875 3.235h3.429l-.876-3.235c-.238-.876-.356-1.069-.831-1.069-.43 0-.58.158-.781.837l-.066.232Z"
+      fill="#fff" />
+  </g>
+  <path fill-rule="evenodd" clip-rule="evenodd"
+    d="m55.459 26.482 7.365 8.99c1.337 1.713 1.273 2.03-.955 2.03h-.764c-2.227 0-3.055-.444-4.392-2.03l-4.057-4.922.967-1.173c.861-.992 1.473-1.95 1.836-2.895Zm6.559-15.11c2.081.014 2.113.355.806 2.028l-7.365 8.99c-.363-.944-.974-1.902-1.836-2.895l-.967-1.173 4.057-4.922c1.29-1.53 2.107-1.997 4.167-2.028l.225-.001h.913ZM41.408 37.502c-2.228 0-2.292-.317-.955-2.03l7.639-9.323c.572-.698.89-1.269.89-1.713 0-.507-.318-1.078-.89-1.712l-7.64-9.324c-1.336-1.712-1.272-2.03.956-2.03h.764c2.227 0 3.055.445 4.392 2.03l5.856 7.104c2.483 2.854 2.483 5.01 0 7.865l-5.856 7.103c-1.337 1.586-2.165 2.03-4.392 2.03h-.764ZM0 45.633C0 47.526.475 48 2.376 48h.633c1.9 0 2.376-.474 2.376-2.367V34.639c1.425 2.262 4.012 3.42 7.76 3.42 7.339 0 10.981-3.84 10.981-11.468v-4.576c0-7.627-3.906-11.204-12.09-11.204C4.436 10.811 0 14.493 0 22.015v23.618Zm18.689-18.937c0 4.419-1.478 6.26-6.6 6.26-5.226 0-6.704-1.894-6.704-6.26v-4.523c0-4.419 1.584-6.312 6.705-6.312 5.226 0 6.599 1.893 6.599 6.312v4.524ZM29.205 35.072c0 1.893.475 2.367 2.375 2.367h.687c1.9 0 2.375-.474 2.375-2.367V13.716c0-1.894-.475-2.367-2.376-2.367h-.686c-1.9 0-2.375.473-2.375 2.367v21.356Zm.37-29.404c1.319 1.262 3.43 1.262 4.698 0 1.32-1.315 1.32-3.42 0-4.682-1.267-1.315-3.38-1.315-4.699 0-1.32 1.263-1.32 3.367 0 4.682Z"
+    fill="#fff" />
 </svg>
\ No newline at end of file
diff --git a/orga/tests/acceptance/authentication-test.js b/orga/tests/acceptance/authentication-test.js
index 86c4ecffc70..3cc7414690d 100644
--- a/orga/tests/acceptance/authentication-test.js
+++ b/orga/tests/acceptance/authentication-test.js
@@ -1,5 +1,5 @@
 import { clickByName, fillByLabel, visit } from '@1024pix/ember-testing-library';
-import { currentURL } from '@ember/test-helpers';
+import { click, currentURL } from '@ember/test-helpers';
 import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
 import { t } from 'ember-intl/test-support';
 import { setupApplicationTest } from 'ember-qunit';
@@ -269,15 +269,18 @@ module('Acceptance | authentication', function (hooks) {
     });
 
     module('When prescriber can access missions', function (hooks) {
-      let clock;
+      let clock, now;
+      hooks.beforeEach(function () {
+        now = new Date(2024, 5, 12, 14);
+        clock = sinon.useFakeTimers({ now, toFake: ['Date'], shouldAdvanceTime: true });
+      });
+
       hooks.afterEach(function () {
         clock.restore();
       });
 
       test('should display session status', async function (assert) {
-        const now = new Date(2024, 5, 12, 14);
         const sessionExpirationDate = new Date(2024, 5, 12, 16);
-        clock = sinon.useFakeTimers({ now, toFake: ['Date'] });
         const user = createPrescriberForOrganization(
           { lang: 'fr', pixOrgaTermsOfServiceAccepted: true },
           {
@@ -290,6 +293,7 @@ module('Acceptance | authentication', function (hooks) {
           },
         );
         await authenticateSession(user.id);
+
         const screen = await visit('/');
 
         assert.ok(
@@ -298,8 +302,6 @@ module('Acceptance | authentication', function (hooks) {
       });
 
       test('should handle starting session', async function (assert) {
-        const now = new Date(2024, 5, 12, 14);
-        clock = sinon.useFakeTimers({ now, toFake: ['Date'] });
         const user = createPrescriberForOrganization(
           { lang: 'fr', pixOrgaTermsOfServiceAccepted: true },
           {
@@ -312,9 +314,13 @@ module('Acceptance | authentication', function (hooks) {
           },
         );
         await authenticateSession(user.id);
+
         const screen = await visit('/');
-        await clickByName(t('navigation.school-sessions.activate-button'));
 
+        const activateButton = await screen.findByRole('button', {
+          name: t('navigation.school-sessions.activate-button'),
+        });
+        await click(activateButton);
         assert.ok(
           screen.getByText(t('navigation.school-sessions.status.active-label', { sessionExpirationDate: '18:00' })),
         );
diff --git a/orga/tests/acceptance/campaign-creation-test.js b/orga/tests/acceptance/campaign-creation-test.js
index 38b825c1a90..ee226246791 100644
--- a/orga/tests/acceptance/campaign-creation-test.js
+++ b/orga/tests/acceptance/campaign-creation-test.js
@@ -59,7 +59,6 @@ module('Acceptance | Campaign Creation', function (hooks) {
       const screen = await visit('/campagnes/creation');
       await fillByLabel('Nom de la campagne *', 'Ma Campagne');
       await clickByName('Évaluer les participants');
-
       await click(screen.getByLabelText(`${t('pages.campaign-creation.target-profiles-list-label')} *`));
       await click(await screen.findByRole('option', { name: expectedTargetProfileName }));
 
diff --git a/orga/tests/acceptance/switch-organization-test.js b/orga/tests/acceptance/switch-organization-test.js
index 0847eeddb49..f4790266951 100644
--- a/orga/tests/acceptance/switch-organization-test.js
+++ b/orga/tests/acceptance/switch-organization-test.js
@@ -1,4 +1,5 @@
-import { clickByName, visit } from '@1024pix/ember-testing-library';
+import { visit } from '@1024pix/ember-testing-library';
+import { click } from '@ember/test-helpers';
 import { currentURL } from '@ember/test-helpers';
 import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
 import { setupApplicationTest } from 'ember-qunit';
@@ -30,18 +31,6 @@ module('Acceptance | Switch Organization', function (hooks) {
       // then
       assert.ok(screen.getByText('BRO & Evil Associates (EXTBRO)'));
     });
-
-    test('should only have disconnect item in menu', async function (assert) {
-      // given
-      await visit('/');
-
-      // when
-      await clickByName('Ouvrir le menu utilisateur');
-
-      // then
-      assert.dom('.user-logged-menu > li').exists({ count: 1 });
-      assert.dom('.user-logged-menu > li').hasText('Se déconnecter');
-    });
   });
 
   module('When connected prescriber is linked to multiples organizations', function (hooks) {
@@ -54,47 +43,56 @@ module('Acceptance | Switch Organization', function (hooks) {
 
     test('should have an organization in menu', async function (assert) {
       // when
-      await visit('/');
-      await clickByName('Ouvrir le menu utilisateur');
-
+      const screen = await visit('/');
+      const button = screen.getByRole('button', { name: "Changer d'organisation" });
+      await click(button);
       // then
-      assert.dom('.user-logged-menu > li').exists({ count: 2 });
-      assert.dom('.user-logged-menu > li').hasText('My Heaven Company (HEAVEN)');
+      const listbox = await screen.findAllByRole('option');
+      assert.strictEqual(listbox.length, 2);
+      assert.ok(await screen.findByRole('option', { name: 'BRO & Evil Associates' }));
     });
 
     module('When prescriber click on an organization', function () {
-      test('should change main organization in summary', async function (assert) {
+      test('should find the selected organization in list', async function (assert) {
         // when
         const screen = await visit('/');
 
-        await clickByName('Ouvrir le menu utilisateur');
-        await clickByName('My Heaven Company (HEAVEN)');
+        const button = screen.getByRole('button', { name: "Changer d'organisation" });
+        await click(button);
+        const organizationSelected = await screen.findByRole('option', { name: 'My Heaven Company' });
+        await click(organizationSelected);
 
         // then
-        assert.ok(screen.getByText('My Heaven Company (HEAVEN)'));
+        assert.ok(organizationSelected);
       });
 
-      test('should have the old main organization in the menu', async function (assert) {
+      test('should have the old main organization in the menu after switching', async function (assert) {
         // when
-        await visit('/');
+        const screen = await visit('/');
 
-        await clickByName('Ouvrir le menu utilisateur');
-        await clickByName('My Heaven Company (HEAVEN)');
-        await clickByName('Ouvrir le menu utilisateur');
+        const button = screen.getByRole('button', { name: "Changer d'organisation" });
+        await click(button);
 
-        // then
-        assert.dom('.user-logged-menu > li').exists({ count: 2 });
-        assert.dom('.user-logged-menu > li').hasText('BRO & Evil Associates (EXTBRO)');
+        const oldOrganization = await screen.findByRole('option', { name: 'My Heaven Company' });
+        await click(screen.getByText('My Heaven Company'));
+        await click(button);
+        const listbox = await screen.findAllByRole('option');
+
+        //then
+        assert.strictEqual(listbox.length, 2);
+        assert.ok(oldOrganization);
       });
 
       module('When prescriber is on campaign page with pagination', function () {
         test('it should reset the queryParams when redirecting', async function (assert) {
           // given
-          await visit('/campagnes/les-miennes?pageNumber=2&pageSize=10&name=test&status=archived');
+          const screen = await visit('/campagnes/les-miennes?pageNumber=2&pageSize=10&name=test&status=archived');
 
           // when
-          await clickByName('Ouvrir le menu utilisateur');
-          await clickByName('My Heaven Company (HEAVEN)');
+          const button = screen.getByRole('button', { name: "Changer d'organisation" });
+          await click(button);
+          const oldOrganization = await screen.findByRole('option', { name: 'My Heaven Company' });
+          await click(oldOrganization);
 
           // then
           assert.strictEqual(currentURL(), '/campagnes/les-miennes');
@@ -106,13 +104,14 @@ module('Acceptance | Switch Organization', function (hooks) {
         function () {
           test('it should display student menu item', async function (assert) {
             // when
-            await visit('/');
+            const screen = await visit('/');
 
-            await clickByName('Ouvrir le menu utilisateur');
-            await clickByName('My Heaven Company (HEAVEN)');
+            const button = screen.getByRole('button', { name: "Changer d'organisation" });
+            await click(button);
+            await click(screen.getByText('My Heaven Company'));
 
             // then
-            assert.dom('.sidebar').containsText('Élèves');
+            assert.ok(screen.getByText('Élèves'));
           });
         },
       );
diff --git a/orga/tests/integration/components/layout/organization-places-or-credit-info_test.gjs b/orga/tests/integration/components/layout/organization-places-or-credit-info_test.gjs
index f7e0c30a96d..39ab82e2a17 100644
--- a/orga/tests/integration/components/layout/organization-places-or-credit-info_test.gjs
+++ b/orga/tests/integration/components/layout/organization-places-or-credit-info_test.gjs
@@ -47,7 +47,6 @@ module('Integration | Components | Layout | OrganizationPlacesOrCreditInfo', fun
 
       // then
       assert.ok(screen.getByText(t('navigation.places.number', { count: placesNumber })));
-      assert.ok(screen.getByRole('link', { name: t('navigation.places.link'), href: '/places' }));
     });
 
     test('when there is 0 places left', async function (assert) {
diff --git a/orga/tests/integration/components/layout/sidebar-test.js b/orga/tests/integration/components/layout/sidebar-test.js
index a2a6d05ec64..2723aaca3fc 100644
--- a/orga/tests/integration/components/layout/sidebar-test.js
+++ b/orga/tests/integration/components/layout/sidebar-test.js
@@ -52,7 +52,7 @@ module('Integration | Component | Layout::Sidebar', function (hooks) {
       assert.dom(logoLink).hasAttribute('href', '/campagnes');
     });
 
-    test('should display Campagne and Équipe menu for all organisation members', async function (assert) {
+    test('should display Campagne, Équipe, Se déconnecter in menu for all organisation members', async function (assert) {
       class CurrentUserStub extends Service {
         organization = Object.create({ id: '1' });
         canAccessCampaignsPage = true;
@@ -65,6 +65,7 @@ module('Integration | Component | Layout::Sidebar', function (hooks) {
 
       assert.dom(screen.getByText('Campagnes')).exists();
       assert.dom(screen.getByText('Équipe')).exists();
+      assert.dom(screen.getByText('Se déconnecter')).exists();
     });
 
     test('should display Documentation menu when the organization has a documentation url', async function (assert) {
diff --git a/orga/tests/integration/components/layout/user-logged-menu-test.js b/orga/tests/integration/components/layout/user-logged-menu-test.js
index 2129ef86c91..fc101c78812 100644
--- a/orga/tests/integration/components/layout/user-logged-menu-test.js
+++ b/orga/tests/integration/components/layout/user-logged-menu-test.js
@@ -58,20 +58,20 @@ module('Integration | Component | Layout::UserLoggedMenu', function (hooks) {
   test('should display the disconnect link when menu is open', async function (assert) {
     // when
     const screen = await render(hbs`<Layout::UserLoggedMenu />`);
-    await clickByName('Ouvrir le menu utilisateur');
+    await clickByName("Changer d'organisation");
 
     // then
     assert.ok(screen.getByRole('link', { name: 'Se déconnecter' }));
   });
 
-  test('should display the organizations name and externalId when menu is open', async function (assert) {
+  test('should display the organizations name when menu is open', async function (assert) {
     // when
     const screen = await render(hbs`<Layout::UserLoggedMenu />`);
-    await clickByName('Ouvrir le menu utilisateur');
+    await clickByName("Changer d'organisation");
 
     // then
-    assert.ok(screen.getByRole('button', { name: `${organization2.name} (${organization2.externalId})` }));
-    assert.ok(screen.getByRole('button', { name: `${organization3.name} (${organization3.externalId})` }));
+    assert.ok(await screen.findByRole('option', { name: `${organization2.name}` }));
+    assert.ok(await screen.findByRole('option', { name: `${organization3.name}` }));
   });
 
   test('should redirect to authenticated route before reload the current user', async function (assert) {
@@ -93,8 +93,8 @@ module('Integration | Component | Layout::UserLoggedMenu', function (hooks) {
     this.owner.register('service:store', StoreStub);
 
     const screen = await render(hbs`<Layout::UserLoggedMenu @onChangeOrganization={{this.onChangeOrganization}} />`);
-    await clickByName('Ouvrir le menu utilisateur');
-    await click(screen.getByRole('button', { name: `${organization2.name} (${organization2.externalId})` }));
+    await clickByName("Changer d'organisation");
+    await click(await screen.findByRole('option', { name: `${organization2.name}` }));
 
     sinon.assert.callOrder(replaceWithStub, loadStub);
     assert.ok(onChangeOrganization.calledOnce);
diff --git a/orga/tests/unit/components/user-logged-menu-test.js b/orga/tests/unit/components/user-logged-menu-test.js
index 0627cd51562..6f86f24bfe5 100644
--- a/orga/tests/unit/components/user-logged-menu-test.js
+++ b/orga/tests/unit/components/user-logged-menu-test.js
@@ -12,28 +12,6 @@ module('Unit | Component | user-logged-menu', (hooks) => {
     component = createGlimmerComponent('component:layout/user-logged-menu');
   });
 
-  module('action#toggleUserMenu', () => {
-    test('should return false as default value', function (assert) {
-      // then
-      assert.false(component.isMenuOpen);
-    });
-
-    test('should return true, when user details is clicked', async function (assert) {
-      // when
-      await component.toggleUserMenu();
-      // then
-      assert.true(component.isMenuOpen);
-    });
-
-    test('should return false, when isMenuOpen was previously true', async function (assert) {
-      // when
-      await component.toggleUserMenu();
-      await component.toggleUserMenu();
-      // then
-      assert.false(component.isMenuOpen);
-    });
-  });
-
   module('organizationNameAndExternalId', () => {
     test('should return the organization name if the externalId is not defined', function (assert) {
       // given
diff --git a/orga/translations/en.json b/orga/translations/en.json
index 55cc99d295b..742f778bceb 100644
--- a/orga/translations/en.json
+++ b/orga/translations/en.json
@@ -353,6 +353,7 @@
       "campaigns": "Campaigns",
       "certifications": "Certifications",
       "documentation": "Documentation",
+      "home": "Home",
       "missions": "Missions",
       "organization-participants": "Participants",
       "places": "Seats",
@@ -380,7 +381,7 @@
       "aria-label": "Team members navigation"
     },
     "user-logged-menu": {
-      "button": "Open user menu",
+      "button": "Change organization",
       "logout": "Log out"
     }
   },
diff --git a/orga/translations/fr.json b/orga/translations/fr.json
index 8a86a848c4b..cd9ba2c1bce 100644
--- a/orga/translations/fr.json
+++ b/orga/translations/fr.json
@@ -359,6 +359,7 @@
       "campaigns": "Campagnes",
       "certifications": "Certifications",
       "documentation": "Documentation",
+      "home": "Accueil",
       "missions": "Missions",
       "organization-participants": "Participants",
       "places": "Places",
@@ -386,7 +387,7 @@
       "aria-label": "Navigation de la section équipe"
     },
     "user-logged-menu": {
-      "button": "Ouvrir le menu utilisateur",
+      "button": "Changer d'organisation",
       "logout": "Se déconnecter"
     }
   },
diff --git a/orga/translations/nl.json b/orga/translations/nl.json
index 92a38ce910e..f96030398a6 100644
--- a/orga/translations/nl.json
+++ b/orga/translations/nl.json
@@ -353,6 +353,7 @@
       "campaigns": "Campagnes",
       "certifications": "Certificeringen",
       "documentation": "Documentatie",
+      "home": "Home",
       "missions": "Opdrachten",
       "organization-participants": "Deelnemers",
       "places": "Plaatsen",
@@ -380,7 +381,7 @@
       "aria-label": "Navigeren door het gedeelte Team"
     },
     "user-logged-menu": {
-      "button": "Gebruikersmenu openen",
+      "button": "Veranderende organisatie",
       "logout": "Uitloggen"
     }
   },