Merge branch 'master' into age-withdraw

2 files changed, 4 insertions, 6 deletions

diff --git a/packages/merchant-backoffice-ui/src/components/menu/SideBar.tsx b/packages/merchant-backoffice-ui/src/components/menu/SideBar.tsx
index 402134096..6905cb4d0 100644
--- a/packages/merchant-backoffice-ui/src/components/menu/SideBar.tsx
+++ b/packages/merchant-backoffice-ui/src/components/menu/SideBar.tsx
@@ -177,12 +177,12 @@ export function Sidebar({
                 </a>
               </li>
               <li>
-                <a href={"/server"} class="has-icon">
+                <a href={"/settings"} class="has-icon">
                   <span class="icon">
                     <i class="mdi mdi-square-edit-outline" />
                   </span>
                   <span class="menu-item-label">
-                    <i18n.Translate>Server</i18n.Translate>
+                    <i18n.Translate>Settings</i18n.Translate>
                   </span>
                 </a>
               </li>
diff --git a/packages/merchant-backoffice-ui/src/components/menu/index.tsx b/packages/merchant-backoffice-ui/src/components/menu/index.tsx
index b8ac2c9ab..0e881d7a5 100644
--- a/packages/merchant-backoffice-ui/src/components/menu/index.tsx
+++ b/packages/merchant-backoffice-ui/src/components/menu/index.tsx
@@ -24,7 +24,7 @@ import { Sidebar } from "./SideBar.js";
 
 function getInstanceTitle(path: string, id: string): string {
   switch (path) {
-    case InstancePaths.server:
+    case InstancePaths.settings:
       return `${id}: Settings`;
     case InstancePaths.order_list:
       return `${id}: Orders`;
@@ -64,9 +64,7 @@ function getInstanceTitle(path: string, id: string): string {
       return `${id}: Templates`;
     case InstancePaths.templates_use:
       return `${id}: Use template`;
-    case InstancePaths.settings:
-      return `${id}: Interface`;
-    case InstancePaths.settings:
+    case InstancePaths.interface:
       return `${id}: Interface`;
     default:
       return "";