From 9ccd01352290759575cd65b521eeba149c5cb3b7 Mon Sep 17 00:00:00 2001
From: HJ <30-hj@users.noreply.git.pleroma.social>
Date: Sun, 12 Nov 2023 10:38:13 +0000
Subject: [PATCH] Merge branch 'tusooa/fix-admin-crash-when-no-primary-fe-set'
 into 'develop'

fix admin crash when no primary fe set

See merge request pleroma/pleroma-fe!1867

(cherry picked from commit faef2767cd7ba5961445e9c38e8ebf52d3610259)

661d5b6d Fix frontend admin tab crashing when no primary frontend is set
b2c5520d Add changelog for frontend tab crash fix
---
 changelog.d/fix-admin-crash-when-no-primary-fe-set.fix     | 1 +
 src/components/settings_modal/admin_tabs/frontends_tab.vue | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 changelog.d/fix-admin-crash-when-no-primary-fe-set.fix

diff --git a/changelog.d/fix-admin-crash-when-no-primary-fe-set.fix b/changelog.d/fix-admin-crash-when-no-primary-fe-set.fix
new file mode 100644
index 0000000000..78eae3be97
--- /dev/null
+++ b/changelog.d/fix-admin-crash-when-no-primary-fe-set.fix
@@ -0,0 +1 @@
+Fix frontend admin tab crashing when no primary frontend is set
diff --git a/src/components/settings_modal/admin_tabs/frontends_tab.vue b/src/components/settings_modal/admin_tabs/frontends_tab.vue
index 13b8fa6b6f..25b08eb701 100644
--- a/src/components/settings_modal/admin_tabs/frontends_tab.vue
+++ b/src/components/settings_modal/admin_tabs/frontends_tab.vue
@@ -33,9 +33,9 @@
           >
             <strong>{{ frontend.name }}</strong>
             {{ ' ' }}
-            <span v-if="adminDraft[':pleroma'][':frontends'][':primary'].name === frontend.name">
+            <span v-if="adminDraft[':pleroma'][':frontends'][':primary']?.name === frontend.name">
               <i18n-t
-                v-if="adminDraft[':pleroma'][':frontends'][':primary'].ref === frontend.refs[0]"
+                v-if="adminDraft[':pleroma'][':frontends'][':primary']?.ref === frontend.refs[0]"
                 keypath="admin_dash.frontend.is_default"
               />
               <i18n-t