Merge branch 'dev' into feature/install-page

# Conflicts: # backend/bot/app/web/admin_api_impl/settings.py # backend/bot/app/web/webapp/cache_helpers.py # frontend/src/admin/sections/SettingsSection.svelte # tests/test_admin_settings_manifest_i18n.py
2026-05-22 22:57:24 +03:00
parent 9e61a3d8a8 443e2e62db
commit d3925cad22
31 changed files with 2093 additions and 219 deletions
@@ -34,6 +34,7 @@
  export let user = {};
  export let userAgreementUrl = "";
  export let userLanguage = "";
+  export let showLogout = true;

  export let linkTelegramAccount = () => {};
  export let logout = () => {};
@@ -187,10 +188,12 @@
        <ArrowRight size={17} />
      </button>
    {/if}
-    <button class="settings-row settings-row-logout" type="button" onclick={logout}>
-      <UserRound size={21} />
-      <span><strong>{t("wa_logout")}</strong><small>{t("wa_end_session")}</small></span>
-      <ArrowRight size={17} />
-    </button>
+    {#if showLogout}
+      <button class="settings-row settings-row-logout" type="button" onclick={logout}>
+        <UserRound size={21} />
+        <span><strong>{t("wa_logout")}</strong><small>{t("wa_end_session")}</small></span>
+        <ArrowRight size={17} />
+      </button>
+    {/if}
  </div>
 </main>