From 0edf932c484f5b114b08ee6a25ebcd8753dec683 Mon Sep 17 00:00:00 2001
From: dev-rminds <dev@rminds.nl>
Date: Fri, 21 Feb 2025 12:17:47 +0200
Subject: [PATCH 1/2] fix translation key and profile menu item

---
 .../top-navbar/desktop/TopNavbarDesktopMenuUser.tsx    | 10 ++++++----
 .../modal-product-reserve/ModalProductReserve.tsx      |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/react/src/webshop/components/elements/top-navbar/desktop/TopNavbarDesktopMenuUser.tsx b/react/src/webshop/components/elements/top-navbar/desktop/TopNavbarDesktopMenuUser.tsx
index 1c3ae4bbd..44516aea5 100644
--- a/react/src/webshop/components/elements/top-navbar/desktop/TopNavbarDesktopMenuUser.tsx
+++ b/react/src/webshop/components/elements/top-navbar/desktop/TopNavbarDesktopMenuUser.tsx
@@ -177,10 +177,12 @@ export const TopNavbarDesktopMenuUser = () => {
                                 <em className="mdi mdi-cog-outline" />
                                 {translate('top_navbar.user_menu.preferences_notifications')}
                             </StateNavLink>
-                            <StateNavLink id="profile" name="profile" className="auth-user-menu-item" tabIndex={0}>
-                                <em className="mdi mdi-account-check" />
-                                {translate('top_navbar.user_menu.profile')}
-                            </StateNavLink>
+                            {authIdentity?.profile && (
+                                <StateNavLink id="profile" name="profile" className="auth-user-menu-item" tabIndex={0}>
+                                    <em className="mdi mdi-account-check" />
+                                    {translate('top_navbar.user_menu.profile')}
+                                </StateNavLink>
+                            )}
                             {envData.config.sessions && (
                                 <StateNavLink name={'security-sessions'} className="auth-user-menu-item" tabIndex={0}>
                                     <em className="mdi mdi-shield-account" />
diff --git a/react/src/webshop/components/modals/modal-product-reserve/ModalProductReserve.tsx b/react/src/webshop/components/modals/modal-product-reserve/ModalProductReserve.tsx
index 2804dd4ea..b4aa69f25 100644
--- a/react/src/webshop/components/modals/modal-product-reserve/ModalProductReserve.tsx
+++ b/react/src/webshop/components/modals/modal-product-reserve/ModalProductReserve.tsx
@@ -563,7 +563,7 @@ export default function ModalProductReserve({
                                                 <button
                                                     className="button button-primary button-sm"
                                                     onClick={() => selectVoucher(voucher)}>
-                                                    {translate('modal_reserve_product.choose')}
+                                                    {translate('modal_reserve_product.choose_credit')}
                                                 </button>
                                             </div>
                                         )}

From fad92edbd3eec50e75118e9ab893715b63fda549 Mon Sep 17 00:00:00 2001
From: dev-rminds <dev@rminds.nl>
Date: Fri, 21 Feb 2025 12:56:01 +0200
Subject: [PATCH 2/2] add profile link to mobile menu

---
 .../desktop/TopNavbarDesktopMenuUser.tsx           | 11 +++++++++++
 .../top-navbar/mobile/TopNavbarMobileMenu.tsx      | 14 ++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/react/src/webshop/components/elements/top-navbar/desktop/TopNavbarDesktopMenuUser.tsx b/react/src/webshop/components/elements/top-navbar/desktop/TopNavbarDesktopMenuUser.tsx
index 44516aea5..6fedd4e56 100644
--- a/react/src/webshop/components/elements/top-navbar/desktop/TopNavbarDesktopMenuUser.tsx
+++ b/react/src/webshop/components/elements/top-navbar/desktop/TopNavbarDesktopMenuUser.tsx
@@ -110,6 +110,7 @@ export const TopNavbarDesktopMenuUser = () => {
                                 <em className="mdi mdi-ticket-percent-outline" />
                                 {translate('top_navbar.user_menu.my_vouchers')}
                             </StateNavLink>
+
                             <div
                                 id="open_pincode_popup"
                                 tabIndex={0}
@@ -120,6 +121,7 @@ export const TopNavbarDesktopMenuUser = () => {
                                 <em className="mdi mdi-cellphone" />
                                 {translate('top_navbar.user_menu.authorize')}
                             </div>
+
                             <StateNavLink
                                 id="bookmarked_products"
                                 name={'bookmarked-products'}
@@ -128,6 +130,7 @@ export const TopNavbarDesktopMenuUser = () => {
                                 <em className="mdi mdi-cards-heart-outline" />
                                 {translate('top_navbar.user_menu.bookmarks')}
                             </StateNavLink>
+
                             <StateNavLink
                                 id="reservations"
                                 name={'reservations'}
@@ -136,6 +139,7 @@ export const TopNavbarDesktopMenuUser = () => {
                                 <em className="mdi mdi-calendar-outline" />
                                 {translate('top_navbar.user_menu.reservations')}
                             </StateNavLink>
+
                             {appConfigs.has_reimbursements && (
                                 <StateNavLink
                                     id="reimbursements"
@@ -146,6 +150,7 @@ export const TopNavbarDesktopMenuUser = () => {
                                     {translate('top_navbar.user_menu.reimbursements')}
                                 </StateNavLink>
                             )}
+
                             <StateNavLink
                                 id="fund-requests"
                                 name={'fund-requests'}
@@ -155,6 +160,7 @@ export const TopNavbarDesktopMenuUser = () => {
                                 <em className="mdi mdi-card-account-details-outline" />
                                 {translate('top_navbar.user_menu.fund_requests')}
                             </StateNavLink>
+
                             {appConfigs.has_payouts && (
                                 <StateNavLink
                                     id="payouts"
@@ -165,10 +171,12 @@ export const TopNavbarDesktopMenuUser = () => {
                                     {translate('top_navbar.user_menu.payouts')}
                                 </StateNavLink>
                             )}
+
                             <StateNavLink name={'notifications'} className="auth-user-menu-item" tabIndex={0}>
                                 <em className="mdi mdi-bell-outline" />
                                 {translate('top_navbar.user_menu.notifications')}
                             </StateNavLink>
+
                             <StateNavLink
                                 id="notification_preferences"
                                 name="preferences-notifications"
@@ -177,18 +185,21 @@ export const TopNavbarDesktopMenuUser = () => {
                                 <em className="mdi mdi-cog-outline" />
                                 {translate('top_navbar.user_menu.preferences_notifications')}
                             </StateNavLink>
+
                             {authIdentity?.profile && (
                                 <StateNavLink id="profile" name="profile" className="auth-user-menu-item" tabIndex={0}>
                                     <em className="mdi mdi-account-check" />
                                     {translate('top_navbar.user_menu.profile')}
                                 </StateNavLink>
                             )}
+
                             {envData.config.sessions && (
                                 <StateNavLink name={'security-sessions'} className="auth-user-menu-item" tabIndex={0}>
                                     <em className="mdi mdi-shield-account" />
                                     {translate('top_navbar.user_menu.security_sessions')}
                                 </StateNavLink>
                             )}
+
                             <StateNavLink
                                 id="identity_emails"
                                 name="identity-emails"
diff --git a/react/src/webshop/components/elements/top-navbar/mobile/TopNavbarMobileMenu.tsx b/react/src/webshop/components/elements/top-navbar/mobile/TopNavbarMobileMenu.tsx
index 72662dc26..6bffe07de 100644
--- a/react/src/webshop/components/elements/top-navbar/mobile/TopNavbarMobileMenu.tsx
+++ b/react/src/webshop/components/elements/top-navbar/mobile/TopNavbarMobileMenu.tsx
@@ -264,6 +264,20 @@ export default function TopNavbarMobileMenu() {
                         </StateNavLink>
                     )}
 
+                    {authIdentity?.profile && (
+                        <StateNavLink
+                            className="mobile-menu-item"
+                            name="profile"
+                            onClick={hideMobileMenu}
+                            aria-current={route.state?.name == 'profile' ? 'true' : undefined}
+                            onKeyDown={clickOnKeyEnter}
+                            tabIndex={0}
+                            role="link">
+                            <em className="mobile-menu-item-icon mdi mdi-account-check" />
+                            {translate('top_navbar.buttons.mobile.dropdown.profile')}
+                        </StateNavLink>
+                    )}
+
                     {authIdentity && envData.config.sessions && (
                         <StateNavLink
                             className="mobile-menu-item"